From 15f495ee587689a9f9531c7e107c66625036fb31 Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Sun, 2 Oct 2022 21:31:12 +0300 Subject: [PATCH 1/6] [SSE PE DE] For the button on the toolbar added the option to create vertical text --- .../main/app/controller/Toolbar.js | 15 +++++++++---- apps/documenteditor/main/app/view/Toolbar.js | 14 ++++++++++-- apps/documenteditor/main/locale/en.json | 2 ++ apps/documenteditor/main/locale/ru.json | 2 ++ .../main/app/controller/Toolbar.js | 6 ++--- .../main/app/view/Toolbar.js | 22 ++++++++++++++----- apps/presentationeditor/main/locale/en.json | 2 ++ apps/presentationeditor/main/locale/ru.json | 2 ++ .../main/app/controller/Toolbar.js | 8 +++++-- .../main/app/view/Toolbar.js | 16 ++++++++++++-- apps/spreadsheeteditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/locale/ru.json | 2 ++ 12 files changed, 75 insertions(+), 18 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 6812ef505..080d7adab 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -334,7 +334,11 @@ define([ toolbar.mnuInsertTable.on('item:click', _.bind(this.onInsertTableClick, this)); toolbar.mnuInsertTable.on('show:after', _.bind(this.onInsertTableShow, this)); toolbar.mnuInsertImage.on('item:click', _.bind(this.onInsertImageClick, this)); - toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); + toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this, 'textRect')); + toolbar.btnInsertText.menu.on('item:click', _.bind(function(btn, e) { + this.toolbar.btnInsertText.toggle(true); + this.onBtnInsertTextClick(e.value, btn, e); + }, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); toolbar.btnDropCap.menu.on('item:click', _.bind(this.onDropCapSelect, this)); toolbar.btnContentControls.menu.on('item:click', _.bind(this.onControlsSelect, this)); @@ -1648,9 +1652,10 @@ define([ Common.NotificationCenter.trigger('storage:image-insert', data); }, - onBtnInsertTextClick: function(btn, e) { - if (this.api) - this._addAutoshape(btn.pressed, 'textRect'); + onBtnInsertTextClick: function(type, btn, e) { + if (this.api){ + this._addAutoshape(this.toolbar.btnInsertText.pressed, type); + } if (this.toolbar.btnInsertShape.pressed) this.toolbar.btnInsertShape.toggle(false, true); @@ -1659,6 +1664,8 @@ define([ Common.component.Analytics.trackEvent('ToolBar', 'Add Text'); }, + + onInsertShapeHide: function(btn, e) { if (this.toolbar.btnInsertShape.pressed && !this._isAddingShape) { this.toolbar.btnInsertShape.toggle(false, true); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index fd1e35386..a8f08ac2c 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -682,6 +682,7 @@ define([ _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsTextbox, enableToggle: true, + split: true, dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2011,7 +2012,7 @@ define([ this.btnInsertTable.updateHint(this.tipInsertTable); this.btnInsertImage.updateHint(this.tipInsertImage); this.btnInsertChart.updateHint(this.tipInsertChart); - this.btnInsertText.updateHint(this.tipInsertText); + this.btnInsertText.updateHint([this.tipInsertHorizontalText ,this.tipInsertText]); this.btnInsertTextArt.updateHint(this.tipInsertTextArt); this.btnEditHeader.updateHint(this.tipEditHeader); this.btnInsDateTime.updateHint(this.tipDateTime); @@ -2221,6 +2222,13 @@ define([ }; this.btnInsertTextArt.menu.on('show:before', onShowBeforeTextArt); + this.btnInsertText.setMenu(new Common.UI.Menu({ + items: [ + {caption: this.tipInsertHorizontalText, value: 'textRect'}, + {caption: this.tipInsertVerticalText, value: 'textRectVertical'}, + ] + })); + // set dataviews var _conf = this.mnuMarkersPicker.conf; @@ -2710,7 +2718,9 @@ define([ textAutoColor: 'Automatic', tipInsertChart: 'Insert Chart', tipColorSchemas: 'Change Color Scheme', - tipInsertText: 'Insert Text', + tipInsertHorizontalText: 'Insert horizontal text box', + tipInsertVerticalText: 'Insert vertical text box', + tipInsertText: 'Insert text box', tipInsertTextArt: 'Insert Text Art', mniEditDropCap: 'Drop Cap Settings', textNone: 'None', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 2e0bb72c9..9497854f1 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2897,6 +2897,8 @@ "DE.Views.Toolbar.tipInsertShape": "Insert autoshape", "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "DE.Views.Toolbar.tipInsertTable": "Insert table", + "DE.Views.Toolbar.tipInsertHorizontalText": "Insert horizontal text box", + "DE.Views.Toolbar.tipInsertVerticalText": "Insert vertical text box", "DE.Views.Toolbar.tipInsertText": "Insert text box", "DE.Views.Toolbar.tipInsertTextArt": "Insert Text Art", "DE.Views.Toolbar.tipLineNumbers": "Show line numbers", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 846febce5..4aaf2bc04 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -2869,6 +2869,8 @@ "DE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", "DE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "DE.Views.Toolbar.tipInsertTable": "Вставить таблицу", + "DE.Views.Toolbar.tipInsertHorizontalText": "Вставить горизонтальную надпись", + "DE.Views.Toolbar.tipInsertVerticalText": "Вставить вертикальную надпись", "DE.Views.Toolbar.tipInsertText": "Вставить надпись", "DE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art", "DE.Views.Toolbar.tipLineNumbers": "Показывать номера строк", diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 917fb1299..ca8cadd8b 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1784,14 +1784,14 @@ define([ Common.NotificationCenter.trigger('storage:image-insert', data); }, - onInsertText: function(status) { + onInsertText: function(status, type) { if ( status == 'begin' ) { - this._addAutoshape(true, 'textRect'); + this._addAutoshape(true, type); if ( !this.toolbar.btnsInsertText.pressed() ) this.toolbar.btnsInsertText.toggle(true, true); } else - this._addAutoshape(false, 'textRect'); + this._addAutoshape(false, type); if ( this.toolbar.btnsInsertShape.pressed() ) this.toolbar.btnsInsertShape.toggle(false, true); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index db6f90d0f..1bf0a9d73 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1283,7 +1283,7 @@ define([ this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small'); this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-text', this.capInsertText, - [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, false, true, '1', 'bottom', 'small'); + [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], true, false, true, '1', 'bottom', 'small'); this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small'); this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', 'toolbar__icon btn-addslide', this.capAddSlide, @@ -1318,10 +1318,20 @@ define([ btn.menu.items[2].setVisible(config.canRequestInsertImage || config.fileChoiceUrl && config.fileChoiceUrl.indexOf("{documentType}")>-1); }); - me.btnsInsertText.forEach(function (btn) { - btn.updateHint(me.tipInsertText); - btn.on('click', function (btn, e) { - me.fireEvent('insert:text', [btn.pressed ? 'begin' : 'end']); + me.btnsInsertText.forEach(function (button) { + button.updateHint([me.tipInsertHorizontalText, me.tipInsertText]); + button.setMenu(new Common.UI.Menu({ + items: [ + {caption: me.tipInsertHorizontalText, value: 'textRect'}, + {caption: me.tipInsertVerticalText, value: 'textRectVertical'}, + ] + })); + button.on('click', function (btn, e) { + me.fireEvent('insert:text', [btn.pressed ? 'begin' : 'end', 'textRect']); + }); + button.menu.on('item:click', function(btn, e) { + button.toggle(true); + me.fireEvent('insert:text', ['begin', e.value]); }); }); @@ -1936,6 +1946,8 @@ define([ mniImageFromUrl: 'Image from url', mniCustomTable: 'Insert Custom Table', tipInsertHyperlink: 'Add Hyperlink', + tipInsertHorizontalText: 'Insert horizontal text box', + tipInsertVerticalText: 'Insert vertical text box', tipInsertText: 'Insert Text', tipInsertTextArt: 'Insert Text Art', tipInsertShape: 'Insert Autoshape', diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 99594782d..bdae76b7a 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -2303,6 +2303,8 @@ "PE.Views.Toolbar.tipInsertImage": "Insert image", "PE.Views.Toolbar.tipInsertShape": "Insert autoshape", "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol", + "PE.Views.Toolbar.tipInsertHorizontalText": "Insert horizontal text box", + "PE.Views.Toolbar.tipInsertVerticalText": "Insert vertical text box", "PE.Views.Toolbar.tipInsertTable": "Insert table", "PE.Views.Toolbar.tipInsertText": "Insert text box", "PE.Views.Toolbar.tipInsertTextArt": "Insert Text Art", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 69973dadf..ef4f12a5e 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -2283,6 +2283,8 @@ "PE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", "PE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "PE.Views.Toolbar.tipInsertTable": "Вставить таблицу", + "PE.Views.Toolbar.tipInsertHorizontalText": "Вставить горизонтальную надпись", + "PE.Views.Toolbar.tipInsertVerticalText": "Вставить вертикальную надпись", "PE.Views.Toolbar.tipInsertText": "Вставить надпись", "PE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art", "PE.Views.Toolbar.tipInsertVideo": "Вставить видео", diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 771747696..3de911f08 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -401,6 +401,10 @@ define([ toolbar.btnInsertImage.menu.on('item:click', _.bind(this.onInsertImageMenu, this)); toolbar.btnInsertHyperlink.on('click', _.bind(this.onHyperlink, this)); toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); + toolbar.btnInsertText.menu.on('item:click', _.bind(function(btn, e) { + this.toolbar.btnInsertText.toggle(true); + this.onBtnInsertTextClick(e.value, btn, e); + }, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this)); @@ -1247,9 +1251,9 @@ define([ } }, - onBtnInsertTextClick: function(btn, e) { + onBtnInsertTextClick: function(type, btn, e) { if (this.api) - this._addAutoshape(btn.pressed, 'textRect'); + this._addAutoshape(this.toolbar.btnInsertText.pressed, type); if (this.toolbar.btnInsertShape.pressed) this.toolbar.btnInsertShape.toggle(false, true); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 5ec00817d..0bc7e9ec4 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1229,6 +1229,7 @@ define([ caption : me.capInsertText, lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], enableToggle: true, + split : true, dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2342,7 +2343,7 @@ define([ _updateHint(this.btnInsertImage, this.tipInsertImage); _updateHint(this.btnInsertChart, this.tipInsertChartSpark); _updateHint(this.btnInsertSparkline, this.tipInsertSpark); - _updateHint(this.btnInsertText, this.tipInsertText); + _updateHint(this.btnInsertText, [this.tipInsertHorizontalText ,this.tipInsertText]); _updateHint(this.btnInsertTextArt, this.tipInsertTextart); _updateHint(this.btnInsertHyperlink, this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K')); _updateHint(this.btnInsertShape, this.tipInsertShape); @@ -2581,6 +2582,15 @@ define([ this.btnInsertSparkline.menu.on('show:before', onShowBefore); } + if(this.btnInsertText) { + this.btnInsertText.setMenu(new Common.UI.Menu({ + items: [ + {caption: this.tipInsertHorizontalText, value: 'textRect'}, + {caption: this.tipInsertVerticalText, value: 'textRectVertical'}, + ] + })); + } + if (this.btnInsertTextArt) { var onShowBeforeTextArt = function (menu) { var collection = SSE.getCollection('Common.Collections.TextArt'); @@ -3143,7 +3153,9 @@ define([ tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.', tipIncFont: 'Increment font size', tipDecFont: 'Decrement font size', - tipInsertText: 'Insert Text', + tipInsertHorizontalText: 'Insert horizontal text box', + tipInsertVerticalText: 'Insert vertical text box', + tipInsertText: 'Insert text box', tipInsertTextart: 'Insert Text Art', tipInsertShape: 'Insert Autoshape', tipDigStylePercent: 'Percent Style', diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 84c4f8a42..fcf9899df 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -3567,6 +3567,8 @@ "SSE.Views.Toolbar.tipInsertSpark": "Insert sparkline", "SSE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "SSE.Views.Toolbar.tipInsertTable": "Insert table", + "SSE.Views.Toolbar.tipInsertHorizontalText": "Insert horizontal text box", + "SSE.Views.Toolbar.tipInsertVerticalText": "Insert vertical text box", "SSE.Views.Toolbar.tipInsertText": "Insert text box", "SSE.Views.Toolbar.tipInsertTextart": "Insert Text Art", "SSE.Views.Toolbar.tipMerge": "Merge and center", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 2bc8eed74..64feb2086 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -3544,6 +3544,8 @@ "SSE.Views.Toolbar.tipInsertSpark": "Вставить спарклайн", "SSE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "SSE.Views.Toolbar.tipInsertTable": "Вставить таблицу", + "SSE.Views.Toolbar.tipInsertHorizontalText": "Вставить горизонтальную надпись", + "SSE.Views.Toolbar.tipInsertVerticalText": "Вставить вертикальную надпись", "SSE.Views.Toolbar.tipInsertText": "Вставить надпись", "SSE.Views.Toolbar.tipInsertTextart": "Вставить объект Text Art", "SSE.Views.Toolbar.tipMerge": "Объединить и поместить в центре", From 857578864d36fab6558969e5736be4efe042f081 Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Thu, 6 Oct 2022 00:01:02 +0300 Subject: [PATCH 2/6] [SSE] Improvement for textbox --- .../main/app/controller/Toolbar.js | 39 ++++++++++++++++--- .../main/app/view/Toolbar.js | 25 ++++++++++-- 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 3de911f08..b69ece8fa 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -255,7 +255,10 @@ define([ this.onApiEndAddShape = function() { if (this.toolbar.btnInsertShape.pressed) this.toolbar.btnInsertShape.toggle(false, true); - if (this.toolbar.btnInsertText.pressed) this.toolbar.btnInsertText.toggle(false, true); + if (this.toolbar.btnInsertText.pressed) { + this.toolbar.btnInsertText.toggle(false, true); + this.toolbar.btnInsertText.menu.clearAll(); + } $(document.body).off('mouseup', checkInsertAutoshape); }; }, @@ -401,10 +404,7 @@ define([ toolbar.btnInsertImage.menu.on('item:click', _.bind(this.onInsertImageMenu, this)); toolbar.btnInsertHyperlink.on('click', _.bind(this.onHyperlink, this)); toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); - toolbar.btnInsertText.menu.on('item:click', _.bind(function(btn, e) { - this.toolbar.btnInsertText.toggle(true); - this.onBtnInsertTextClick(e.value, btn, e); - }, this)); + toolbar.btnInsertText.menu.on('item:click', _.bind(this.onMenuInsertTextClick, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this)); @@ -1251,7 +1251,34 @@ define([ } }, - onBtnInsertTextClick: function(type, btn, e) { + onBtnInsertTextClick: function(btn, e) { + btn.menu.items.forEach(function(item) { + if(item.value == btn.options.textboxType) + item.setChecked(true); + }); + if(!this.toolbar.btnInsertText.pressed) { + this.toolbar.btnInsertText.menu.clearAll(); + } + this.onInsertText(btn.options.textboxType, btn, e); + }, + + onMenuInsertTextClick: function(btn, e) { + var oldType = this.toolbar.btnInsertText.options.textboxType; + var newType = e.value; + this.toolbar.btnInsertText.toggle(true); + + if(newType != oldType){ + this.toolbar.btnInsertText.changeIcon({ + next: e.options.iconClsForMainBtn, + curr: this.toolbar.btnInsertText.menu.items.filter(function(item){return item.value == oldType})[0].options.iconClsForMainBtn + }); + this.toolbar.btnInsertText.updateHint([e.caption, this.views.Toolbar.prototype.tipInsertText]); + this.toolbar.btnInsertText.options.textboxType = newType; + } + this.onInsertText(newType, btn, e); + }, + + onInsertText: function(type, btn, e) { if (this.api) this._addAutoshape(this.toolbar.btnInsertText.pressed, type); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 0bc7e9ec4..e795dba0e 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1225,14 +1225,15 @@ define([ me.btnInsertText = new Common.UI.Button({ id : 'tlbtn-inserttext', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'toolbar__icon btn-text', + iconCls : 'toolbar__icon btn-subtotals', caption : me.capInsertText, lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], enableToggle: true, split : true, dataHint : '1', dataHintDirection: 'bottom', - dataHintOffset: 'small' + dataHintOffset: 'small', + textboxType: 'textRect', }); me.btnInsertTextArt = new Common.UI.Button({ @@ -2585,8 +2586,24 @@ define([ if(this.btnInsertText) { this.btnInsertText.setMenu(new Common.UI.Menu({ items: [ - {caption: this.tipInsertHorizontalText, value: 'textRect'}, - {caption: this.tipInsertVerticalText, value: 'textRectVertical'}, + { + caption: this.tipInsertHorizontalText, + checkable: true, + checkmark: false, + iconCls : 'menu__icon text-orient-hor', + toggleGroup: 'textbox', + value: 'textRect', + iconClsForMainBtn: 'btn-subtotals' + }, + { + caption: this.tipInsertVerticalText, + checkable: true, + checkmark: false, + iconCls : 'menu__icon text-orient-rup', + toggleGroup: 'textbox', + value: 'textRectVertical', + iconClsForMainBtn: 'btn-pivot-layout' + }, ] })); } From e2a2052cdcc41d3607bcfb8936c8e813c017b2eb Mon Sep 17 00:00:00 2001 From: Alexei Koshelev Date: Thu, 6 Oct 2022 23:52:57 +0300 Subject: [PATCH 3/6] [PE DE] [SSE] Improvement for textbox --- .../main/app/controller/Toolbar.js | 45 ++++++++++++----- apps/documenteditor/main/app/view/Toolbar.js | 25 ++++++++-- .../main/app/controller/Toolbar.js | 48 +++++++++++++++---- .../main/app/view/Toolbar.js | 27 +++++++++-- 4 files changed, 116 insertions(+), 29 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 080d7adab..429455e52 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -212,8 +212,10 @@ define([ if (this.toolbar.btnInsertShape.pressed) this.toolbar.btnInsertShape.toggle(false, true); - if (this.toolbar.btnInsertText.pressed) + if (this.toolbar.btnInsertText.pressed) { this.toolbar.btnInsertText.toggle(false, true); + this.toolbar.btnInsertText.menu.clearAll(); + } $(document.body).off('mouseup', checkInsertAutoshape); }; @@ -334,11 +336,8 @@ define([ toolbar.mnuInsertTable.on('item:click', _.bind(this.onInsertTableClick, this)); toolbar.mnuInsertTable.on('show:after', _.bind(this.onInsertTableShow, this)); toolbar.mnuInsertImage.on('item:click', _.bind(this.onInsertImageClick, this)); - toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this, 'textRect')); - toolbar.btnInsertText.menu.on('item:click', _.bind(function(btn, e) { - this.toolbar.btnInsertText.toggle(true); - this.onBtnInsertTextClick(e.value, btn, e); - }, this)); + toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); + toolbar.btnInsertText.menu.on('item:click', _.bind(this.onMenuInsertTextClick, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); toolbar.btnDropCap.menu.on('item:click', _.bind(this.onDropCapSelect, this)); toolbar.btnContentControls.menu.on('item:click', _.bind(this.onControlsSelect, this)); @@ -1652,10 +1651,36 @@ define([ Common.NotificationCenter.trigger('storage:image-insert', data); }, - onBtnInsertTextClick: function(type, btn, e) { - if (this.api){ - this._addAutoshape(this.toolbar.btnInsertText.pressed, type); + onBtnInsertTextClick: function(btn, e) { + btn.menu.items.forEach(function(item) { + if(item.value == btn.options.textboxType) + item.setChecked(true); + }); + if(!this.toolbar.btnInsertText.pressed) { + this.toolbar.btnInsertText.menu.clearAll(); + } + this.onInsertText(btn.options.textboxType, btn, e); + }, + + onMenuInsertTextClick: function(btn, e) { + var oldType = this.toolbar.btnInsertText.options.textboxType; + var newType = e.value; + this.toolbar.btnInsertText.toggle(true); + + if(newType != oldType){ + this.toolbar.btnInsertText.changeIcon({ + next: e.options.iconClsForMainBtn, + curr: this.toolbar.btnInsertText.menu.items.filter(function(item){return item.value == oldType})[0].options.iconClsForMainBtn + }); + this.toolbar.btnInsertText.updateHint([e.caption, this.views.Toolbar.prototype.tipInsertText]); + this.toolbar.btnInsertText.options.textboxType = newType; } + this.onInsertText(newType, btn, e); + }, + + onInsertText: function(type, btn, e) { + if (this.api) + this._addAutoshape(this.toolbar.btnInsertText.pressed, type); if (this.toolbar.btnInsertShape.pressed) this.toolbar.btnInsertShape.toggle(false, true); @@ -1664,8 +1689,6 @@ define([ Common.component.Analytics.trackEvent('ToolBar', 'Add Text'); }, - - onInsertShapeHide: function(btn, e) { if (this.toolbar.btnInsertShape.pressed && !this._isAddingShape) { this.toolbar.btnInsertShape.toggle(false, true); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index a8f08ac2c..0d3fdbcf8 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -677,7 +677,7 @@ define([ this.btnInsertText = new Common.UI.Button({ id: 'tlbtn-inserttext', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-text', + iconCls: 'toolbar__icon btn-review-prev', lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsTextbox, @@ -685,7 +685,8 @@ define([ split: true, dataHint: '1', dataHintDirection: 'bottom', - dataHintOffset: 'small' + dataHintOffset: 'small', + textboxType: 'textRect' }); this.paragraphControls.push(this.btnInsertText); @@ -2224,8 +2225,24 @@ define([ this.btnInsertText.setMenu(new Common.UI.Menu({ items: [ - {caption: this.tipInsertHorizontalText, value: 'textRect'}, - {caption: this.tipInsertVerticalText, value: 'textRectVertical'}, + { + caption: this.tipInsertHorizontalText, + checkable: true, + checkmark: false, + iconCls : 'menu__icon text-orient-hor', + toggleGroup: 'textbox', + value: 'textRect', + iconClsForMainBtn: 'btn-review-prev' + }, + { + caption: this.tipInsertVerticalText, + checkable: true, + checkmark: false, + iconCls : 'menu__icon text-orient-rup', + toggleGroup: 'textbox', + value: 'textRectVertical', + iconClsForMainBtn: 'btn-review-next' + }, ] })); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index ca8cadd8b..56673b5c7 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -127,7 +127,8 @@ define([ this.addListeners({ 'Toolbar': { 'insert:image' : this.onInsertImageClick.bind(this), - 'insert:text' : this.onInsertText.bind(this), + 'insert:text-btn' : this.onBtnInsertTextClick.bind(this), + 'insert:text-menu' : this.onMenuInsertTextClick.bind(this), 'insert:textart' : this.onInsertTextart.bind(this), 'insert:shape' : this.onInsertShape.bind(this), 'add:slide' : this.onAddSlide.bind(this), @@ -226,8 +227,12 @@ define([ if ( this.toolbar.btnsInsertShape.pressed() ) this.toolbar.btnsInsertShape.toggle(false, true); - if ( this.toolbar.btnsInsertText.pressed() ) + if ( this.toolbar.btnsInsertText.pressed() ) { this.toolbar.btnsInsertText.toggle(false, true); + this.toolbar.btnsInsertText.forEach(function(button) { + button.menu.clearAll(); + }); + } if ( this.toolbar.cmbInsertShape.isComboViewRecActive() ) this.toolbar.cmbInsertShape.deactivateRecords(); @@ -1784,14 +1789,39 @@ define([ Common.NotificationCenter.trigger('storage:image-insert', data); }, - onInsertText: function(status, type) { - if ( status == 'begin' ) { - this._addAutoshape(true, type); + onBtnInsertTextClick: function(btn, e) { + btn.menu.items.forEach(function(item) { + if(item.value == btn.options.textboxType) + item.setChecked(true); + }); + if(!btn.pressed) { + btn.menu.clearAll(); + } + this.onInsertText(btn.options.textboxType, btn, e); + }, - if ( !this.toolbar.btnsInsertText.pressed() ) - this.toolbar.btnsInsertText.toggle(true, true); - } else - this._addAutoshape(false, type); + onMenuInsertTextClick: function(btn, e) { + var self = this; + var oldType = btn.options.textboxType; + var newType = e.value; + + btn.toggle(true); + if(newType != oldType){ + this.toolbar.btnsInsertText.forEach(function(button) { + button.updateHint([e.caption, self.views.Toolbar.prototype.tipInsertText]); + button.changeIcon({ + next: e.options.iconClsForMainBtn, + curr: button.menu.items.filter(function(item){return item.value == oldType})[0].options.iconClsForMainBtn + }); + button.options.textboxType = newType; + }); + } + this.onInsertText(newType, btn, e); + }, + + onInsertText: function(type, btn, e) { + if (this.api) + this._addAutoshape(btn.pressed, type); if ( this.toolbar.btnsInsertShape.pressed() ) this.toolbar.btnsInsertShape.toggle(false, true); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 1bf0a9d73..57e98f7e3 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1282,7 +1282,7 @@ define([ this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small'); - this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-text', this.capInsertText, + this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-datetime', this.capInsertText, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], true, false, true, '1', 'bottom', 'small'); this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small'); @@ -1320,18 +1320,35 @@ define([ me.btnsInsertText.forEach(function (button) { button.updateHint([me.tipInsertHorizontalText, me.tipInsertText]); + button.options.textboxType = 'textRect'; button.setMenu(new Common.UI.Menu({ items: [ - {caption: me.tipInsertHorizontalText, value: 'textRect'}, - {caption: me.tipInsertVerticalText, value: 'textRectVertical'}, + { + caption: me.tipInsertHorizontalText, + checkable: true, + checkmark: false, + iconCls : 'menu__icon text-orient-hor', + toggleGroup: 'textbox', + value: 'textRect', + iconClsForMainBtn: 'btn-datetime' + }, + { + caption: me.tipInsertVerticalText, + checkable: true, + checkmark: false, + iconCls : 'menu__icon text-orient-rup', + toggleGroup: 'textbox', + value: 'textRectVertical', + iconClsForMainBtn: 'btn-pagenum' + }, ] })); button.on('click', function (btn, e) { - me.fireEvent('insert:text', [btn.pressed ? 'begin' : 'end', 'textRect']); + me.fireEvent('insert:text-btn', [btn, e]); }); button.menu.on('item:click', function(btn, e) { button.toggle(true); - me.fireEvent('insert:text', ['begin', e.value]); + me.fireEvent('insert:text-menu', [button, e]); }); }); From 1b718a516e46ea5f7a228c98fc203cccfacde4d3 Mon Sep 17 00:00:00 2001 From: Kirill Volkov Date: Mon, 10 Oct 2022 16:29:59 +0300 Subject: [PATCH 4/6] Add new icons Added new icons. Changed btn-text icon. --- .../img/toolbar/1.25x/big/btn-text-vertical.png | Bin 0 -> 168 bytes .../img/toolbar/1.25x/big/btn-text.png | Bin 305 -> 169 bytes .../img/toolbar/1.25x/btn-text-vertical.png | Bin 0 -> 166 bytes .../resources/img/toolbar/1.25x/btn-text.png | Bin 0 -> 168 bytes .../img/toolbar/1.5x/big/btn-text-vertical.png | Bin 0 -> 189 bytes .../resources/img/toolbar/1.5x/big/btn-text.png | Bin 315 -> 191 bytes .../img/toolbar/1.5x/btn-text-vertical.png | Bin 0 -> 164 bytes .../resources/img/toolbar/1.5x/btn-text.png | Bin 0 -> 163 bytes .../img/toolbar/1.75x/big/btn-text-vertical.png | Bin 0 -> 187 bytes .../img/toolbar/1.75x/big/btn-text.png | Bin 339 -> 193 bytes .../img/toolbar/1.75x/btn-text-vertical.png | Bin 0 -> 168 bytes .../resources/img/toolbar/1.75x/btn-text.png | Bin 0 -> 170 bytes .../img/toolbar/1x/big/btn-text-vertical.png | Bin 0 -> 165 bytes .../resources/img/toolbar/1x/big/btn-text.png | Bin 276 -> 168 bytes .../img/toolbar/1x/btn-text-vertical.png | Bin 0 -> 149 bytes .../main/resources/img/toolbar/1x/btn-text.png | Bin 0 -> 147 bytes .../img/toolbar/1x/text-box-horizontal.png | Bin 0 -> 147 bytes .../img/toolbar/1x/text-box-vertical.png | Bin 0 -> 149 bytes .../img/toolbar/2x/big/btn-text-vertical.png | Bin 0 -> 178 bytes .../resources/img/toolbar/2x/big/btn-text.png | Bin 387 -> 178 bytes .../img/toolbar/2x/btn-text-vertical.png | Bin 0 -> 164 bytes .../main/resources/img/toolbar/2x/btn-text.png | Bin 0 -> 164 bytes .../resources/img/toolbar/1.25x/big/combine.png | Bin 0 -> 269 bytes .../img/toolbar/1.25x/big/restrict-editing.png | Bin 0 -> 347 bytes .../resources/img/toolbar/1.5x/big/combine.png | Bin 0 -> 289 bytes .../img/toolbar/1.5x/big/restrict-editing.png | Bin 0 -> 381 bytes .../resources/img/toolbar/1.75x/big/combine.png | Bin 0 -> 308 bytes .../img/toolbar/1.75x/big/restrict-editing.png | Bin 0 -> 426 bytes .../resources/img/toolbar/1x/big/combine.png | Bin 0 -> 236 bytes .../img/toolbar/1x/big/restrict-editing.png | Bin 0 -> 304 bytes .../resources/img/toolbar/2x/big/combine.png | Bin 0 -> 508 bytes .../img/toolbar/2x/big/restrict-editing.png | Bin 0 -> 571 bytes .../img/toolbar/1.25x/big/gridlines.png | Bin 0 -> 169 bytes .../resources/img/toolbar/1.25x/big/guides.png | Bin 0 -> 192 bytes .../img/toolbar/1.25x/horizontal-guide.png | Bin 0 -> 143 bytes .../img/toolbar/1.25x/vertical-guide.png | Bin 0 -> 142 bytes .../img/toolbar/1.5x/big/gridlines.png | Bin 0 -> 180 bytes .../resources/img/toolbar/1.5x/big/guides.png | Bin 0 -> 201 bytes .../img/toolbar/1.5x/horizontal-guide.png | Bin 0 -> 153 bytes .../img/toolbar/1.5x/vertical-guide.png | Bin 0 -> 152 bytes .../img/toolbar/1.75x/big/gridlines.png | Bin 0 -> 197 bytes .../resources/img/toolbar/1.75x/big/guides.png | Bin 0 -> 221 bytes .../img/toolbar/1.75x/horizontal-guide.png | Bin 0 -> 161 bytes .../img/toolbar/1.75x/vertical-guide.png | Bin 0 -> 162 bytes .../resources/img/toolbar/1x/big/gridlines.png | Bin 0 -> 149 bytes .../resources/img/toolbar/1x/big/guides.png | Bin 0 -> 179 bytes .../img/toolbar/1x/horizontal-guide.png | Bin 0 -> 139 bytes .../resources/img/toolbar/1x/vertical-guide.png | Bin 0 -> 138 bytes .../resources/img/toolbar/2x/big/gridlines.png | Bin 0 -> 278 bytes .../resources/img/toolbar/2x/big/guides.png | Bin 0 -> 303 bytes .../img/toolbar/2x/horizontal-guide.png | Bin 0 -> 230 bytes .../resources/img/toolbar/2x/vertical-guide.png | Bin 0 -> 232 bytes .../img/toolbar/1.25x/big/edit-links.png | Bin 0 -> 479 bytes .../img/toolbar/1.5x/big/edit-links.png | Bin 0 -> 538 bytes .../img/toolbar/1.75x/big/edit-links.png | Bin 0 -> 641 bytes .../resources/img/toolbar/1x/big/edit-links.png | Bin 0 -> 392 bytes .../resources/img/toolbar/2x/big/edit-links.png | Bin 0 -> 845 bytes 57 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1.25x/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1.25x/btn-text.png create mode 100644 apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1.5x/btn-text.png create mode 100644 apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1.75x/btn-text.png create mode 100644 apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-text.png create mode 100644 apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png create mode 100644 apps/common/main/resources/img/toolbar/1x/text-box-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/2x/big/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/2x/btn-text-vertical.png create mode 100644 apps/common/main/resources/img/toolbar/2x/btn-text.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.25x/big/combine.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.25x/big/restrict-editing.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.5x/big/combine.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.5x/big/restrict-editing.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.75x/big/combine.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1.75x/big/restrict-editing.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/combine.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/1x/big/restrict-editing.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/combine.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/restrict-editing.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/big/gridlines.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/big/guides.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/horizontal-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.25x/vertical-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/big/gridlines.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/big/guides.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/horizontal-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/vertical-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/big/gridlines.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/big/guides.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/horizontal-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.75x/vertical-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/gridlines.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/big/guides.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/horizontal-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/vertical-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/big/gridlines.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/big/guides.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/horizontal-guide.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/vertical-guide.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/edit-links.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/edit-links.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/edit-links.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/edit-links.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/edit-links.png diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-text-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..1850634ab80f5ea62d42f235bb0df876eb518756 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe#0(@uDyRGdQk(%kA+C%-1_Q(Y|No~fyFC%e zVk`;r3ubV5b|VeQ@%40Z45_%4oUp(?frmk84Id9r46j3*ScHcO5U^+**~rBq_Aub+ z0|p`XBsGEdW-%uvgN3XroSkiL4lQA84=KBB`)Kmj?B_*CZw7{w3380@9CHmo7J9n+ KxvXN>5immvv4FO#pr$ BG5-Jn delta 290 zcmZ3(0r%1aer? z9eo`c7&i8E|4C#8@{f7CIEGX(zP)jftJ#64HRCntaUE4}dM>mf*fu?qVBxNIeq!)+^>bP0l+XkK0hM3=7bK-56De2{2E|q115Bn58&F8THtvONq_>Z!Lp8TGV48J8yELpE-)@`-} PTFl_->gTe~DWM4fX4*NZ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-text.png b/apps/common/main/resources/img/toolbar/1.25x/btn-text.png new file mode 100644 index 0000000000000000000000000000000000000000..0ab41f1ff32359b15210b9b5552420f79045243b GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy@sRKBN+V@SoVx6>T?4k&Q2{QR$8 z%Vj&wBsX>Cmq$L21XD$r(-=0W%7uBaVSmEh60zUYD{`9PPPL^1-)}r}U8A9RG)zTn z&OG~%L8(Kb>BOZri@J;sW$l9(PF%QQV#0LbBxCC~*6XJ& So6iHSX7F_Nb6Mw<&;$UulRiTL literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-text-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..ce930c0052c4b1ffba0894e25c8b83ef0f87bc62 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf#0(?@bf-K9Qk(%kA+C%-1_Q(Y|No~fyFC%e zVk`;r3ubV5b|VeQN%C}Y45_%4oFE~hAmU=s#=yCbRbg2eb4LkF_a+8TK30KXMkOgO zri8$?p$;1sFmC76Nw_TQz%t|fK?8$DiwXjlv4#kzvam6Sh)4)L>9}+%wOQdx;S!BC hne5e8hx3?Z85v$aGxttQUwH`R3Qt!*mvv4FO#tSCHu(Sm literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-text.png index 54077238a150746234e34e658882ca3f79848edb..3da7ffbc2ba4757f721beb489a09beb838022ea1 100644 GIT binary patch delta 175 zcmdnZw4ZT;L_HHT0|P^V?v%$siZj3`#FY`qU|{(F|NoR_w>FPvH9uz~PWotnZUHrFhU&66uQ@<)M{ ZVG*bK+h;!?uLD}h;OXk;vd$@?2>|k*JC^_e delta 300 zcmdnbxSMH$L_G%^0|SGub4>w|;w(0r%1aer? z9eo`c7&i8E|4C#8@-KM0IEGX(zP;th*Q_Ao8hESZfAliHSrN@je_mfdXuDX=OenrW z<6@AC=cJNDuOCFn{&>IUgGA}a@+Q~Dz~n1)@7FK+Ao05UZk$DGN>909){;+>ho+u) z(9xEh+CN`s;V0WLxwHiv{AZd6uh*8_%Xe0Xd7|khNiO4nh$WxaMqN4gv1IM9b<-KE z(x39QN@|>ONMr-b&1gKtBa*hjfEgk*ac|9OFVdQ&MBb@0KqPJW&i*H diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.5x/btn-text-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..e220bbeb976dc5f5d3567e88c988f81743f4dece GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L#0(PoHuVmW;tcQ!ab*ND7#RNl|378f?TJ7Z zV@Z%-FoVOh8)-m}r>Bc!NX4z>gaslUOopqOnJ+Ub>}Bd;bq0clnzf;;!%7n-rZXnF zDdaIEv3~loCg2~_q91D(E=>5hD)h$BC9~WY{`Tb6KgGacY^Jnv>0O1XAj>>m{an^L HB{Ts5!zDH+ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-text.png b/apps/common/main/resources/img/toolbar/1.5x/btn-text.png new file mode 100644 index 0000000000000000000000000000000000000000..43cb7a918b903223656127e4b71ddb449964bbf0 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L#0(PoHuVmW;tcQ!ab*ND7#RNl|378f?TJ7Z zV@Z%-FoVOh8)-m}ho_5UNX4z>gau|Cj7i5B*w(QrtYtm2ZlQz1fdd=4IK&bsiZf&u zB_uEf%G~(TvrsW%-?de2YiiiSR{Ub+VLp8PeO=Ju=3NX7O7~>5FYw5H2ifK6>gTe~ HDWM4fRbey$ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-text-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..b22e55c5754b23b59c9f3b46b254239248d01e39 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK#0(^3E>1ZDq&Ne7LR=Yv3_!@pli=y%7*cU7IYHuz!xcuyLS2T<3#T+NH$4gfF&s1`SQ=8dgf$-E zVr5!p=(Hx8aWZehq|U^Q6C11)Qf7$pC`kq;s2oVy(J;|r=9z?VF9Uq6D~iO<{b{y7 e|IjS=0uzIfjqQO;$4h^L+~Dcz=d#Wzp$Pys&_9v@ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-text.png index 2ef05951645b7e91b5818cdda7b0710a35742418..244eff7bc0b4e11cfef17afcaaaf1c95cbdd0d38 100644 GIT binary patch delta 177 zcmcc2bdYg^L_HHT0|P_M#VJRC6lZ`>h$|zI!NBnU|Nkk=ZchZV7)yfuf*Bm1-ADs+ z(mY)pLn>}1CrDT}m@+sSw;321tZm?0$0Vr36d) z9OUlAu&3V| z4`*y{-8-+Pi?Q8!o9SB5Nh+S(Ki>GUN8ZL>b5q&;nwXSJY@X}xiubv9tg+oMdEfk5 zmix6jGew!T%e*FLt(vmx=&7tzF&j3_+7{s}z{Z#;Ah5nHZc(}WKf9k3E6V273RnvQ zg(t39wsqng>+{-M!?Zu&+V$zZpgPkb1qB`ggwjX5B;IebN8%Q5%di5O12q0!t?Y^1 zpY?t21=0U_-~Rj+WqE7jR_)iFA-zDS2c3`>(u)%LB(U)l(9aB>u6{1-oD!M<1R;Ep diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1.75x/btn-text-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..64e713b3f36f3219f7c7af24229454664f574c12 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe#0(@uDyRGdQk(%kA+C%-1_Q(Y|No~fyFC%e zVk`;r3ubV5b|VeQ@%40Z45_%4oUp(?frmk84Id9r46j3*ScHcO5U^+**~rBq_Aub+ z0|p`XBsGEd<|IYI85fwmT3wu-6`WRwJrrEDtoI5x=cmQZ(-;^!ljJim*8cwvve47j K&t;ucLK6T$88RCH literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-text.png b/apps/common/main/resources/img/toolbar/1.75x/btn-text.png new file mode 100644 index 0000000000000000000000000000000000000000..05f63a78db0ee25744d43fff4b383172a99048ce GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe#0(@uDyRGdQk(%kA+C%-1_Q(Y|No~fyFC%e zVk`;r3ubV5b|VeQ@%MCb45_%4oFF06aFx-+fX%=lqp>1}*P%&OgoQ;yVoDg}!7jEp zt0WHIYJ4Q4FsrkXMe*VVfsPBSLb(gL4Lc5)=p{&mI6bMH{ib1=IRnFzsS4Jr^G;-g Otn_sCb6Mw<&;$THyEI(@ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png b/apps/common/main/resources/img/toolbar/1x/big/btn-text-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..267ec2ec38a33638c675ae4534d64e86105ce1ca GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^7C_!@pVNqV}=SdFV+A6 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-text.png b/apps/common/main/resources/img/toolbar/1x/big/btn-text.png index 630b2c47c6eb6f01683daef4721c01e7055d1ef5..448117d319da71db052886ad82fae72412fc6626 100644 GIT binary patch delta 140 zcmV;70CWG80;mCyB!6#7L_t(|+U=J?3cw%?1oQt-r`I5bu52tVnE`LIIvB-70Kk{X zGLC0u!Cp+v%A3tOBc24;%{kP}u_qW!a&lIO+-}xbLFK-+2`cvuL8C--W1d}B^5cOZ uf(RmrAcB0=W((5r((wME;RS&AxByMPX|s2p8MOca002ovP6b4+LSTY+(?4qf delta 248 zcmVPx#1ZP1_ zK>z@;j|==^1poj5sYygZRCodHm*EP4APj^}djD5m{V_z;X*;3WeSe~oo9BjOArSIu zj^bT9|7KCO)1iF)UE y1FsZM3#wK!h#YuJt=QQZ0#yr{#Z?tS$U-hsa7GvulXV;b0000FVdQ&MBb@0DUDiqyPW_ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png b/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png new file mode 100644 index 0000000000000000000000000000000000000000..4dbaf0d6e392f80a99ce2a2020004a6923bf01cd GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<FVdQ&MBb@0DUDiqyPW_ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png b/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..0aa4448aa6c187c85802bccb42f510b727d39097 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<qDP`PaB=P6 z@Sc>fu6^caf@_Syy{3nnC#4#6PHs*3;I*k~k(Ay^)~>8s-h68Xq$FRKWlU9b=3roO XpHkf#&}{1fw1UCY)z4*}Q$iB}o69&{ literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-text.png b/apps/common/main/resources/img/toolbar/2x/big/btn-text.png index 65e28009cf1f919fe73d7220f0abbfb2ca27fa3a..d625655815f2a9b3eede55dd12ca6a162f51ef62 100644 GIT binary patch delta 162 zcmZo>-o!XTqMnJFfq@~Sb;?a3#Tnoe;>rkQFfjc8|9{G|+Y^B-#*!evUIDgmiJqI@rf@XumUhu; z__#wNL!0vxhm+6~!CT%&8`u=AJF*!MuXr+H+LGd3(y~dG)h-MS+e52cr*D@`2HEZD L>gTe~DWM4f&Luab literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6Db50q$YKTtF;x&|^bAt@02E{_ z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(P)@?r#WAFU@$H@4d`$)dt``sf_`g4 zl$C34?zbxAIHQw=5(_j1C#iT|y1PvN{Z!`rJDsQRI(7S5|DK}`)vv2sE<`cSNvgS? z`!eXdNq0)r>rKoL`_3F#vkQplH2x|{X{&#$S~?|?XWMo@Yk_kN4|yQOJITLuZ6}|u zxc>b0o0(bfciWXI%waqvsc=Wsctcr_e(!wmwPuH}ZT`4U6h#}t05sOSuCE8Ap8Sem z9cVr0je`Yqi!qcaf8n&l`Mdwt7Kg<{dw*#Q#5kqb literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1.25x/big/combine.png new file mode 100644 index 0000000000000000000000000000000000000000..b20ba06bbc1a94a067eeb758f9177d7efac45709 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhb)D=$`$B>F!Z)cw7Z8hLw(L5=8 zkxBJJrkA1PqXSP}^&j~5m}vhL;dDKGY<^0lfYXa=Ez>=MsaM?Y?5&7SRgtLQDaU#2 z{u*Yr7aDhx!<&9S*0{5E^}#Ry0#|SBJW#RRdCjqDj6Jb@#z((bo7Fj5%BC58aMBPm z@L!;Da7)p}3pUpgdGr^Lbc5UaT zM{*vYkUV2*TIkYw*7rm29RG6X=ek#RZg(v|*Dy(3TqDAucGX+OiDRx6!z6{*-xh3r R_z37f22WQ%mvv4FO#sNFZDs%f literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/1.25x/big/restrict-editing.png new file mode 100644 index 0000000000000000000000000000000000000000..a831cdfe637f93a87f8a063f3b87b11ca683ad55 GIT binary patch literal 347 zcmV-h0i^zkP)Mz|`xe;U%(ue%6+4~~M^5PvI6EJGm8MYw85QZ>>`6HNV7PQRrOB3e(P#032`2K-0a~K@z zLaGx-m?Mup0pkI(r*fzjW8M-5C>dl=b|Kk2-berd002ovPDHLkV1nPyliUCR literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/combine.png new file mode 100644 index 0000000000000000000000000000000000000000..ea709cf6697aed2909a0849e29e268460e272b13 GIT binary patch literal 289 zcmV++0p9+JP)&007WSsiBQ1(GRJrMcb4N zLUqtJvxVx2YY>XiHHE&Zd(Sw%g}$tNPtFLT)*Ge9;V9I4pVTK^l!~2LqD9M)KI#7{x0vnupc?OtR!^W=Ez{7Q#VIa z%&e=-)(Ax?LaCv2d3KxFZDLYlmJbukZW9@rJ430Vba~${Z~5!F2dqOae?9kzb*T5$ n#X$#zBJ?vtIeiBJ0N}|5>km7%L-i)g00000NkvXXu0mjf>!g4- literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/restrict-editing.png new file mode 100644 index 0000000000000000000000000000000000000000..714b66191729e109a657d0f59e459f286bb00533 GIT binary patch literal 381 zcmV-@0fPRCP)D_#S2tAdy5BZ6Y1&230a;1nmtezK(iOBDD;}6_JZQm1yz)KO;I&Ky--E5 z*9=t))B{zNdreR^L9J26pjRDL8`KiD2lShJ*a)B>?_r~Wx@}wgpe?seP=XSapadl- zK?yoAmY`v05kYl9+j4WSbzqwt#zKK&xw+Rmut?h4STxWK$hB5N%^1s3K!MpH*IEfR zV=PAk-2iybidh>4w9Ur(V!Q$Gkw68r@|=WO8U?f^U5vMxdPD;?{f^cG_4v`Veth?? zG79wOU(jVFsCZoo77v)st^|S-l%ND9C_xGOr=Y*Q&Nu?}_UnwJK)p^z8MTw%H}(v} bFwAvco1PSpe|Ie400000NkvXXu0mjfG(({V literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1.75x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1.75x/big/combine.png new file mode 100644 index 0000000000000000000000000000000000000000..4e1d7a93c63dd2a43909f2d08594236995eb9b3c GIT binary patch literal 308 zcmV-40n7f0P)Y_rb>dp;XTPWdI(RpV~dso000000FZ~;!aJg>9>CqJ z_feHa_~hpzMEK0-5P=9ptf=KzaVUuRqn2NBsEF|F8L_G~WD{X6_RJ#M&#lFtS%jUX z%_1{$CUK|w@MlUEnc+BB{g9>35cv0hOkDd4!Mv$PVIbI+?C zi4hJi2_1>D;yl_M`8n`$#3TRrnC>!`aHZ}!akf~KX5{cC;c&$2J3$S&&J z{6F~F$9ZQ2{%U93obms6qlR^h#rkwc#d)t8KQ0!io;QE(OocK#`{>P%9#5vOU{RbH zu7u(=#+K``AAd6+y(qBzf9NbuC9chBw;FkL`GBGJU%x!*>w3fHpZd#yalqi|>gTe~ HDWM4fKijD< literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/combine.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/combine.png new file mode 100644 index 0000000000000000000000000000000000000000..b49b49a44e0eac402ecc19071cfe959107002d72 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^7C>}+j89C8&9&sbvsE(XQc-D-`4=0&*16m=d#Wzp$PzQc3e*Y literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/restrict-editing.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/restrict-editing.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e69e64ff56f66fa55a8d8804765c73815722f5 GIT binary patch literal 304 zcmV-00nh%4P)%RN7dw3dm7-K%JIp8ZqLrk!!+`3u7_> z8MathKp1N>11V>2snH9u+zFf+NC$9cA>pX$Mp}XTNkPI{(}nZ^Sx7Y0G$Xx02GRmN z>$DNTkDWFONE_RFl09Pw@SlOxoxt1f!mk6RRTs@I8YoLc&7!$Q17(7}X417#w$~`2 zfNJhFldgrby+#6y!rqbeSQJq1+I-j-Xo&=(_Yrpj!T1ha2b}$y$!y@o|Hd2v1mh`i z06}Y112}-+4ZM2k#0H+ebcz5nE<|Qe#_Xaao)9lT`3DcV9Z69D0000QCt*1J3R$)7QcO6C+GZ}TgtyDE`56dj1_omOC12lT%Xhf;EJKuPaE(Pt$qLk2q1s}o&v00 z74EfAj6KfnWeIpj6KfnWepew@z${?L%=AAw~jqo0!mCxTfF%FZ8G&r{BJ4n zmcOIb)GGlff#(KL0?!km6rKw}DLgNLl6dBTl6W2f$BM;JH-H7+zXBkDOrcDnEMji8 zh+!LX5kNNb7Xb8hlqPb@fAyoZE#lPZd#(UCh*OL2c?I0dnVXO33Gm>1XKp@X4}f8) zy8%hV-y08)fT8jRB$YQFUIA6p(@nSP>JGsB0;<-98cd<;b)njTs&%0Tfa-Oj(%T5@ zni%PAgn3O28+kVJ9Hm|9C`|&-4Ini!9RpGm(=i}5F_csQ2q04^Qz(lVYGT+%u#smY zzfFs`fy)>Vr$=cm-UcpXJiH#Ig`v$G!6QWLnwXH=yb(M?G_Q%#4o|EB1Q0*~0lX`q yYF(%Spn6@Xc4}9>Rdt~Tfa-Ojgb+f=mGcIf=f-%o=BmyB00004xqES#lNo~)u5cz_F>woHrGiz7}b@*W&$Op|;PtLa*1{VaQe9Q?sUrVQs#A-2Ww+TUH(B`uMkR`>Ml&8%-BH zZ1G^o*rB+MEo6>BH1o3KYXmeIZYl&Z6ge+pN@?_9J;6CqsK7!=RYBY(>%hW}D-ALN z)eL;jZx}74Hi|zGI1<;OELhDXC-^>`=}$w&be4!q{-sR}-oIA*2_?its@8^THY{7R zUW;?W)4J+?6BmEuc3@xtNwY&5!@JxbU{G(SoxJmTi$resLS2 zFn!moUkY6UAEtZjl=LrtFtOp)sfNA#jxh){)CX1VU+8;2l{cbrf1=HTNEL=_ck*Ab zfJqgGY1fp0YN#^ktaATVD+2Ql%xC|n--^$C#24{Z+gFIeH}!jq^@5cz=Xo$Z*|JFY zyLkA{MQd3OToQd7vYdM^+uDrlpPke}@i%drde@XAH&!kFHU*d{7(8A5T-G@yGywqI Cf#%!* literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/gridlines.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/gridlines.png new file mode 100644 index 0000000000000000000000000000000000000000..ab1ab7427c7598d62795542d6dbfb3fb37ea43d0 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbRDq|9V@SoVw>J)Q9#9Z)b@bjY z{Pv5wrb9r$1Ow*ko57ztI5b%q9>m|WwzSCo<~V7~oU37nQZ}rg{VkGX^1*$1x7;NX zTLhmiGx+*Ir}byts|P=lWK@A7$JRaxE1J?G=q8bv_O<)pgRisyJz!+G^Num*IahTX SPwHHt-3*?telF{r5}E)C5kiUp literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/guides.png new file mode 100644 index 0000000000000000000000000000000000000000..5aacef90b7416c600614e58a3e33ebc5e22d5b11 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbRJ*5(V@SoVw=*2M4k+-je7;qq z{jVgOzxAHU1&3Sb8Xh=yOKuV~VFs%FA!gXl<^D#_C1}O86CHsYD^!n6nWy^u@0-Lu z-7|LH5&X<#=+fEe$P>6ISx)5f_C?{v{%<_HExGq~#hop`e$ns_5dK-$DHN#W)$ucU mO54}UgVJ;3J^)Q-*j3EnJ>?(&?8WzFL0nH)KbLh*2~7a%u1V?u literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/horizontal-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..97bf7b14c5728e6147d1ef15dad4e9126a1629d0 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy@sRG6oWV@SoVx6=&y7!){;)ac%S zrm5b%TV}Fhu2WHWqY(QwCWar4Yc4I=blV{)%gstjO3$I~#ESOce1a|lJNZS_+b8Ny rRPyV~dzP)(#GzDwKZ=1Ne-k4ouZnE*gS+2>HZXX)`njxgN@xNALW3TC7!){IYS-TX zrWyU5FEC8NlzCpt#75f;Hii#Of$p817nvtHSthx;%$=)Vytc#2`uvl9q8l$OSr>Ja18WaRv1E;_9 z%UQnumcxaHrc%B$*Z&+*b=+VIRCiDEddkC|Q|@Y#k=Y^5&l0bzzX{@*)gC*4L-&Fv zF0B;{n(CA?;w_#oC~s(e%wPJ1RWu~PkyZ4{){|RLP80{TLoReJe*4j*{LLp1b_RwI a_UfniO<|gA)KLO7p25@A&t;ucLK6VTxI`xa literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/guides.png new file mode 100644 index 0000000000000000000000000000000000000000..ee13509a5202fd7150b2aa417d4653215f5e0b9a GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf!3HFCoofn!)C5l#$B>F!Z*MwsH7E$M2Kc|; z`ej+LUemU7Ngh@FEoO^qpKV`h3RL*5r`q+Q)J$);BOOu7(itk>zn=PhOIhDmN3UYv;nfzzt0G`4}`*60aL>(!Q@YS p{}(ywf0oQ%{$~j@1H+H`+;1Y{!u_UBlK@)D;OXk;vd$@?2>?)QPZ0nB literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/horizontal-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..1f65ee5987801de9349b006e7df395c452b48de2 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L!3HD?X4LuvsRU0K$B>F!Z?B)`WKiUBy%>^x zTl4A41m=qk`>Pcmv^FFxqC%YwBz_}tu^?FmhsYCm>8 zFghl7?csxEUnK7bXa6%e$Rh0XA^YI{z0(*NZY*GWE1zu>ddI{RXcvR0tDnm{r-UW| DQ#m>_ literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/vertical-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..31ec9a394df4da98ca2b0f85e747a0745efc0f9b GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L!3HD?X4Luvsd!Hp$B>F!Z?9YPH7E$M1o)rc z`dwr3Qq?10C;y0Zau-wcIlPULAwKxH*Wp!DohOG>UCDaj^G4FQ_*|p$#`KaiJ4-IA vGv7Bo&dt5%lGa)nx-0Ude7`C~#X-Kq&*C3?$+krStzz(W^>bP0l+XkK@0dAZ literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/gridlines.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/gridlines.png new file mode 100644 index 0000000000000000000000000000000000000000..de422a897954e937854da53af9b963ea333f095d GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK!3HE1_t%62sUA-k$B>F!Z*QIEY%maUJve2a zU()jMTnE3*gl!BxK^JiNX&5yKK?Z`InKR@yJ zlPckdJq2zS%04g+0xdvoYEA;HJWc0r`}FtwtZnvtuCsuw^?x(*=lYxj{IfvrW$<+M Kb6Mw<&;$TrMp2vq literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/horizontal-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..211560a004c4ad2318db411e0b5e8e34e1b870b2 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbREDREV@SoVw>J)Q9#G(M2wZ;l zR^Ozmf=0ID4Ym9&b6o7I3V9eB-p|ZVJv=L)f6`3j>N8$5a=7NT8tA64e5c)GaEL=0 zNW=)LeUo8-9yCK0NTr(}3l?&dNNf>wn-Smov6-ErU?IDP)uFl$yF11}I~hD({an^L HB{Ts5(qJ~D literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/vertical-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..268067c2222cb657aa4cac44644df940728faca1 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhbRHmnkV@SoVw>J)QHW&!790-}c zZT*z1{j4fQi;S3mwmMJ0?SG7c;m3R{e<{DUbsm$v`fqWnahIoGzN0-u=gwT&V%Eza zne#cGb?!8CGgy_9%(B>P)e;bba*NF+^eY$`F!Z>Jk_F(~jb*H+cv zTJCc9s8ZS`>l2e)`MnQbV_-Po-gjcg9a%Nar>feHy1RC~2;s=Oc+^#$MX<)fphuJS yxohu3Rza5us)r{fx(NP>{P6R=5Cg-U3ykTKO^F!Z>KwQ9Z=w5sa<>j zT=2GU0UwfPZP8?%$!OS~5VKin8&E^(4GAr|ZCYw4L;5S3L~T0eS(sQdIe&GF+Hvph ztX~I2*Rw9`66L(JuQ@`b``?X&cAXy{Wz5t5aO;m{b)ix}UlDty+6E1=ql^5n-}$$j dg@Hkm&wTx!?S)B4Qh}~u@O1TaS?83{1OT(yLXZFe literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1x/horizontal-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..9a88f1b7d337d49576054b11dd87f59a89c58fdc GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<j zo967s=Q;X;TbQ}ol$2#ngq;Fh*j$oKc^n#)tsEzCFBDwz?Clrt58RIHZ@As%QnL$w npSo6m+5_&U>+wR0e#Q)J_kQG-@TZ&wn$FgTe~DWM4fX>cpW literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/vertical-guide.png b/apps/presentationeditor/main/resources/img/toolbar/1x/vertical-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..255ec3f26379c7e45419ad6331eb1c66ad04c71d GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<jv*Dd-cCKp#h}39{5Pup zwtr--RaCE%(6VEP=n*G{S!}y5ujCuw}CKe6>1&0O@ z;|JRTnG!w5JMtL^7&$IzUonSCfK~V<{h3%U#C*ZCCtL%f9;z{pU*c!lrN_KWH#dA` z*V{ft@_^~leG5aj+s`I_RFY)Hoa%xZ5dVU_zqYR#|elF{r5}E*F C?P$#a literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/guides.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/guides.png new file mode 100644 index 0000000000000000000000000000000000000000..3367ca64d8e9ff026a6a2c82393e10fd1024e36f GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6sc)Vxjv*Dd-rjcPYf<2F2+X%y zx5v!=0f(%w%FG?ig-Q?qF5!-xa4VlnZ_Wj=bxBa6@rp~qrg3&d8nLbyMC<|+HA{q@thDyGJ7a%WN$%evDN!d^emYz=#0 lb)x0c$AxRTA?|1JIU~Lx_CvMHXZe1Rh^MQc%Q~loCICpgZzli% literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/horizontal-guide.png b/apps/presentationeditor/main/resources/img/toolbar/2x/horizontal-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..952f04eeb7724f6e2333e927dd4add807503ce6a GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5!3HEV6KWZO)LKs$$B>F!Z*MwswHolaUVL|@ z?@rmY393i9#JVi9Y8F-Srz}dSUvKeKmldd*;a*DS<6I|`vNeXPO4H2bthTM6$eD4d zqSi+6g420p#@}k8LFeCFPx-q;dY-=nlhA|)78M0X&L1BeUT5xl^EH~u?6t+=zgJ3` z_Gu{0H(=!SfU0@0pGoVy^ReQIH+g?C*T0NbOVGVlENFji25-dC=Ssi1SAi_wv4PR+ W&Hbd5rA)~nr+B*hxvXF!Z)ZAkwHWZYRtN9? zbj#AIPvG{#rVj4qGxd%3u-B_=)(SB%69KAbU}!MkxTV6oBk6IErczSo#|w#ndwLv% zPu+gZ*(g?Jqg=56N$fSj(7&4x@WSojkGVw|5%zY*|;_1yOQ0x8KMzKt0(?z$^yBS bVMhY>Bo1L0h~2Anev;K6nW%hy4^ZNq$z(E_zD`#z zn5>}jLjd4{c?B&nu+V>Lz$vqw?MIm5Tfle?IE!Gs793dY7l*R~247X+z>R)UIICc^ z;K0p(F*tX?Xuz2T!|h_921D**e*s4AI${$tFb2lJ7#IU%U<}NE2UAY8XRgE?=py#1 zg25B*nJY23A7bg#2ICRPk!vHymG5`#^IHEjLMcFwTpKZN%e7;lcZv~+IO!1`=qxQT z#R>c1_yX_L1Otpy+K6rV-VqVI3kDdcv=J-LN!7St5t9Iu2r#{fZOt{7BSwHpJutn9 zAsCQ~SP#sJlOKuLBiBmesTUNG VH1$_YjhO%d002ovPDHLkV1fyC%kTgI literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/edit-links.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/edit-links.png new file mode 100644 index 0000000000000000000000000000000000000000..def9fc7035dc19b664acd8df7110e6da6d0ee071 GIT binary patch literal 538 zcmV+#0_FXQP)K1X^}2pg^pR8c;J4N-h2%`!@hxHJ~y8UA3SBL#;SeDo}h>feK8uqEI=2 zYC#3YS}~|xKsBHObFBzePN33IL7vG zmf8c4cbY&E<}zTna5XG`sY$2)DHdBlam{xW>8IW2L-g~9$Ze6Q`fh$C+#E7oZO z&C_@r?Cc8l3zK24*T`BuI5*X5qcZ+>vl0hul&kALT@8}MVH2wU%7#1 z#~g!x4Hbt@`?Ueor*@3^H9uE!DAlh$XZdj9(z9PzgkKwl(|+wd%ZIZ|&wfRB9<@`o0TvNz8c!8-=kLNrOQ5-FA3ZS<-u>cOnWY(!aOK7*|C5-s;@DyfB^d zqGxjZ)ML*M@EWcA%(l_yE|B~Em>7gBxMb$r>06^E<@Y%3`Lp11UF7bm9}fy2iCyM5^Z_WUDvlSn{(l!n!M1ji}}8m3m5xd6R67M+iSM}y9#T-3&($TlRhqU zV!tMM{kg4YHg9b97KS%ZcWM{#wYT=ITO)t=`Cjj6rFl=e_)k4AEJ^)avAjyL}oIJw(A=42AA(o|g--7Fz0RvWqSI>W-fypI^2N~Mo*vnYMh zZK!U^V*@H-Q_%Sm)b}S`Q|Zgv$I=U*Z!_G-rS!$8jC(F9AL^GKDoZLTUk~G&pNJk?UF8T0ltDy|pFh(~Gt( zfSjIGTZ2&5+A@GQJ*l>+sc+Sm0YgrrqO6L z8jVJy(P$*+<;v#DPEdS3qokAD_xaLHL~4M&B#0FN_R=6y18gKgqy`xN76q{eKrs+&0F(x?7C;dYYXOu5u_nOVA=U&a z1!8T0w?eE9Py$2_fVV;90C+bys4m_ z3G_rG3E&*I&jf8P1YZPdfOFVoCTMFZ{UX!=xQ6W=L0es@%L)RxhFv;>wz^Q4l>{(H zHqLDIc>lA$n61_Zm@FG-whG?=TmbylRyhG;$Mq{)y=pIJt1JK$q~+9BuiA^*DhEKD zFoeczwFAA4#a0mjEp`Zv*(w-9S58}v0h|DkrqEU~LPTn-2!Mw@E|Geowu%v=8nzk( zXaJb8z*a{9CUzenvsDB@1Hg>Awi@n<2bh-AR#O+`&KJY!nXQ`edTG+uf|A*4#)91W zY&bo$)d0T(Ku~KzscjW&nFE2G^a&PAGS!wal{OH_Nsl}xLpjx!a-rHF8tWHe=Hs;u zL!qg7T*UyveeMl<+kR!M;I$3+HB;-jST0netzw7Jl@nm39$Vob{#6n{tgT`~Hho73 z5M`^#y2z&QC;?(^HI@`xAxicRUSG+}Ku z<-u=Hb#kS@(uB3u#0S4*=XdlPO9=4FR%0dCRx!QCQUScORYbCERin{pG#ZUYqv6Xh Xze Date: Tue, 11 Oct 2022 12:26:55 +0300 Subject: [PATCH 5/6] Remove unused icons --- .../img/toolbar/1x/text-box-horizontal.png | Bin 147 -> 0 bytes .../img/toolbar/1x/text-box-vertical.png | Bin 149 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png delete mode 100644 apps/common/main/resources/img/toolbar/1x/text-box-vertical.png diff --git a/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png b/apps/common/main/resources/img/toolbar/1x/text-box-horizontal.png deleted file mode 100644 index 4dbaf0d6e392f80a99ce2a2020004a6923bf01cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<FVdQ&MBb@0DUDiqyPW_ diff --git a/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png b/apps/common/main/resources/img/toolbar/1x/text-box-vertical.png deleted file mode 100644 index 0aa4448aa6c187c85802bccb42f510b727d39097..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^8bB< Date: Tue, 11 Oct 2022 16:13:17 +0300 Subject: [PATCH 6/6] [SSE PE DE] Change icons for textbox --- apps/documenteditor/main/app/view/Toolbar.js | 10 +++++----- apps/presentationeditor/main/app/view/Toolbar.js | 10 +++++----- apps/spreadsheeteditor/main/app/view/Toolbar.js | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 0d3fdbcf8..576cde780 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -677,7 +677,7 @@ define([ this.btnInsertText = new Common.UI.Button({ id: 'tlbtn-inserttext', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-review-prev', + iconCls: 'toolbar__icon btn-text', lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsTextbox, @@ -2229,19 +2229,19 @@ define([ caption: this.tipInsertHorizontalText, checkable: true, checkmark: false, - iconCls : 'menu__icon text-orient-hor', + iconCls : 'menu__icon btn-text', toggleGroup: 'textbox', value: 'textRect', - iconClsForMainBtn: 'btn-review-prev' + iconClsForMainBtn: 'btn-text' }, { caption: this.tipInsertVerticalText, checkable: true, checkmark: false, - iconCls : 'menu__icon text-orient-rup', + iconCls : 'menu__icon btn-text-vertical', toggleGroup: 'textbox', value: 'textRectVertical', - iconClsForMainBtn: 'btn-review-next' + iconClsForMainBtn: 'btn-text-vertical' }, ] })); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 57e98f7e3..30c16a037 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1282,7 +1282,7 @@ define([ this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small'); - this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-datetime', this.capInsertText, + this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-text', this.capInsertText, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], true, false, true, '1', 'bottom', 'small'); this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape, [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small'); @@ -1327,19 +1327,19 @@ define([ caption: me.tipInsertHorizontalText, checkable: true, checkmark: false, - iconCls : 'menu__icon text-orient-hor', + iconCls : 'menu__icon btn-text', toggleGroup: 'textbox', value: 'textRect', - iconClsForMainBtn: 'btn-datetime' + iconClsForMainBtn: 'btn-text' }, { caption: me.tipInsertVerticalText, checkable: true, checkmark: false, - iconCls : 'menu__icon text-orient-rup', + iconCls : 'menu__icon btn-text-vertical', toggleGroup: 'textbox', value: 'textRectVertical', - iconClsForMainBtn: 'btn-pagenum' + iconClsForMainBtn: 'btn-text-vertical' }, ] })); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index e795dba0e..c01ea63df 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1225,7 +1225,7 @@ define([ me.btnInsertText = new Common.UI.Button({ id : 'tlbtn-inserttext', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'toolbar__icon btn-subtotals', + iconCls : 'toolbar__icon btn-text', caption : me.capInsertText, lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], enableToggle: true, @@ -2590,19 +2590,19 @@ define([ caption: this.tipInsertHorizontalText, checkable: true, checkmark: false, - iconCls : 'menu__icon text-orient-hor', + iconCls : 'menu__icon btn-text', toggleGroup: 'textbox', value: 'textRect', - iconClsForMainBtn: 'btn-subtotals' + iconClsForMainBtn: 'btn-text' }, { caption: this.tipInsertVerticalText, checkable: true, checkmark: false, - iconCls : 'menu__icon text-orient-rup', + iconCls : 'menu__icon btn-text-vertical', toggleGroup: 'textbox', value: 'textRectVertical', - iconClsForMainBtn: 'btn-pivot-layout' + iconClsForMainBtn: 'btn-text-vertical' }, ] }));