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

[SSE] build icons sprite from source images

Browse source
This commit is contained in:
Maxim Kadushkin 2019-11-21 19:15:47 +03:00
parent 1926f2fee9
commit aa48aca058
73 changed files with 260 additions and 382 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -242,9 +242,9 @@ define([
'data-stopPropagation="true"',
'<% } %>', '>',
'<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-zoomup">&nbsp;</i></button>',
'<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-zoomdown">&nbsp;</i></button>',
'</div>'
].join('')),
stopPropagation: true,

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

@ -1,14 +1,14 @@
<div id="view-left-menu" class="tool-menu left">
<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>
<!-- /** 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-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-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 toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** 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-spellcheck" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-ic-docspell">&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-about" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-about">&nbsp;</i></button>
<button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button>
<button id="left-btn-spellcheck" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
</div>
<div class="left-panel" style="">
<!-- /** coauthoring begin **/ -->

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

@ -21,14 +21,14 @@
</div>
<div class="tool-menu-btns">
<div class="ct-btn-category arrow-left" />
<button id="id-right-menu-cell" class="btn btn-category arrow-left" content-target="id-cell-settings"><i class="icon img-toolbarmenu btn-menu-cell">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon img-toolbarmenu btn-menu-table">&nbsp;</i></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon img-toolbarmenu 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-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-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-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-pivot" class="btn btn-category arrow-left hidden" content-target="id-pivot-settings"><i class="icon img-toolbarmenu btn-menu-pivot">&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-cell" class="btn btn-category arrow-left" content-target="id-cell-settings"><i class="icon toolbar__icon btn-menu-cell">&nbsp;</i></button>
<button id="id-right-menu-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-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 toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-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-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-pivot" class="btn btn-category arrow-left hidden" content-target="id-pivot-settings"><i class="icon toolbar__icon btn-menu-pivot">&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>

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

@ -1,23 +1,23 @@
<div class="statusbar">
<div id="status-tabs-scroll" class="status-group">
<button id="status-btn-tabfirst" type="button" class="btn small btn-toolbar"><i class="icon btn-tab-first">&nbsp;</i></button>
<button id="status-btn-tabback" type="button" class="btn small btn-toolbar"><i class="icon btn-tab-back">&nbsp;</i></button>
<button id="status-btn-tabnext" type="button" class="btn small btn-toolbar"><i class="icon btn-tab-next">&nbsp;</i></button>
<button id="status-btn-tablast" type="button" class="btn small btn-toolbar"><i class="icon btn-tab-last">&nbsp;</i></button>
<button id="status-btn-tabfirst" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-firstitem">&nbsp;</i></button>
<button id="status-btn-tabback" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-previtem">&nbsp;</i></button>
<button id="status-btn-tabnext" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-nextitem">&nbsp;</i></button>
<button id="status-btn-tablast" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-lastitem">&nbsp;</i></button>
</div>
<div id="status-addtabs-box" class="status-group">
<button id="status-btn-addtab" type="button" class="btn small btn-toolbar"><i class="icon btn-zoom-up">&nbsp;</i></button>
<button id="status-btn-addtab" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
</div>
<div id="status-zoom-box" class="status-group">
<div class="separator short" />
<button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"><i class="icon btn-zoom-down">&nbsp;</i></button>
<button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown">
<label id="status-label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="status-btn-zoomup" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon btn-zoom-up">&nbsp;</i></button>
<button id="status-btn-zoomup" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
</div>
<div id="status-math-box" class="status-group">
<div class="separator short" style="margin-right: 12px;" />

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

@ -151,7 +151,7 @@
<span class="btn-slot text x-huge" id="slot-btn-pagesize"></span>
<span class="btn-slot text x-huge" id="slot-btn-printarea"></span>
<span class="btn-slot text x-huge slot-editheader"></span>
<span class="btn-slot text x-huge" id="slot-btn-scale"></span>
<span class="btn-slot text x-huge-btn" id="slot-btn-scale"></span>
</div>
<div class="separator long"></div>
<div class="group">

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

