From 48001a2599237a50480b2f0be9cb81fb09533af3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Oct 2020 21:59:30 +0300 Subject: [PATCH] [SSE] Fix Bug 18054: add autocorrect options, change icons --- .../main/app/controller/DocumentHolder.js | 49 +++++++++++++++--- apps/spreadsheeteditor/main/locale/en.json | 2 + .../img/toolbar/1.25x/btn-autocorrect.png | Bin 0 -> 286 bytes .../img/toolbar/1.5x/btn-autocorrect.png | Bin 0 -> 334 bytes .../img/toolbar/1.75x/btn-autocorrect.png | Bin 0 -> 390 bytes .../img/toolbar/1x/btn-autocorrect.png | Bin 0 -> 243 bytes .../img/toolbar/2x/btn-autocorrect.png | Bin 0 -> 394 bytes 7 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-autocorrect.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-autocorrect.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-autocorrect.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-autocorrect.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-autocorrect.png diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a85e080f1..f4df43c93 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -2666,8 +2666,8 @@ define([ // Prepare menu container if (pasteContainer.length < 1) { me._arrAutoCorrectPaste = []; - me._arrAutoCorrectPaste[Asc.c_oAscAutoCorrectOptions.UndoTableAutoExpansion] = me.txtUndoExpansion; - me._arrAutoCorrectPaste[Asc.c_oAscAutoCorrectOptions.RedoTableAutoExpansion] = me.txtRedoExpansion; + me._arrAutoCorrectPaste[Asc.c_oAscAutoCorrectOptions.UndoTableAutoExpansion] = {caption: me.txtUndoExpansion, icon: 'menu__icon btn-undo'}; + me._arrAutoCorrectPaste[Asc.c_oAscAutoCorrectOptions.RedoTableAutoExpansion] = {caption: me.txtRedoExpansion, icon: 'menu__icon btn-redo'}; pasteContainer = $('
'); documentHolderView.cmpEl.append(pasteContainer); @@ -2675,9 +2675,10 @@ define([ me.btnAutoCorrectPaste = new Common.UI.Button({ parentEl: $('#id-document-holder-btn-autocorrect-paste'), cls : 'btn-toolbar', - iconCls : 'toolbar__icon btn-paste', - menu : new Common.UI.Menu({items: []}) + iconCls : 'toolbar__icon btn-autocorrect', + menu : new Common.UI.Menu({cls: 'shifted-right', items: []}) }); + me.btnAutoCorrectPaste.menu.on('show:after', _.bind(me.onAutoCorrectOpenAfter, me)); } if (pasteItems.length>0) { @@ -2690,14 +2691,32 @@ define([ var group_prev = -1; _.each(pasteItems, function(menuItem, index) { var mnu = new Common.UI.MenuItem({ - caption: me._arrAutoCorrectPaste[menuItem], - value: menuItem + caption: me._arrAutoCorrectPaste[menuItem].caption, + value: menuItem, + iconCls: me._arrAutoCorrectPaste[menuItem].icon }).on('click', function(item, e) { me.api.asc_applyAutoCorrectOptions(item.value); setTimeout(function(){menu.hide();}, 100); }); menu.addItem(mnu); }); + me.mnuAutoCorrectStop = new Common.UI.MenuItem({ + caption: me.textStopExpand, + checkable: true, + allowDepress: true, + checked: !Common.Utils.InternalSettings.get("sse-settings-autoformat-new-rows") + }).on('click', function(item){ + Common.localStorage.setBool("sse-settings-autoformat-new-rows", !item.checked); + Common.Utils.InternalSettings.set("sse-settings-autoformat-new-rows", !item.checked); + me.api.asc_setIncludeNewRowColTable(!item.checked); + setTimeout(function(){menu.hide();}, 100); + }); + menu.addItem(me.mnuAutoCorrectStop); + menu.addItem({caption: '--'}); + var mnu = new Common.UI.MenuItem({ + caption: me.textAutoCorrectSettings + }).on('click', _.bind(me.onAutoCorrectOptions, me)); + menu.addItem(mnu); } var width = me.tooltips.coauth.bodyWidth - me.tooltips.coauth.XY[0] - me.tooltips.coauth.rightMenuWidth - 15, @@ -3487,6 +3506,20 @@ define([ } }, + onAutoCorrectOpenAfter: function(menu) { + this.mnuAutoCorrectStop && this.mnuAutoCorrectStop.setChecked(!Common.Utils.InternalSettings.get("sse-settings-autoformat-new-rows")); + }, + + onAutoCorrectOptions: function() { + var win = (new Common.Views.AutoCorrectDialog({ + api: this.api + })); + if (win) { + win.show(); + win.setActiveCategory(2); + } + }, + SetDisabled: function(state, canProtect) { this._isDisabled = state; this._canProtect = canProtect; @@ -3638,7 +3671,9 @@ define([ txtBlanks: '(Blanks)', txtColumn: 'Column', txtImportWizard: 'Text Import Wizard', - textPasteSpecial: 'Paste special' + textPasteSpecial: 'Paste special', + textStopExpand: 'Stop automatically expanding tables', + textAutoCorrectSettings: 'AutoCorrect options' }, SSE.Controllers.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index a9209f63f..f63deb5a0 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -449,6 +449,8 @@ "SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion", "SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard", "SSE.Controllers.DocumentHolder.txtWidth": "Width", + "SSE.Controllers.DocumentHolder.textStopExpand": "Stop automatically expanding tables", + "SSE.Controllers.DocumentHolder.textAutoCorrectSettings": "AutoCorrect options", "SSE.Controllers.FormulaDialog.sCategoryAll": "All", "SSE.Controllers.FormulaDialog.sCategoryCube": "Cube", "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database", diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-autocorrect.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-autocorrect.png new file mode 100644 index 0000000000000000000000000000000000000000..bfcc865f83fb0f361513f82c22931ff66df68501 GIT binary patch literal 286 zcmV+(0pb3MP)X1ONa4*GO&HEUKQp{EglGO_ z`k~Y68?A&6T91`@#a^Ib%WtzHszAY}W+LRdRAfo5y}8a%A=>&*wWdf^;Hg%%6L_k; zq=u-#Q!Pp);8gj;A%RnIiJK}@*G-kB>!OO#by3CWLRFluN|i@fbu>y>bu>oTULqb{ zdx^Mol|5Kpum_t+&9TQwS2V{SbRu*U_gX>8M7~x9G5cBpV%8HNCOrXS*3)kf-qX1U k>*@R-DL6;niD%6D0(m)J^_+y(0{{R307*qoM6N<$g8fN%R{#J2 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-autocorrect.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-autocorrect.png new file mode 100644 index 0000000000000000000000000000000000000000..656788df3a7a827f76423e03bfcec92f074ca0c1 GIT binary patch literal 334 zcmV-U0kQsxP)_VbK97)j~0#CkVR=Yyz+{R9$Q@09J-7vfZmfwGbc`D#WWprQQsMN@@l|CC@3eP^jcNwMeL- zT&qyk=GqSeyFmdP1a<=gMkF@95G1i_%-fAMMR{PyilWr>B1QQ!FH)4MK%mA_1%fn| zykxAg)FnrTz4wz^s6xj{)p&asI21orVI4CUuJV$P*e_6kBUBY?-W}iUW8R%Bz4WP# g--5sJp87}K0Npj?o9&h-QUCw|07*qoM6N<$f@qA5T>t<8 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-autocorrect.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-autocorrect.png new file mode 100644 index 0000000000000000000000000000000000000000..5c3638c0986ed6ae5fb0d915a4ef7e5e01aebf66 GIT binary patch literal 390 zcmV;10eSw3P)5+_n?yW*7J``43ezZRgT zrshv+dxzOGa9gm)JlvMEaT7&3c5D=bQ-;EAvCYX7l*u00C=Gf7G9kMK+&x8Uy*2z7 zjdz0Lk>5hMMTpYxfRb&?%QgZOx-Bo{x6o}ljUY(2Eut2>ErY0pZi}p?=oU6y(JfrK zl3VzmDY}L0nSxsq&p0dE7V4QzEty+n$DO%Fd)#4nE_%-du*(i80Lcpzd1i+3O3%zF zUF;b#N*8-Zh!W4GeSkR8T;wg$Tm}V7r&QkJn%`Wm3Ka93i=qYGZLtdfM=F82eXXKt zSsWZr`2ZS}#lap`Ezpi~t3)uP!Ya{RK3379nAs}Imd{+CQmZ6$d7`!@+|dZ?gt_d{ k0^7dIt1!E?)YPoy4Z&n^pM4nm?*IS*07*qoM6N<$f`CM;L;wH) literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-autocorrect.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-autocorrect.png new file mode 100644 index 0000000000000000000000000000000000000000..601ea903339ec9e4915aa26b6f4591ed0ab70935 GIT binary patch literal 243 zcmVpVr#Pp=kx$<;ui~ox zrISqIEKjpJZjN1^W&^jsPz8dJ+|b0zl@kWbQ!muX-d~T498~gS>gpJZj4nq$d2Mg* tIE$jsMV7UYFoZ(zKkQx{xw}rr+Ed2&(P)x+L`_Xi zO-&9>%P8h;b$+sltvbIsjaO*ABv)WOqKPBp5ebLJ8`t1?YixU6aJ()w-ki+mt&f+? z=dJdmVULVQBztH)6D~-+B{ZH17bKnq7r@Vg3u0%%1@XIqOMbuZc&m8i^}B(Kx`D^u z9j|kQWAXakz(wELr-I+dALE_k_Os!lZrb|?2p6qg3j999W&=LA1sljOU-R{|Kz8|> zFTwnDe*^n}o~u6=%rBeE(LV@_r{{7A=%?l~{1GfQ7u;`7HAsHjUpbOJ{goiu)t?{9 zu6dm3FtT}^65{v5OBs^i24on?Mt>Ux>D6D9-<&4Kk*wyyFp~8=a3p8*;Gm!P><>qB o*54t4e$;mqDhc*$YWk-B0fRk4Yj_sl4*&oF07*qoM6N<$f|1y?MgRZ+ literal 0 HcmV?d00001