[SSE] Fix merging v.5.0.7 to develop.
This commit is contained in:
parent
4df72ed078
commit
7959ab8773
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Binary file not shown.
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 30 KiB |
|
@ -285,6 +285,12 @@
|
|||
.button-normal-icon(~'x-huge .btn-ic-history', 34, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-ic-protect', 35, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-ic-signature', 36, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-add-pivot', 37, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-update-pivot', 38, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-pivot-layout', 39, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-blank-rows', 43, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-subtotals', 46, @toolbar-big-icon-size);
|
||||
.button-normal-icon(~'x-huge .btn-grand-totals', 52, @toolbar-big-icon-size);
|
||||
.button-normal-icon(review-save, 14, @toolbar-big-icon-size);
|
||||
.button-normal-icon(review-deny, 15, @toolbar-big-icon-size);
|
||||
.button-normal-icon(review-next, 16, @toolbar-big-icon-size);
|
||||
|
|
|
@ -166,7 +166,7 @@ define([
|
|||
|
||||
this.btnAddPivot = new Common.UI.Button({
|
||||
cls: 'btn-toolbar x-huge icon-top',
|
||||
iconCls: 'btn-ic-docspell',
|
||||
iconCls: 'btn-add-pivot',
|
||||
caption: this.txtCreate,
|
||||
disabled : true
|
||||
});
|
||||
|
@ -174,7 +174,7 @@ define([
|
|||
|
||||
this.btnPivotLayout = new Common.UI.Button({
|
||||
cls : 'btn-toolbar x-huge icon-top',
|
||||
iconCls : 'btn-insertimage',
|
||||
iconCls : 'btn-pivot-layout',
|
||||
caption : this.capLayout,
|
||||
disabled : true,
|
||||
menu : new Common.UI.Menu({
|
||||
|
@ -192,7 +192,7 @@ define([
|
|||
|
||||
this.btnPivotBlankRows = new Common.UI.Button({
|
||||
cls : 'btn-toolbar x-huge icon-top',
|
||||
iconCls : 'btn-insertimage',
|
||||
iconCls : 'btn-blank-rows',
|
||||
caption : this.capBlankRows,
|
||||
disabled : true,
|
||||
menu : new Common.UI.Menu({
|
||||
|
@ -206,7 +206,7 @@ define([
|
|||
|
||||
this.btnPivotSubtotals = new Common.UI.Button({
|
||||
cls : 'btn-toolbar x-huge icon-top',
|
||||
iconCls : 'btn-insertimage',
|
||||
iconCls : 'btn-subtotals',
|
||||
caption : this.capSubtotals,
|
||||
disabled : true,
|
||||
menu : new Common.UI.Menu({
|
||||
|
@ -221,7 +221,7 @@ define([
|
|||
|
||||
this.btnPivotGrandTotals = new Common.UI.Button({
|
||||
cls : 'btn-toolbar x-huge icon-top',
|
||||
iconCls : 'btn-insertimage',
|
||||
iconCls : 'btn-grand-totals',
|
||||
caption : this.capGrandTotals,
|
||||
disabled : true,
|
||||
menu : new Common.UI.Menu({
|
||||
|
@ -237,7 +237,7 @@ define([
|
|||
|
||||
this.btnRefreshPivot = new Common.UI.Button({
|
||||
cls: 'btn-toolbar x-huge icon-top',
|
||||
iconCls: 'btn-ic-docspell',
|
||||
iconCls: 'btn-update-pivot',
|
||||
caption: this.txtRefresh,
|
||||
disabled : true
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue