From e7f335b455610ba9efe7952c93c7707d852ba7b9 Mon Sep 17 00:00:00 2001 From: Evgeny Katyshev Date: Fri, 3 Dec 2021 15:08:20 +0300 Subject: [PATCH 1/2] New icons for table properties --- .../img/toolbar/1.25x/rows-and-columns.png | Bin 0 -> 133 bytes .../img/toolbar/1.5x/rows-and-columns.png | Bin 0 -> 137 bytes .../img/toolbar/1.75x/rows-and-columns.png | Bin 0 -> 145 bytes .../resources/img/toolbar/1x/rows-and-columns.png | Bin 0 -> 128 bytes .../resources/img/toolbar/2x/rows-and-columns.png | Bin 0 -> 152 bytes .../resources/img/toolbar/1.25x/resize-table.png | Bin 0 -> 224 bytes .../resources/img/toolbar/1.5x/resize-table.png | Bin 0 -> 297 bytes .../resources/img/toolbar/1.75x/resize-table.png | Bin 0 -> 275 bytes .../resources/img/toolbar/1x/resize-table.png | Bin 0 -> 212 bytes .../resources/img/toolbar/2x/resize-table.png | Bin 0 -> 309 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/common/main/resources/img/toolbar/1.25x/rows-and-columns.png create mode 100644 apps/common/main/resources/img/toolbar/1.5x/rows-and-columns.png create mode 100644 apps/common/main/resources/img/toolbar/1.75x/rows-and-columns.png create mode 100644 apps/common/main/resources/img/toolbar/1x/rows-and-columns.png create mode 100644 apps/common/main/resources/img/toolbar/2x/rows-and-columns.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/resize-table.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/resize-table.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/resize-table.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/resize-table.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2x/resize-table.png diff --git a/apps/common/main/resources/img/toolbar/1.25x/rows-and-columns.png b/apps/common/main/resources/img/toolbar/1.25x/rows-and-columns.png new file mode 100644 index 0000000000000000000000000000000000000000..54b27e77797699a38bcd8ac1af515094539cca99 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!2%?2#%?_iquHbH16Ti|VvV&z)zvr`H{an^LB{Ts5VskU? literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.75x/rows-and-columns.png b/apps/common/main/resources/img/toolbar/1.75x/rows-and-columns.png new file mode 100644 index 0000000000000000000000000000000000000000..9987a1c5fe469999ebde33441be7b2fce8fde24c GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!2%?k<+eNnQW2gmjv*C{ZzmgaF(~jH`6avm zh4gRrxqFL+ST#Mb@hvPUlw>&JEbcb%rJ?Vc7mMy!_y`x5T+HJ-BH(=H_+_ze^960x uSpN6i7wJ%Jo3Z?I+N~o3hqq`mGYIoq6d$wP(6Jt92ZN`ppUXO@geCxWr!pS^ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/rows-and-columns.png b/apps/common/main/resources/img/toolbar/1x/rows-and-columns.png new file mode 100644 index 0000000000000000000000000000000000000000..acd53cd4e342e34307034a63a2a6ab5762753756 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcDR)m7$B+ufWQmmzco;cY|DS)* zeu6E_Nnt`LYa@rD2(zi8z=>5&4lOqV3??i~6pX2vV-2|z%`tGh#>95WOC3iPPKiT9y?_R6^|L80SE-j1q ze76poe%coOQ}4^a=N=*<7x->Dx-VMLR3^|cf6gxNEoTG@;$Hx*V(@hJb6Mw<&;$T` C_B%`f literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/resize-table.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/resize-table.png new file mode 100644 index 0000000000000000000000000000000000000000..33949f56ca0b17055d0737e4ae96aa8b19312df4 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!2%?2#%?_iq?UWSIEGZ*dOP(hBa0)4bFgpK zBHxVWc}4Hm6y(jE`m@^N$7?wy85ie8F>e%^ZXWF5O65;h5NbKwHe-cIYKG>;DMIg; z+Sp%~n=@Z>!XtaemH)PKNH*}h-T9`;&wO9)w2}2qc2iWk(6GnJ`U`aW|{#(HlT{*<= zTM;~;TU>~%&9y(b_+2bjnvk!hKw@W`nU(^H$y4{yO{d4x*EWg!=%&-->1%WLaxigs z61QMt`(-?JS%~qib<}0iV>GP`1`=0r5ey`*H_Y+oC;y%BB`ygmKE3_=@jC~ri#g*3z+=*DvXL1FeaK* zoIPW>gOau_V5pV3Z3`G~Wu_D`#9_+Un1r*1&kNGww~H{F&x?a6eY?^hg~Dd`$7WV> zGrUda6fjI-&NGH6KYE&`^e+82P3E`r^4kHoGN^42Z<7vg+fxosDZ~L$TDQt(Xe)PT Z@&d-dSDyjQSw{c>002ovPDHLkV1jV}bprqZ literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/resize-table.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/resize-table.png new file mode 100644 index 0000000000000000000000000000000000000000..30c61d2b19873258029cec37c412745fec71881d GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<h{kIzcso9<`jv*Ddu7ga2UMeT3SSE{T@?vUGLzkKVb zuJ%;9XI<^8`!w47!+$QVs0q4fb~^5(TVr@fcywy`0bi^9&*6{x-@V;?#?&h!0_aQz MPgg&ebxsLQ0HBXpJ^%m! literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/resize-table.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/resize-table.png new file mode 100644 index 0000000000000000000000000000000000000000..48a3728ff98d246eba4a145309cbb66d080b6641 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5!2%=?XKw8RQhz*M978G?-`-$sJ76HddZE7e z>mwTMgn3I@G3`OVG6XmGH8EVzhq|A8O# z_yU<$crz&9XT8T^^yA0<{HKqN53rqgu=7vtn4SuuQ^X$$KhS&f=gJ2VHRpOF`++T8 zGFfE|KC3m}Gt3Axy2m&{=&@?%1m8pR*$wwTdB0$Gi#>l*ZNlI9nEJ_A^o_rAf3@xY z>QI~aZtjwQTQ`3=y0_-_;)>5JDt@o6VE+7B_W{#S#tQGRuQx4hzX=Qn22WQ%mvv4F FO#ns9if8}; literal 0 HcmV?d00001 From d39e4a41c43ac75b9c3597112b3541139593e6be Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 4 Dec 2021 22:59:28 +0300 Subject: [PATCH 2/2] Fix Bug 52178 --- apps/common/main/resources/less/buttons.less | 4 ++ .../main/app/template/TableSettings.template | 3 +- .../main/app/view/TableSettings.js | 14 ++++--- .../main/app/template/TableSettings.template | 3 +- .../main/app/view/TableSettings.js | 14 ++++--- .../main/app/template/TableSettings.template | 8 ++-- .../main/app/view/CellSettings.js | 8 ++-- .../main/app/view/TableSettings.js | 40 ++++++++++++------- 8 files changed, 54 insertions(+), 40 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 4d15029ff..e8df917d2 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -449,6 +449,10 @@ display: none; } } + + &.align-left { + text-align: left; + } } .btn-category { diff --git a/apps/documenteditor/main/app/template/TableSettings.template b/apps/documenteditor/main/app/template/TableSettings.template index bdbdf810e..43682ae7c 100644 --- a/apps/documenteditor/main/app/template/TableSettings.template +++ b/apps/documenteditor/main/app/template/TableSettings.template @@ -96,8 +96,7 @@ - -
+
diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 692d8e3b0..09a540c39 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -347,9 +347,11 @@ define([ this.btnEdit = new Common.UI.Button({ parentEl: $('#table-btn-edit'), - cls: 'btn-icon-default', - iconCls: 'btn-edit-table', - menu : new Common.UI.Menu({ + cls : 'btn-toolbar align-left', + iconCls : 'toolbar__icon rows-and-columns', + caption : this.textEdit, + style : 'width: 100%;', + menu: new Common.UI.Menu({ menuAlign: 'tr-br', items: [ { caption: this.selectRowText, value: 0 }, @@ -370,9 +372,9 @@ define([ { caption: this.splitCellsText, value: 12 } ] }), - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'big' + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2]; this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1]; diff --git a/apps/presentationeditor/main/app/template/TableSettings.template b/apps/presentationeditor/main/app/template/TableSettings.template index 3a57799ab..673ed83a9 100644 --- a/apps/presentationeditor/main/app/template/TableSettings.template +++ b/apps/presentationeditor/main/app/template/TableSettings.template @@ -96,8 +96,7 @@ - -
+
diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index f0ef9c70c..9eb9bb92f 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -334,9 +334,11 @@ define([ this.btnEdit = new Common.UI.Button({ parentEl: $('#table-btn-edit'), - cls: 'btn-icon-default', - iconCls: 'btn-edit-table', - menu : new Common.UI.Menu({ + cls : 'btn-toolbar align-left', + iconCls : 'toolbar__icon rows-and-columns', + caption : this.textEdit, + style : 'width: 100%;', + menu: new Common.UI.Menu({ menuAlign: 'tr-br', items: [ { caption: this.selectRowText, value: 0 }, @@ -357,9 +359,9 @@ define([ { caption: this.splitCellsText, value: 12 } ] }), - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'big' + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2]; this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1]; diff --git a/apps/spreadsheeteditor/main/app/template/TableSettings.template b/apps/spreadsheeteditor/main/app/template/TableSettings.template index 03dd5bd64..c50d11d43 100644 --- a/apps/spreadsheeteditor/main/app/template/TableSettings.template +++ b/apps/spreadsheeteditor/main/app/template/TableSettings.template @@ -62,15 +62,13 @@ - - - + +
- -
+
diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 3964e3a74..b45ba0114 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -561,15 +561,15 @@ define([ this.btnCondFormat = new Common.UI.Button({ parentEl: $('#cell-btn-cond-format'), - cls : 'btn-toolbar', + cls : 'btn-toolbar align-left', iconCls : 'toolbar__icon btn-cond-format', caption : this.textCondFormat, - style : 'width: 100%;text-align: left;', + style : 'width: 100%;', menu: true, disabled: this._locked, dataHint : '1', - dataHintDirection: 'bottom', - dataHintOffset: 'big' + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnCondFormat); }, diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index 03484359b..7ff952f02 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -273,16 +273,25 @@ define([ this.lockedControls.push(this.txtTableName); this.btnSelectData = new Common.UI.Button({ - el: $('#table-btn-select-data') + parentEl: $('#table-btn-select-data'), + cls : 'btn-toolbar align-left', + iconCls : 'toolbar__icon resize-table', + caption : this.textResize, + style : 'width: 100%;', + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); this.btnSelectData.on('click', _.bind(this.onSelectData, this)); this.lockedControls.push(this.btnSelectData); this.btnEdit = new Common.UI.Button({ parentEl: $('#table-btn-edit'), - cls: 'btn-icon-default', - iconCls: 'btn-edit-table', - menu : new Common.UI.Menu({ + cls : 'btn-toolbar align-left', + iconCls : 'toolbar__icon rows-and-columns', + caption : this.textEdit, + style : 'width: 100%;', + menu: new Common.UI.Menu({ menuAlign: 'tr-br', items: [ { caption: this.selectRowText, value: Asc.c_oAscChangeSelectionFormatTable.row, idx: 0 }, @@ -300,10 +309,11 @@ define([ { caption: this.deleteTableText, value: Asc.c_oAscDeleteOptions.DeleteTable, idx: 10 } ] }), - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'medium' + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'small' }); + this.btnEdit.menu.on('show:after', _.bind( function(menu){ if (this.api) { menu.items[5].setDisabled(!this._originalProps.asc_getIsInsertRowAbove()); @@ -321,10 +331,10 @@ define([ this.btnConvertRange = new Common.UI.Button({ parentEl: $('#table-btn-convert-range'), - cls : 'btn-toolbar', + cls : 'btn-toolbar align-left', iconCls : 'toolbar__icon btn-convert-to-range', caption : this.textConvertRange, - style : 'width: 100%;text-align: left;', + style : 'width: 100%;', dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' @@ -338,10 +348,10 @@ define([ this.btnRemDuplicates = new Common.UI.Button({ parentEl: $('#table-btn-rem-duplicates'), - cls : 'btn-toolbar', + cls : 'btn-toolbar align-left', iconCls : 'toolbar__icon btn-remove-duplicates', caption : this.textRemDuplicates, - style : 'width: 100%;text-align: left;', + style : 'width: 100%;', dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' @@ -353,10 +363,10 @@ define([ this.btnSlicer = new Common.UI.Button({ parentEl: $('#table-btn-slicer'), - cls : 'btn-toolbar', + cls : 'btn-toolbar align-left', iconCls : 'toolbar__icon btn-slicer', caption : this.textSlicer, - style : 'width: 100%;text-align: left;', + style : 'width: 100%;', dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' @@ -366,10 +376,10 @@ define([ this.btnPivot = new Common.UI.Button({ parentEl: $('#table-btn-pivot'), - cls : 'btn-toolbar', + cls : 'btn-toolbar align-left', iconCls : 'toolbar__icon btn-pivot-sum', caption : this.textPivot, - style : 'width: 100%;text-align: left;', + style : 'width: 100%;', dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small'