@ -305,23 +305,23 @@ define([
}
var _arrBorderPosition = [
[Asc.c_oAscBorderOptions.Left, 'btn-borders-small btn-position-left', 'cell-button-border-left', this.tipLeft],
[Asc.c_oAscBorderOptions.InnerV,'btn-borders-small btn-position-inner-vert','cell-button-border-inner-vert', this.tipInnerVert],
[Asc.c_oAscBorderOptions.Right, 'btn-borders-small btn-position-right', 'cell-button-border-right', this.tipRight],
[Asc.c_oAscBorderOptions.Top, 'btn-borders-small btn-position-top', 'cell-button-border-top', this.tipTop],
[Asc.c_oAscBorderOptions.InnerH,'btn-borders-small btn-position-inner-hor', 'cell-button-border-inner-hor', this.tipInnerHor],
[Asc.c_oAscBorderOptions.Bottom,'btn-borders-small btn-position-bottom', 'cell-button-border-bottom', this.tipBottom],
[Asc.c_oAscBorderOptions.DiagU, 'btn-borders-small btn-position-diagu', 'cell-button-border-diagu', this.tipDiagU],
[Asc.c_oAscBorderOptions.DiagD, 'btn-borders-small btn-position-diagd', 'cell-button-border-diagd', this.tipDiagD],
['inner', 'btn-borders-small btn-position-inner', 'cell-button-border-inner', this.tipInner],
['outer', 'btn-borders-small btn-position-outer', 'cell-button-border-outer', this.tipOuter],
['all', 'btn-borders-small btn-position-all', 'cell-button-border-all', this.tipAll],
['none', 'btn-borders-small btn-position-none', 'cell-button-border-none', this.tipNone]
[Asc.c_oAscBorderOptions.Left, 'toolbar__icon btn-border-left', 'cell-button-border-left', this.tipLeft],
[Asc.c_oAscBorderOptions.InnerV,'toolbar__icon btn-border-insidevert', 'cell-button-border-inner-vert',this.tipInnerVert],
[Asc.c_oAscBorderOptions.Right, 'toolbar__icon btn-border-right', 'cell-button-border-right', this.tipRight],
[Asc.c_oAscBorderOptions.Top, 'toolbar__icon btn-border-top', 'cell-button-border-top', this.tipTop],
[Asc.c_oAscBorderOptions.InnerH,'toolbar__icon btn-border-insidehor', 'cell-button-border-inner-hor', this.tipInnerHor],
[Asc.c_oAscBorderOptions.Bottom,'toolbar__icon btn-border-bottom', 'cell-button-border-bottom', this.tipBottom],
[Asc.c_oAscBorderOptions.DiagU, 'toolbar__icon btn-border-diagup', 'cell-button-border-diagu', this.tipDiagU],
[Asc.c_oAscBorderOptions.DiagD, 'toolbar__icon btn-border-diagdown', 'cell-button-border-diagd', this.tipDiagD],
['inner', 'toolbar__icon btn-border-inside', 'cell-button-border-inner', this.tipInner],
['outer', 'toolbar__icon btn-border-out', 'cell-button-border-outer', this.tipOuter],
['all', 'toolbar__icon btn-border-all', 'cell-button-border-all', this.tipAll],
['none', 'toolbar__icon btn-border-no', 'cell-button-border-none', this.tipNone]
];
_.each(_arrBorderPosition, function(item, index, list){
var _btn = new Common.UI.Button({
cls: 'btn-toolbar',
cls: 'btn-toolbar borders--small',
iconCls: item[1],
borderId:item[0],
hint: item[3],

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

@ -109,7 +109,7 @@ define([
this.btnGroup = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-cell-group',
iconCls: 'toolbar__icon btn-cell-group',
caption: this.capBtnGroup,
split: true,
menu: true,
@ -121,7 +121,7 @@ define([
this.btnUngroup = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-cell-ungroup',
iconCls: 'toolbar__icon btn-cell-ungroup',
caption: this.capBtnUngroup,
split: true,
menu: true,
@ -133,7 +133,7 @@ define([
this.btnTextToColumns = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-to-columns',
iconCls: 'toolbar__icon btn-to-columns',
caption: this.capBtnTextToCol,
split: false,
disabled: true,
@ -162,17 +162,17 @@ define([
Common.Utils.injectComponent($host.find('#slot-btn-hide-details'), this.btnHide);
this.lockedControls.push(this.btnHide);
this.btnsSortDown = Common.Utils.injectButtons($host.find('.slot-sortdesc'), '', 'btn-sort-down', '',
this.btnsSortDown = Common.Utils.injectButtons($host.find('.slot-sortdesc'), '', 'toolbar__icon btn-sort-down', '',
[_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter]);
this.btnsSortUp = Common.Utils.injectButtons($host.find('.slot-sortasc'), '', 'btn-sort-up', '',
this.btnsSortUp = Common.Utils.injectButtons($host.find('.slot-sortasc'), '', 'toolbar__icon btn-sort-up', '',
[_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter]);
this.btnsSetAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-setfilter'), '', 'btn-autofilter', '',
this.btnsSetAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-setfilter'), '', 'toolbar__icon btn-autofilter', '',
[_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter],
false, false, true);
this.btnsClearAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-clear-filter'), '', 'btn-clear-filter', '',
this.btnsClearAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-clear-filter'), '', 'toolbar__icon btn-clear-filter', '',
[_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter, _set.editPivot]);
Array.prototype.push.apply(this.lockedControls, this.btnsSortDown.concat(this.btnsSortUp, this.btnsSetAutofilter,this.btnsClearAutofilter));

37
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -543,14 +543,14 @@ define([
me.mnuGroupImg = new Common.UI.MenuItem({
caption : this.txtGroup,
iconCls : 'mnu-group',
iconCls : 'menu__icon shape-group',
type : 'group',
value : 'grouping'
});
me.mnuUnGroupImg = new Common.UI.MenuItem({
caption : this.txtUngroup,
iconCls : 'mnu-ungroup',
iconCls : 'menu__icon shape-ungroup',
type : 'group',
value : 'ungrouping'
});
@ -630,25 +630,25 @@ define([
me.mnuBringToFront = new Common.UI.MenuItem({
caption : this.textArrangeFront,
iconCls : 'mnu-arrange-front',
iconCls : 'menu__icon arrange-front',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.BringToFront
});
me.mnuSendToBack = new Common.UI.MenuItem({
caption : this.textArrangeBack,
iconCls : 'mnu-arrange-back',
iconCls : 'menu__icon arrange-back',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.SendToBack
});
me.mnuBringForward = new Common.UI.MenuItem({
caption : this.textArrangeForward,
iconCls : 'mnu-arrange-forward',
iconCls : 'menu__icon arrange-forward',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.BringForward
});
me.mnuSendBackward = new Common.UI.MenuItem({
caption: this.textArrangeBackward,
iconCls : 'mnu-arrange-backward',
iconCls : 'menu__icon arrange-backward',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.SendBackward
});
@ -675,38 +675,38 @@ define([
menuAlign: 'tl-tr',
items: [{
caption : me.textShapeAlignLeft,
iconCls : 'mnu-img-align-left',
iconCls : 'menu__icon shape-align-left',
value : 0
}, {
caption : me.textShapeAlignCenter,
iconCls : 'mnu-img-align-center',
iconCls : 'menu__icon shape-align-center',
value : 4
}, {
caption : me.textShapeAlignRight,
iconCls : 'mnu-img-align-right',
iconCls : 'menu__icon shape-align-right',
value : 1
}, {
caption : me.textShapeAlignTop,
iconCls : 'mnu-img-align-top',
iconCls : 'menu__icon shape-align-top',
value : 3
}, {
caption : me.textShapeAlignMiddle,
iconCls : 'mnu-img-align-middle',
iconCls : 'menu__icon shape-align-middle',
value : 5
}, {
caption : me.textShapeAlignBottom,
iconCls : 'mnu-img-align-bottom',
iconCls : 'menu__icon shape-align-bottom',
value : 2
},
{caption: '--'},
{
caption: me.txtDistribHor,
iconCls: 'mnu-distrib-hor',
iconCls: 'menu__icon shape-distribute-hor',
value: 6
},
{
caption: me.txtDistribVert,
iconCls: 'mnu-distrib-vert',
iconCls: 'menu__icon shape-distribute-vert',
value: 7
}]
})
@ -798,24 +798,27 @@ define([
items : [
me.menuParagraphDirectH = new Common.UI.MenuItem({
caption : me.directHText,
iconCls : 'mnu-direct-horiz',
iconCls : 'menu__icon text-orient-hor',
checkable : true,
checkmark : false,
checked : false,
toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.normal
}),
me.menuParagraphDirect90 = new Common.UI.MenuItem({
caption : me.direct90Text,
iconCls : 'mnu-direct-rdown',
iconCls : 'menu__icon text-orient-rdown',
checkable : true,
checkmark : false,
checked : false,
toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.vert
}),
me.menuParagraphDirect270 = new Common.UI.MenuItem({
caption : me.direct270Text,
iconCls : 'mnu-direct-rup',
iconCls : 'menu__icon text-orient-rup',
checkable : true,
checkmark : false,
checked : false,
toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.vert270

22
apps/spreadsheeteditor/main/app/view/FormulaTab.js
View file

@ -82,7 +82,7 @@ define([
this.btnFinancial = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-finance',
iconCls: 'toolbar__icon btn-finance',
caption: formulaDialog.sCategoryFinancial,
hint: formulaDialog.sCategoryFinancial,
menu: true,
@ -95,7 +95,7 @@ define([
this.btnLogical = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-logic',
iconCls: 'toolbar__icon btn-logic',
caption: formulaDialog.sCategoryLogical,
hint: formulaDialog.sCategoryLogical,
menu: true,
@ -108,7 +108,7 @@ define([
this.btnTextData = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-func-text',
iconCls: 'toolbar__icon btn-func-text',
caption: formulaDialog.sCategoryTextAndData,
hint: formulaDialog.sCategoryTextAndData,
menu: true,
@ -121,7 +121,7 @@ define([
this.btnDateTime = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-datetime',
iconCls: 'toolbar__icon btn-datetime',
caption: formulaDialog.sCategoryDateAndTime,
hint: formulaDialog.sCategoryDateAndTime,
menu: true,
@ -134,7 +134,7 @@ define([
this.btnReference = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-lookup',
iconCls: 'toolbar__icon btn-lookup',
caption: formulaDialog.sCategoryLookupAndReference,
hint: formulaDialog.sCategoryLookupAndReference,
menu: true,
@ -147,7 +147,7 @@ define([
this.btnMath = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-func-math',
iconCls: 'toolbar__icon btn-func-math',
caption: formulaDialog.sCategoryMathematic,
hint: formulaDialog.sCategoryMathematic,
menu: true,
@ -160,7 +160,7 @@ define([
this.btnRecent = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-recent',
iconCls: 'toolbar__icon btn-recent',
caption: this.txtRecent,
hint: this.txtRecent,
menu: true,
@ -173,7 +173,7 @@ define([
this.btnAutosum = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-autosum',
iconCls: 'toolbar__icon btn-autosum',
caption: this.txtAutosum,
hint: this.txtAutosumTip,
split: true,
@ -198,7 +198,7 @@ define([
this.btnFormula = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ins-formula',
iconCls: 'toolbar__icon btn-ins-formula',
caption: this.txtFormula,
hint: this.txtFormulaTip,
disabled: true,
@ -209,7 +209,7 @@ define([
this.btnMore = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-more',
iconCls: 'toolbar__icon btn-more',
caption: this.txtMore,
hint: this.txtMore,
menu: true,
@ -222,7 +222,7 @@ define([
this.btnCalculate = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-calculation',
iconCls: 'toolbar__icon btn-calculation',
caption: this.txtCalculation,
split: true,
menu: true,

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

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

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

@ -253,7 +253,7 @@ define([
this.btnSelectPivot = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-select-pivot',
iconCls: 'toolbar__icon btn-select-pivot',
caption: this.txtSelect
});
this.lockedControls.push(this.btnSelectPivot);

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

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

2
apps/spreadsheeteditor/main/app/view/Spellcheck.js
View file

@ -82,7 +82,7 @@ define([
this.buttonNext = new Common.UI.Button({
style: 'margin-left: 5px; width: 22px; height: 22px; border: 1px solid #cfcfcf;',
cls: 'btn-toolbar bg-white',
iconCls: 'btn-spellcheck-next',
iconCls: 'toolbar__icon btn-spellcheck-next',
hint: this.txtNextTip
});
this.buttonNext.render($('#spellcheck-next'));

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

@ -171,20 +171,20 @@ define([
me.btnCopy = new Common.UI.Button({
id : 'id-toolbar-btn-copy',
cls : 'btn-toolbar',
iconCls : 'btn-copy'
iconCls : 'toolbar__icon btn-copy'
});
me.btnPaste = new Common.UI.Button({
id : 'id-toolbar-btn-paste',
cls : 'btn-toolbar',
iconCls : 'btn-paste',
iconCls : 'toolbar__icon btn-paste',
lock : [/*_set.editCell,*/ _set.coAuth, _set.lostConnect]
});
me.btnUndo = new Common.UI.Button({
id : 'id-toolbar-btn-undo',
cls : 'btn-toolbar',
iconCls : 'btn-undo',
iconCls : 'toolbar__icon btn-undo',
disabled : true,
lock : [_set.lostConnect],
signals : ['disabled']
@ -193,7 +193,7 @@ define([
me.btnRedo = new Common.UI.Button({
id : 'id-toolbar-btn-redo',
cls : 'btn-toolbar',
iconCls : 'btn-redo',
iconCls : 'toolbar__icon btn-redo',
disabled : true,
lock : [_set.lostConnect],
signals : ['disabled']
@ -205,7 +205,7 @@ define([
me.btnInsertFormula = new Common.UI.Button({
id : 'id-toolbar-btn-insertformula',
cls : 'btn-toolbar',
iconCls : 'btn-formula',
iconCls : 'toolbar__icon btn-formula',
split : true,
lock : [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
@ -227,14 +227,14 @@ define([
me.btnDecDecimal = new Common.UI.Button({
id : 'id-toolbar-btn-decdecimal',
cls : 'btn-toolbar',
iconCls : 'btn-decdecimal',
iconCls : 'toolbar__icon btn-decdecimal',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
});
me.btnIncDecimal = new Common.UI.Button({
id : 'id-toolbar-btn-incdecimal',
cls : 'btn-toolbar',
iconCls : 'btn-incdecimal',
iconCls : 'toolbar__icon btn-incdecimal',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
});
@ -274,28 +274,28 @@ define([
me.btnSearch = new Common.UI.Button({
id : 'id-toolbar-btn-search',
cls : 'btn-toolbar',
iconCls : 'btn-search',
iconCls : 'toolbar__icon btn-menu-search',
lock : [_set.lostConnect]
});
me.btnSortDown = new Common.UI.Button({
id : 'id-toolbar-btn-sort-down',
cls : 'btn-toolbar',
iconCls : 'btn-sort-down',
iconCls : 'toolbar__icon btn-sort-down',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot]
});
me.btnSortUp = new Common.UI.Button({
id : 'id-toolbar-btn-sort-up',
cls : 'btn-toolbar',
iconCls : 'btn-sort-up',
iconCls : 'toolbar__icon btn-sort-up',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot]
});
me.btnSetAutofilter = new Common.UI.Button({
id : 'id-toolbar-btn-setautofilter',
cls : 'btn-toolbar',
iconCls : 'btn-autofilter',
iconCls : 'toolbar__icon btn-autofilter',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot],
enableToggle: true
});
@ -303,7 +303,7 @@ define([
me.btnClearAutofilter = new Common.UI.Button({
id : 'id-toolbar-btn-clearfilter',
cls : 'btn-toolbar',
iconCls : 'btn-clear-filter',
iconCls : 'toolbar__icon btn-clear-filter',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter, _set.editPivot]
});
} else
@ -358,7 +358,7 @@ define([
me.btnPrint = new Common.UI.Button({
id : 'id-toolbar-btn-print',
cls : 'btn-toolbar',
iconCls : 'btn-print no-mask',
iconCls : 'toolbar__icon btn-print no-mask',
lock : [_set.editCell, _set.cantPrint, _set.disableOnStart],
signals: ['disabled']
});
@ -366,7 +366,7 @@ define([
me.btnSave = new Common.UI.Button({
id : 'id-toolbar-btn-save',
cls : 'btn-toolbar',
iconCls : 'no-mask ' + me.btnSaveCls,
iconCls : 'toolbar__icon no-mask ' + me.btnSaveCls,
signals : ['disabled']
});
me.btnCollabChanges = me.btnSave;
@ -374,21 +374,21 @@ define([
me.btnIncFontSize = new Common.UI.Button({
id : 'id-toolbar-btn-incfont',
cls : 'btn-toolbar',
iconCls : 'btn-incfont',
iconCls : 'toolbar__icon btn-incfont',
lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect]
});
me.btnDecFontSize = new Common.UI.Button({
id : 'id-toolbar-btn-decfont',
cls : 'btn-toolbar',
iconCls : 'btn-decfont',
iconCls : 'toolbar__icon btn-decfont',
lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect]
});
me.btnBold = new Common.UI.Button({
id : 'id-toolbar-btn-bold',
cls : 'btn-toolbar',
iconCls : 'btn-bold',
iconCls : 'toolbar__icon btn-bold',
lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect],
enableToggle: true
});
@ -396,7 +396,7 @@ define([
me.btnItalic = new Common.UI.Button({
id : 'id-toolbar-btn-italic',
cls : 'btn-toolbar',
iconCls : 'btn-italic',
iconCls : 'toolbar__icon btn-italic',
lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect],
enableToggle: true
});
@ -404,7 +404,7 @@ define([
me.btnUnderline = new Common.UI.Button({
id : 'id-toolbar-btn-underline',
cls : 'btn-toolbar',
iconCls : 'btn-underline',
iconCls : 'toolbar__icon btn-underline',
lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect],
enableToggle: true
});
@ -412,7 +412,7 @@ define([
me.btnStrikeout = new Common.UI.Button({
id: 'id-toolbar-btn-strikeout',
cls: 'btn-toolbar',
iconCls: 'btn-strikeout',
iconCls: 'toolbar__icon btn-strikeout',
lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect],
enableToggle: true
});
@ -420,7 +420,7 @@ define([
me.btnSubscript = new Common.UI.Button({
id : 'id-toolbar-btn-subscript',
cls : 'btn-toolbar',
iconCls : 'btn-subscript',
iconCls : 'toolbar__icon btn-subscript',
icls : 'btn-subscript',
split : true,
enableToggle: true,
@ -429,18 +429,20 @@ define([
items: [
{
caption : me.textSuperscript,
iconCls : 'mnu-text-superscript',
iconCls : 'menu__icon btn-superscript',
icls : 'btn-superscript',
checkable : true,
checkmark : false,
allowDepress: true,
toggleGroup : 'textsubscriptgroup',
value : 'super'
},
{
caption : me.textSubscript,
iconCls : 'mnu-text-subscript',
iconCls : 'menu__icon btn-subscript',
icls : 'btn-subscript',
checkable : true,
checkmark : false,
allowDepress: true,
toggleGroup : 'textsubscriptgroup',
value : 'sub'
@ -453,7 +455,7 @@ define([
me.btnTextColor = new Common.UI.Button({
id : 'id-toolbar-btn-fontcolor',
cls : 'btn-toolbar',
iconCls : 'btn-fontcolor',
iconCls : 'toolbar__icon btn-fontcolor',
split : true,
lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.coAuth, _set.coAuthText, _set.lostConnect],
menu : new Common.UI.Menu({
@ -468,7 +470,7 @@ define([
me.btnBackColor = new Common.UI.Button({
id : 'id-toolbar-btn-fillparag',
cls : 'btn-toolbar',
iconCls : 'btn-fillparag',
iconCls : 'toolbar__icon btn-paracolor',
split : true,
lock : [_set.selImage, _set.editCell, _set.coAuth, _set.coAuthText, _set.lostConnect],
menu : new Common.UI.Menu({
@ -482,7 +484,7 @@ define([
me.btnBorders = new Common.UI.Button({
id : 'id-toolbar-btn-borders',
cls : 'btn-toolbar',
iconCls : 'btn-border-out',
iconCls : 'toolbar__icon btn-border-out',
icls : 'btn-border-out',
borderId : 'outer',
borderswidth: Asc.c_oAscBorderStyles.Thin,
@ -494,7 +496,7 @@ define([
me.btnAlignLeft = new Common.UI.Button({
id : 'id-toolbar-btn-align-left',
cls : 'btn-toolbar',
iconCls : 'btn-align-left',
iconCls : 'toolbar__icon btn-align-left',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'alignGroup'
@ -503,7 +505,7 @@ define([
me.btnAlignCenter = new Common.UI.Button({
id : 'id-toolbar-btn-align-center',
cls : 'btn-toolbar',
iconCls : 'btn-align-center',
iconCls : 'toolbar__icon btn-align-center',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'alignGroup'
@ -512,7 +514,7 @@ define([
me.btnAlignRight = new Common.UI.Button({
id : 'id-toolbar-btn-align-right',
cls : 'btn-toolbar',
iconCls : 'btn-align-right',
iconCls : 'toolbar__icon btn-align-right',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'alignGroup'
@ -521,7 +523,7 @@ define([
me.btnAlignJust = new Common.UI.Button({
id : 'id-toolbar-btn-align-just',
cls : 'btn-toolbar',
iconCls : 'btn-align-just',
iconCls : 'toolbar__icon btn-align-just',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup: 'alignGroup'
@ -530,7 +532,7 @@ define([
me.btnMerge = new Common.UI.Button({
id : 'id-toolbar-rtn-merge',
cls : 'btn-toolbar',
iconCls : 'btn-merge',
iconCls : 'toolbar__icon btn-merge',
enableToggle: true,
allowDepress: true,
split : true,
@ -560,7 +562,7 @@ define([
me.btnAlignTop = new Common.UI.Button({
id : 'id-toolbar-rtn-valign-top',
cls : 'btn-toolbar',
iconCls : 'btn-valign-top',
iconCls : 'toolbar__icon btn-align-top',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
enableToggle: true,
toggleGroup : 'vAlignGroup'
@ -569,7 +571,7 @@ define([
me.btnAlignMiddle = new Common.UI.Button({
id : 'id-toolbar-rtn-valign-middle',
cls : 'btn-toolbar',
iconCls : 'btn-valign-middle',
iconCls : 'toolbar__icon btn-align-middle',
enableToggle: true,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
toggleGroup : 'vAlignGroup'
@ -578,7 +580,7 @@ define([
me.btnAlignBottom = new Common.UI.Button({
id : 'id-toolbar-rtn-valign-bottom',
cls : 'btn-toolbar',
iconCls : 'btn-valign-bottom',
iconCls : 'toolbar__icon btn-align-bottom',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
enableToggle: true,
toggleGroup : 'vAlignGroup'
@ -587,7 +589,7 @@ define([
me.btnWrap = new Common.UI.Button({
id : 'id-toolbar-rtn-wrap',
cls : 'btn-toolbar',
iconCls : 'btn-wrap',
iconCls : 'toolbar__icon btn-wrap',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
enableToggle: true,
allowDepress: true
@ -596,42 +598,47 @@ define([
me.btnTextOrient = new Common.UI.Button({
id : 'id-toolbar-rtn-textorient',
cls : 'btn-toolbar',
iconCls : 'btn-text-orient',
iconCls : 'toolbar__icon text-orient-ccw',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({
items: [
{
caption : me.textHorizontal,
iconCls : 'mnu-direct-horiz',
iconCls : 'menu__icon text-orient-hor',
checkable : true,
checkmark : false,
toggleGroup : 'textorientgroup',
value : 'horiz'
},
{
caption : me.textCounterCw,
iconCls : 'mnu-direct-ccw',
iconCls : 'menu__icon text-orient-ccw',
checkable : true,
checkmark : false,
toggleGroup : 'textorientgroup',
value : 'countcw'
},
{
caption : me.textClockwise,
iconCls : 'mnu-direct-cw',
iconCls : 'menu__icon text-orient-cw',
checkable : true,
checkmark : false,
toggleGroup : 'textorientgroup',
value : 'clockwise'
},
{
caption : me.textRotateUp,
iconCls : 'mnu-direct-rup',
iconCls : 'menu__icon text-orient-rup',
checkable : true,
checkmark : false,
toggleGroup : 'textorientgroup',
value : 'rotateup'
},
{
caption : me.textRotateDown,
iconCls : 'mnu-direct-rdown',
iconCls : 'menu__icon text-orient-rdown',
checkable : true,
checkmark : false,
toggleGroup : 'textorientgroup',
value : 'rotatedown'
}
@ -642,7 +649,7 @@ define([
me.btnInsertImage = new Common.UI.Button({
id : 'tlbtn-insertimage',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertimage',
iconCls : 'toolbar__icon btn-insertimage',
caption : me.capInsertImage,
lock : [_set.editCell, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
@ -657,7 +664,7 @@ define([
me.btnInsertHyperlink = new Common.UI.Button({
id : 'tlbtn-insertlink',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-inserthyperlink',
iconCls : 'toolbar__icon btn-inserthyperlink',
caption : me.capInsertHyperlink,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.multiselect, _set.lostConnect, _set.coAuth, _set.editPivot]
});
@ -665,7 +672,7 @@ define([
me.btnInsertChart = new Common.UI.Button({
id : 'tlbtn-insertchart',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertchart',
iconCls : 'toolbar__icon btn-insertchart',
lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set.coAuthText],
caption : me.capInsertChart,
menu : true
@ -674,7 +681,7 @@ define([
me.btnInsertShape = new Common.UI.Button({
id : 'tlbtn-insertshape',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertshape',
iconCls : 'toolbar__icon btn-insertshape',
enableToggle: true,
caption : me.capInsertShape,
lock : [_set.editCell, _set.lostConnect, _set.coAuth],
@ -684,7 +691,7 @@ define([
me.btnInsertText = new Common.UI.Button({
id : 'tlbtn-inserttext',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-text',
iconCls : 'toolbar__icon btn-text',
caption : me.capInsertText,
lock : [_set.editCell, _set.lostConnect, _set.coAuth],
enableToggle: true
@ -693,7 +700,7 @@ define([
me.btnInsertTextArt = new Common.UI.Button({
id : 'tlbtn-inserttextart',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-textart',
iconCls : 'toolbar__icon btn-textart',
caption : me.capInsertTextart,
lock : [_set.editCell, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
@ -707,7 +714,7 @@ define([
me.btnInsertEquation = new Common.UI.Button({
id : 'tlbtn-insertequation',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertequation',
iconCls : 'toolbar__icon btn-insertequation',
caption : me.capInsertEquation,
split : true,
lock : [_set.editCell, _set.lostConnect, _set.coAuth],
@ -717,7 +724,7 @@ define([
me.btnTableTemplate = new Common.UI.Button({
id : 'id-toolbar-btn-ttempl',
cls : 'btn-toolbar',
iconCls : 'btn-ttempl',
iconCls : 'toolbar__icon btn-menu-table',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter],
menu : new Common.UI.Menu({
items: [
@ -729,7 +736,7 @@ define([
me.btnInsertTable = new Common.UI.Button({
id : 'tlbtn-inserttable',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-inserttable',
iconCls : 'toolbar__icon btn-inserttable',
caption : me.capInsertTable,
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter, _set.ruleMerge, _set.editPivot]
});
@ -796,7 +803,7 @@ define([
me.btnPercentStyle = new Common.UI.Button({
id : 'id-toolbar-btn-percent-style',
cls : 'btn-toolbar',
iconCls : 'btn-percent-style',
iconCls : 'toolbar__icon btn-percent-style',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
styleName : 'Percent'
});
@ -804,7 +811,7 @@ define([
me.btnCurrencyStyle = new Common.UI.Button({
id : 'id-toolbar-btn-accounting-style',
cls : 'btn-toolbar',
iconCls : 'btn-currency-style',
iconCls : 'toolbar__icon btn-currency-style',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
styleName : 'Currency',
split : true,
@ -842,21 +849,21 @@ define([
me.btnDecDecimal = new Common.UI.Button({
id : 'id-toolbar-btn-decdecimal',
cls : 'btn-toolbar',
iconCls : 'btn-decdecimal',
iconCls : 'toolbar__icon btn-decdecimal',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
});
me.btnIncDecimal = new Common.UI.Button({
id : 'id-toolbar-btn-incdecimal',
cls : 'btn-toolbar',
iconCls : 'btn-incdecimal',
iconCls : 'toolbar__icon btn-incdecimal',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
});
me.btnInsertFormula = new Common.UI.Button({
id : 'id-toolbar-btn-insertformula',
cls : 'btn-toolbar',
iconCls : 'btn-formula',
iconCls : 'toolbar__icon btn-formula',
split : true,
lock : [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
@ -878,7 +885,7 @@ define([
me.btnNamedRange = new Common.UI.Button({
id : 'id-toolbar-btn-insertrange',
cls : 'btn-toolbar',
iconCls : 'btn-named-range',
iconCls : 'toolbar__icon btn-named-range',
lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.selRangeEdit],
menu : new Common.UI.Menu({
style : 'min-width: 110px',
@ -904,7 +911,7 @@ define([
me.btnClearStyle = new Common.UI.Button({
id : 'id-toolbar-btn-clear',
cls : 'btn-toolbar',
iconCls : 'btn-clearstyle',
iconCls : 'toolbar__icon btn-clearstyle',
lock : [_set.lostConnect, _set.coAuth, _set.selRangeEdit],
menu : new Common.UI.Menu({
style : 'min-width: 110px',
@ -941,7 +948,7 @@ define([
me.btnCopyStyle = new Common.UI.Button({
id : 'id-toolbar-btn-copystyle',
cls : 'btn-toolbar',
iconCls : 'btn-copystyle',
iconCls : 'toolbar__icon btn-copystyle',
lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set.selChart],
enableToggle: true
});
@ -949,7 +956,7 @@ define([
me.btnAddCell = new Common.UI.Button({
id : 'id-toolbar-btn-addcell',
cls : 'btn-toolbar',
iconCls : 'btn-addcell',
iconCls : 'toolbar__icon btn-addcell',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
items : [
@ -976,7 +983,7 @@ define([
me.btnDeleteCell = new Common.UI.Button({
id : 'id-toolbar-btn-delcell',
cls : 'btn-toolbar',
iconCls : 'btn-delcell',
iconCls : 'toolbar__icon btn-delcell',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
items : [
@ -1003,7 +1010,7 @@ define([
me.btnColorSchemas = new Common.UI.Button({
id : 'id-toolbar-btn-colorschemas',
cls : 'btn-toolbar',
iconCls : 'btn-colorschemas',
iconCls : 'toolbar__icon toolbar__icon btn-colorschemas',
lock : [_set.editCell, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
items: [],
@ -1018,7 +1025,7 @@ define([
me.btnPageOrient = new Common.UI.Button({
id: 'tlbtn-pageorient',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-pageorient',
iconCls: 'toolbar__icon btn-pageorient',
caption: me.capBtnPageOrient,
lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth],
menu: new Common.UI.Menu({
@ -1026,15 +1033,17 @@ define([
items: [
{
caption: me.textPortrait,
iconCls: 'mnu-orient-portrait',
iconCls: 'menu__icon page-portrait',
checkable: true,
checkmark: false,
toggleGroup: 'menuOrient',
value: Asc.c_oAscPageOrientation.PagePortrait
},
{
caption: me.textLandscape,
iconCls: 'mnu-orient-landscape',
iconCls: 'menu__icon page-landscape',
checkable: true,
checkmark: false,
toggleGroup: 'menuOrient',
value: Asc.c_oAscPageOrientation.PageLandscape
}
@ -1053,7 +1062,7 @@ define([
me.btnPageMargins = new Common.UI.Button({
id: 'tlbtn-pagemargins',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-pagemargins',
iconCls: 'toolbar__icon btn-pagemargins',
caption: me.capBtnMargins,
lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth],
menu: new Common.UI.Menu({
@ -1098,7 +1107,7 @@ define([
me.btnPageSize = new Common.UI.Button({
id: 'tlbtn-pagesize',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-pagesize',
iconCls: 'toolbar__icon btn-pagesize',
caption: me.capBtnPageSize,
lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth],
menu: new Common.UI.Menu({
@ -1217,7 +1226,7 @@ define([
me.btnPrintArea = new Common.UI.Button({
id: 'tlbtn-printarea',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-print-area',
iconCls: 'toolbar__icon btn-print-area',
caption: me.capBtnPrintArea,
lock : [_set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.editCell, _set.selRangeEdit, _set.printAreaLock, _set.lostConnect, _set.coAuth],
menu: new Common.UI.Menu({
@ -1248,9 +1257,9 @@ define([
'data-stopPropagation="true"',
'<% } %>', '>',
'<label class="title" style="padding-top: 3px;">' + me.textScale + '</label>',
'<button id="custom-scale-up" type="button" style="float:right;" class="btn small btn-toolbar"><i class="icon btn-zoomin">&nbsp;</i></button>',
'<button id="custom-scale-up" type="button" style="float:right;" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>',
'<label id="value-custom-scale" style="float:right;padding: 3px 3px;min-width: 40px; text-align: center;"></label>',
'<button id="custom-scale-down" type="button" style="float:right;" class="btn small btn-toolbar"><i class="icon btn-zoomout">&nbsp;</i></button>',
'<button id="custom-scale-down" type="button" style="float:right;" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>',
'</div>'
].join('')),
stopPropagation: true,
@ -1262,7 +1271,7 @@ define([
me.btnScale = new Common.UI.Button({
id: 'tlbtn-scale',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-scale',
iconCls: 'toolbar__icon btn-scale',
caption: me.capBtnScale,
lock: [_set.docPropsLock, _set.lostConnect, _set.coAuth],
menu: new Common.UI.Menu({
@ -1305,7 +1314,7 @@ define([
me.btnImgAlign = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-img-align',
iconCls: 'toolbar__icon btn-img-align',
caption: me.capImgAlign,
lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu: true
@ -1313,14 +1322,14 @@ define([
me.btnImgGroup = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-img-group',
iconCls: 'toolbar__icon btn-img-group',
caption: me.capImgGroup,
lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu: true
});
me.btnImgForward = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-img-frwd',
iconCls: 'toolbar__icon btn-img-frwd',
caption: me.capImgForward,
split: true,
lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText],
@ -1328,7 +1337,7 @@ define([
});
me.btnImgBackward = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-img-bkwd',
iconCls: 'toolbar__icon btn-img-bkwd',
caption: me.capImgBackward,
lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText],
split: true,
@ -1556,7 +1565,7 @@ define([
_injectComponent('#slot-img-movefrwd', this.btnImgForward);
_injectComponent('#slot-img-movebkwd', this.btnImgBackward);
_injectComponent('#slot-btn-scale', this.btnScale);
this.btnsEditHeader = Common.Utils.injectButtons($host.find('.slot-editheader'), 'tlbtn-editheader-', 'btn-editheader', this.capBtnInsHeader,
this.btnsEditHeader = Common.Utils.injectButtons($host.find('.slot-editheader'), 'tlbtn-editheader-', 'toolbar__icon btn-editheader', this.capBtnInsHeader,
[SSE.enumLock.editCell, SSE.enumLock.selRangeEdit, SSE.enumLock.headerLock, SSE.enumLock.lostConnect, SSE.enumLock.coAuth]);
Array.prototype.push.apply(this.lockControls, this.btnsEditHeader);
@ -1637,74 +1646,74 @@ define([
items: [
{
caption : this.textOutBorders,
iconCls : 'mnu-border-out',
iconCls : 'menu__icon btn-border-out',
icls : 'btn-border-out',
borderId : 'outer'
},
{
caption : this.textAllBorders,
iconCls : 'mnu-border-all',
iconCls : 'menu__icon btn-border-all',
icls : 'btn-border-all',
borderId : 'all'
},
{
caption : this.textTopBorders,
iconCls : 'mnu-border-top',
iconCls : 'menu__icon btn-border-top',
icls : 'btn-border-top',
borderId : Asc.c_oAscBorderOptions.Top
},
{
caption : this.textBottomBorders,
iconCls : 'mnu-border-bottom',
iconCls : 'menu__icon btn-border-bottom',
icls : 'btn-border-bottom',
borderId : Asc.c_oAscBorderOptions.Bottom
},
{
caption : this.textLeftBorders,
iconCls : 'mnu-border-left',
iconCls : 'menu__icon btn-border-left',
icls : 'btn-border-left',
borderId : Asc.c_oAscBorderOptions.Left
},
{
caption : this.textRightBorders,
iconCls : 'mnu-border-right',
iconCls : 'menu__icon btn-border-right',
icls : 'btn-border-right',
borderId : Asc.c_oAscBorderOptions.Right
},
{
caption : this.textNoBorders,
iconCls : 'mnu-border-no',
iconCls : 'menu__icon btn-border-no',
icls : 'btn-border-no',
borderId : 'none'
},
{caption: '--'},
{
caption : this.textInsideBorders,
iconCls : 'mnu-border-center',
iconCls : 'menu__icon btn-border-inside',
icls : 'btn-border-center',
borderId : 'inner'
},
{
caption : this.textCenterBorders,
iconCls : 'mnu-border-vmiddle',
iconCls : 'menu__icon btn-border-insidevert',
icls : 'btn-border-vmiddle',
borderId : Asc.c_oAscBorderOptions.InnerV
},
{
caption : this.textMiddleBorders,
iconCls : 'mnu-border-hmiddle',
iconCls : 'menu__icon btn-border-insidehor',
icls : 'btn-border-hmiddle',
borderId : Asc.c_oAscBorderOptions.InnerH
},
{
caption : this.textDiagUpBorder,
iconCls : 'mnu-border-diagup',
iconCls : 'menu__icon btn-border-diagup',
icls : 'btn-border-diagup',
borderId : Asc.c_oAscBorderOptions.DiagU
},
{
caption : this.textDiagDownBorder,
iconCls : 'mnu-border-diagdown',
iconCls : 'menu__icon btn-border-diagdown',
icls : 'btn-border-diagdown',
borderId : Asc.c_oAscBorderOptions.DiagD
},
@ -1712,8 +1721,8 @@ define([
{
id : 'id-toolbar-mnu-item-border-width',
caption : this.textBordersStyle,
iconCls : 'mnu-icon-item mnu-border-width',
template : _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 11px; height: 11px; margin: 2px 7px 0 -9px;"></span><%= caption %></a>'),
iconCls : 'menu__icon btn-border-style',
// template : _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 11px; height: 11px; margin: 2px 7px 0 -9px;"></span><%= caption %></a>'),
menu : (function(){
var itemTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div class="border-size-item" style="background-position: 0 -<%= options.offsety %>px;"></div></a>');
@ -2082,11 +2091,11 @@ define([
me.btnImgForward.setMenu(new Common.UI.Menu({
items: [{
caption : _holder_view.textArrangeFront,
iconCls : 'mnu-arrange-front',
iconCls : 'menu__icon arrange-front',
value : Asc.c_oAscDrawingLayerType.BringToFront
}, {
caption : _holder_view.textArrangeForward,
iconCls : 'mnu-arrange-forward',
iconCls : 'menu__icon arrange-forward',
value : Asc.c_oAscDrawingLayerType.BringForward
}
]})
@ -2096,11 +2105,11 @@ define([
me.btnImgBackward.setMenu(new Common.UI.Menu({
items: [{
caption : _holder_view.textArrangeBack,
iconCls : 'mnu-arrange-back',
iconCls : 'menu__icon arrange-back',
value : Asc.c_oAscDrawingLayerType.SendToBack
}, {
caption : _holder_view.textArrangeBackward,
iconCls : 'mnu-arrange-backward',
iconCls : 'menu__icon arrange-backward',
value : Asc.c_oAscDrawingLayerType.SendBackward
}]
}));
@ -2109,38 +2118,38 @@ define([
me.btnImgAlign.setMenu(new Common.UI.Menu({
items: [{
caption : _holder_view.textShapeAlignLeft,
iconCls : 'mnu-img-align-left',
iconCls : 'menu__icon shape-align-left',
value : 0
}, {
caption : _holder_view.textShapeAlignCenter,
iconCls : 'mnu-img-align-center',
iconCls : 'menu__icon shape-align-center',
value : 4
}, {
caption : _holder_view.textShapeAlignRight,
iconCls : 'mnu-img-align-right',
iconCls : 'menu__icon shape-align-right',
value : 1
}, {
caption : _holder_view.textShapeAlignTop,
iconCls : 'mnu-img-align-top',
iconCls : 'menu__icon shape-align-top',
value : 3
}, {
caption : _holder_view.textShapeAlignMiddle,
iconCls : 'mnu-img-align-middle',
iconCls : 'menu__icon shape-align-middle',
value : 5
}, {
caption : _holder_view.textShapeAlignBottom,
iconCls : 'mnu-img-align-bottom',
iconCls : 'menu__icon shape-align-bottom',
value : 2
},
{caption: '--'},
{
caption: _holder_view.txtDistribHor,
iconCls: 'mnu-distrib-hor',
iconCls: 'menu__icon shape-distribute-hor',
value: 6
},
{
caption: _holder_view.txtDistribVert,
iconCls: 'mnu-distrib-vert',
iconCls: 'menu__icon shape-distribute-vert',
value: 7
}]
}));
@ -2149,11 +2158,11 @@ define([
me.btnImgGroup.setMenu(new Common.UI.Menu({
items: [{
caption : _holder_view.txtGroup,
iconCls : 'mnu-group',
iconCls : 'menu__icon shape-group',
value: 'grouping'
}, {
caption : _holder_view.txtUngroup,
iconCls : 'mnu-ungroup',
iconCls : 'menu__icon shape-ungroup',
value: 'ungrouping'
}]
}));

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 16 KiB

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 43 KiB

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 29 KiB

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 77 KiB

31
apps/spreadsheeteditor/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/spreadsheeteditor/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/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-add-pivot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 259 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 230 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-blank-rows.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 122 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 193 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-cell-group.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 154 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-cell-ungroup.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 190 B

BIN
apps/spreadsheeteditor/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/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-finance.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 206 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-math.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 110 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-func-text.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 354 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-grand-totals.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 135 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-ins-formula.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 419 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 279 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 389 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 117 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 229 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 192 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-pivot-layout.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 121 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-print-area.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 243 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 475 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 216 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-select-pivot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 265 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 112 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-to-columns.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 223 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-update-pivot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 396 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 135 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 136 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 110 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-clear-filter.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 207 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-currency-style.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 216 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 193 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 123 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 188 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 211 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 159 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 196 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 112 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-named-range.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 229 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-percent-style.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 258 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-down(ru).png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 286 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-down.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 276 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-up(ru).png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 285 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-sort-up.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 271 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-spellcheck-next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 231 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 124 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/text-orient-ccw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 295 B

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/1x/text-orient-cw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 293 B

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

@ -129,6 +129,9 @@
@import "formuladialog.less";
@import "filterdialog.less";
@import "sprites/iconssmall@1x";
@import "sprites/iconsbig@1x";
.font-size-small {
.fontsize(@font-size-small);
}

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

@ -11,18 +11,6 @@
}
}
button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;}
button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -2*@toolbar-icon-size;}
.button-normal-icon(btn-menu-file, 61, @toolbar-icon-size);
.button-normal-icon(btn-menu-search, 62, @toolbar-icon-size);
.button-normal-icon(btn-menu-comments, 63, @toolbar-icon-size);
.button-normal-icon(btn-menu-chat, 59, @toolbar-icon-size);
.button-normal-icon(btn-menu-about, 58, @toolbar-icon-size);
.button-normal-icon(btn-menu-support, 75, @toolbar-icon-size);
.button-normal-icon(btn-menu-plugin, 81, @toolbar-icon-size);
.button-normal-icon(btn-ic-docspell, 93, @toolbar-icon-size);
#left-menu {
&+.layout-resizer {
border-left: 0 none;

40
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View file

@ -78,46 +78,6 @@
}
}
/*menuText*/
.button-normal-icon(btn-menu-text, 64, @toolbar-icon-size);
/*menuImage*/
.button-normal-icon(btn-menu-image, 34, @toolbar-icon-size);
/*menuChart*/
.button-normal-icon(btn-menu-chart, 36, @toolbar-icon-size);
/*menuShape*/
.button-normal-icon(btn-menu-shape, 47, @toolbar-icon-size);
/*menuTextArt*/
.button-normal-icon(btn-menu-textart, 66, @toolbar-icon-size);
/*menuTable*/
.button-normal-icon(btn-menu-table, 80, @toolbar-icon-size);
/**menuSignature*/
.button-normal-icon(btn-menu-signature, 83, @toolbar-icon-size);
/*menuPivot*/
.button-normal-icon(btn-menu-pivot, 87, @toolbar-icon-size);
/*menuCell*/
.button-normal-icon(btn-menu-cell, 88, @toolbar-icon-size);
.button-otherstates-icon2(btn-category, @toolbar-icon-size);
.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-normal-icon(btn-position-diagu, 10, 21px);
.button-normal-icon(btn-position-diagd, 11, 21px);
.button-otherstates-icon(btn-borders-small, 21px);
.btn-edit-table,
.btn-change-shape {
.background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px);

7
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -259,13 +259,6 @@
}
}
.toolbar-btn-icon(btn-zoom-down, 68, @toolbar-icon-size);
.toolbar-btn-icon(btn-zoom-up, 67, @toolbar-icon-size);
.toolbar-btn-icon(btn-tab-first, 71, @toolbar-icon-size);
.toolbar-btn-icon(btn-tab-back, 72, @toolbar-icon-size);
.toolbar-btn-icon(btn-tab-next, 70, @toolbar-icon-size);
.toolbar-btn-icon(btn-tab-last, 69, @toolbar-icon-size);
.status-group {
white-space: nowrap;
&.dropup {

135
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -92,141 +92,6 @@
}
}
@toolbar-icon-size: 20px;
.toolbar-btn-icon(btn-fontcolor, 0, @toolbar-icon-size);
.toolbar-btn-icon(btn-valign-top, 1, @toolbar-icon-size);
//
.button-normal-icon(btn-bold, 3, @toolbar-icon-size);
.button-normal-icon(btn-border-all, 4, @toolbar-icon-size);
.button-normal-icon(btn-clearstyle, 5, @toolbar-icon-size);
.button-normal-icon(btn-incdecimal, 6, @toolbar-icon-size);
.button-normal-icon(btn-decdecimal, 7, @toolbar-icon-size);
.button-normal-icon(btn-italic, 8, @toolbar-icon-size);
.button-normal-icon(btn-fillparag, 9, @toolbar-icon-size);
.button-normal-icon(btn-merge, 10, @toolbar-icon-size);
.button-normal-icon(btn-print, 11, @toolbar-icon-size);
.button-normal-icon(btn-redo, 12, @toolbar-icon-size);
.button-normal-icon(btn-save, 13, @toolbar-icon-size);
.button-normal-icon(btn-sort-down, 14, @toolbar-icon-size);
.button-normal-icon(btn-formula, 15, @toolbar-icon-size);
.button-normal-icon(btn-undo, 16, @toolbar-icon-size);
.button-normal-icon(btn-wrap, 17, @toolbar-icon-size);
.button-normal-icon(btn-underline, 18, @toolbar-icon-size);
.button-normal-icon(btn-align-left, 21, @toolbar-icon-size);
.button-normal-icon(btn-align-center, 19, @toolbar-icon-size);
.button-normal-icon(btn-align-right, 22, @toolbar-icon-size);
.button-normal-icon(btn-align-just, 20, @toolbar-icon-size);
.button-normal-icon(btn-valign-middle, 23, @toolbar-icon-size);
.button-normal-icon(btn-valign-bottom, 24, @toolbar-icon-size);
.button-normal-icon(btn-border-out, 25, @toolbar-icon-size);
.button-normal-icon(btn-border-top, 26, @toolbar-icon-size);
.button-normal-icon(btn-border-bottom, 27, @toolbar-icon-size);
.button-normal-icon(btn-border-left, 28, @toolbar-icon-size);
.button-normal-icon(btn-border-right, 29, @toolbar-icon-size);
.button-normal-icon(btn-border-no, 30, @toolbar-icon-size);
.button-normal-icon(btn-border-center, 31, @toolbar-icon-size);
.button-normal-icon(btn-border-hmiddle, 32, @toolbar-icon-size);
.button-normal-icon(btn-border-vmiddle, 33, @toolbar-icon-size);
.button-normal-icon(btn-copy, 37, @toolbar-icon-size);
.button-normal-icon(btn-paste, 38, @toolbar-icon-size);
.button-normal-icon(btn-synch, 39, @toolbar-icon-size);
.button-normal-icon(btn-autofilter, 40, @toolbar-icon-size);
.button-normal-icon(btn-colorschemas, 41, @toolbar-icon-size);
.button-normal-icon(btn-newdocument, 42, @toolbar-icon-size);
.button-normal-icon(btn-opendocument, 43, @toolbar-icon-size);
.button-normal-icon(btn-incfont, 44, @toolbar-icon-size);
.button-normal-icon(btn-decfont, 45, @toolbar-icon-size);
.button-normal-icon(btn-text-orient, 46, @toolbar-icon-size);
.button-normal-icon(btn-sort-up, 49, @toolbar-icon-size);
.button-normal-icon(btn-clear-filter, 50, @toolbar-icon-size);
.button-normal-icon(btn-percent-style, 51, @toolbar-icon-size);
.button-normal-icon(btn-currency-style, 52, @toolbar-icon-size);
.button-normal-icon(btn-addcell, 53, @toolbar-icon-size);
.button-normal-icon(btn-delcell, 54, @toolbar-icon-size);
.button-normal-icon(btn-ttempl, 80, @toolbar-icon-size);
//
.button-normal-icon(btn-showmode, 56, @toolbar-icon-size);
.button-normal-icon(btn-settings, 57, @toolbar-icon-size);
//
.button-normal-icon(btn-search, 62, @toolbar-icon-size);
.button-normal-icon(btn-zoomin, 67, @toolbar-icon-size);
.button-normal-icon(btn-zoomout, 68, @toolbar-icon-size);
.button-normal-icon(btn-copystyle, 73, @toolbar-icon-size);
.button-normal-icon(btn-save-coauth, 76, @toolbar-icon-size);
.button-normal-icon(btn-border-diagup, 42, @toolbar-icon-size);
.button-normal-icon(btn-border-diagdown, 43, @toolbar-icon-size);
.button-normal-icon(btn-spellcheck-next, 70, @toolbar-icon-size);
.button-normal-icon(btn-spellcheck-preview, 72, @toolbar-icon-size);
.button-normal-icon(btn-named-range, 77, @toolbar-icon-size);
.button-normal-icon(btn-strikeout, 84, @toolbar-icon-size);
.button-normal-icon(btn-subscript, 85, @toolbar-icon-size);
.button-normal-icon(btn-superscript, 86, @toolbar-icon-size);
.button-normal-icon(rotate-90, 89, @toolbar-icon-size);
.button-normal-icon(rotate-270, 90, @toolbar-icon-size);
.button-normal-icon(flip-hor, 91, @toolbar-icon-size);
.button-normal-icon(flip-vert, 92, @toolbar-icon-size);
.button-normal-icon(btn-show-details, 73, @toolbar-icon-size);
.button-normal-icon(btn-hide-details, 73, @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-left, 2, @menu-icon-size);
.menu-btn-icon(mnu-align-right, 3, @menu-icon-size);
.menu-btn-icon(mnu-valign-bottom, 4, @menu-icon-size);
.menu-btn-icon(mnu-valign-middle, 5, @menu-icon-size);
.menu-btn-icon(mnu-valign-top, 6, @menu-icon-size);
.menu-btn-icon(mnu-border-all, 7, @menu-icon-size);
.menu-btn-icon(mnu-border-center, 8, @menu-icon-size);
.menu-btn-icon(mnu-border-bottom, 9, @menu-icon-size);
.menu-btn-icon(mnu-border-hmiddle, 10, @menu-icon-size);
.menu-btn-icon(mnu-border-top, 11, @menu-icon-size);
.menu-btn-icon(mnu-border-no, 12, @menu-icon-size);
.menu-btn-icon(mnu-border-out, 13, @menu-icon-size);
.menu-btn-icon(mnu-border-left, 14, @menu-icon-size);
.menu-btn-icon(mnu-border-vmiddle, 15, @menu-icon-size);
.menu-btn-icon(mnu-border-right, 16, @menu-icon-size);
//
.menu-btn-icon(mnu-arrange-front, 19, @menu-icon-size);
.menu-btn-icon(mnu-arrange-back, 20, @menu-icon-size);
.menu-btn-icon(mnu-arrange-forward, 21, @menu-icon-size);
.menu-btn-icon(mnu-arrange-backward, 22, @menu-icon-size);
.menu-btn-icon(mnu-sort-asc, 23, @menu-icon-size);
.menu-btn-icon(mnu-sort-desc, 24, @menu-icon-size);
.menu-btn-icon(mnu-filter-add, 25, @menu-icon-size);
.menu-btn-icon(mnu-filter-clear, 26, @menu-icon-size);
.menu-btn-icon(mnu-direct-horiz, 27, @menu-icon-size);
.menu-btn-icon(mnu-direct-ccw, 28, @menu-icon-size);
.menu-btn-icon(mnu-direct-cw, 29, @menu-icon-size);
//
.menu-btn-icon(mnu-direct-rup, 31, @menu-icon-size);
.menu-btn-icon(mnu-direct-rdown, 32, @menu-icon-size);
.menu-btn-icon(mnu-group, 33, @menu-icon-size);
.menu-btn-icon(mnu-ungroup, 34, @menu-icon-size);
//
.menu-btn-icon(mnu-border-diagup, 36, @menu-icon-size);
.menu-btn-icon(mnu-border-diagdown, 37, @menu-icon-size);
//
.menu-btn-icon(mnu-text-subscript, 38, @menu-icon-size);
.menu-btn-icon(mnu-text-superscript, 39, @menu-icon-size);
.menu-btn-icon(mnu-orient-portrait, 48, @menu-icon-size);
.menu-btn-icon(mnu-orient-landscape, 49, @menu-icon-size);
.menu-btn-icon(mnu-img-align-center, 41, @menu-icon-size);
.menu-btn-icon(mnu-img-align-left, 40, @menu-icon-size);
.menu-btn-icon(mnu-img-align-right, 42, @menu-icon-size);
.menu-btn-icon(mnu-img-align-bottom, 45, @menu-icon-size);
.menu-btn-icon(mnu-img-align-middle, 44, @menu-icon-size);
.menu-btn-icon(mnu-img-align-top, 43, @menu-icon-size);
.menu-btn-icon(mnu-distrib-hor, 46, @menu-icon-size);
.menu-btn-icon(mnu-distrib-vert, 47, @menu-icon-size);
.username-tip {
background-color: #ee3525;
border: none;