From f27d942bdbcafea0b8f3d6e0f6a76a6596b8cfe8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 25 Apr 2024 20:31:05 +0300 Subject: [PATCH 1/2] [PDF] Add icon --- apps/pdfeditor/main/resources/img/favicon.ico | Bin 0 -> 5430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/pdfeditor/main/resources/img/favicon.ico diff --git a/apps/pdfeditor/main/resources/img/favicon.ico b/apps/pdfeditor/main/resources/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..96d08b595b7f3d262b52f12a2885e2b3cdab88a9 GIT binary patch literal 5430 zcmeI$ZA_JA7{Kuh0cjjqWaL)Hz&?cNp_hr1MkBtYVr_kJF&ERVR(OP>nj2Wm(&Y=m zlo}&}C9!;&Sk?!ZyyWsN5e0I|6l`t2AmJoDM>t0m=-mD9v*$24oJS9#bFH53x9fhc z`?|0Dz=!AD=Mf2#DH0ba#5maeDtMD0u)1CA$p-q^pM|(83?Fv-WN`}gJkAwFa#B# zLF#s49&X$J?UH`+Bb3}yG(k;LBkMB|f^mDjzUjJ*@-XAo=!7!iBwvQ-5P?WzTtys& z*}99&<>4WW?3wYgLy&-SxS&j2BA-pKef<$b=?GVuL)6tE+2}K!sQdQ8jqi~J zc{c0MadKMrh9VQqP?OZe`lSeEuW6X=Z%>_Dc6?Vf3eW{*qK|wj<{=ywB%=&Yn62w% zZZ-6082OuDIa)2Sq7pZtOq?gb3Q^E&{LyoHxCpa8F6PRS0D0kH`A)c@OdKV@1i=vJ zZ)K6l#Yx^TkUd1t(_0@Y;B^@Z;4&~#Pk)KNxt-oW-Ol*b&%7mSK5n{dT zi1V-$gYey_dUkz@;CUR!b$p7)p!3pqW@9S$Vi+nwx^@pzynTo>unAYN9nV0Xs4eyi zVrXlhn-mOoWcw%e&{8Xg{@TI@X{Y>MrY|Ujd>=e~#Xkm4c_R4L70g zu>ty5!V2j*vAi1UK5(;V)z!u&JD~0ZH+xoHIkHHQh;0~vy2ozNzY=pG-3L=gdxZNn z=!Uw>y6E>IqA{{(*MTJQV=B32Xn~rfX4b!kP>kE_azmorK`Qg#Vi+nwL)7g-3U1rK zvo2l&G?Ti`a6p-`lP^Ln0_uBdf1FHEB=xyC374UXm;(zY+V4MI&u{;+m*YXD4h8d8 zK-5i<*b5?IYr`%CNz?-(ho;CUBJ0S9jm-z^{NW~Vy?*6jTx%KYTHQnC!a^?5~UD%3Q7+0HB)F*}@;v&?+4dp}U zYOw&i*0XL&fx`kD+Mx_*iCLItc!$`D(eo>~4^PXz)&>PPYO!$ruRmHhv^7+K-wht+ z1wS8onz@xY4_&Xda%PP{X3~nD**VSMrK28hC?7gkXFIm<<)o~hH(8U9NY0uTtV9RA zXVW&uZ$Y11wJe;0cfOsm4dI;KP8;X9zlcBJMSJ__iTxd)Rf2P$M+G@6a|^H^Zs;># z3ulffyl<^5p5tg+w-^m@gY(rGI#-YM_`2c**1Q2rZ_B${HqL=FN Date: Fri, 26 Apr 2024 10:59:53 +0300 Subject: [PATCH 2/2] Bug 67714: rename big buttons --- apps/common/main/lib/component/Button.js | 8 ++++---- ...{btn-add-comment.png => btn-big-add-comment.png} | Bin ...erthyperlink.png => btn-big-inserthyperlink.png} | Bin .../{btn-sheet-view.png => btn-big-sheet-view.png} | Bin ...{btn-add-comment.png => btn-big-add-comment.png} | Bin ...erthyperlink.png => btn-big-inserthyperlink.png} | Bin .../{btn-sheet-view.png => btn-big-sheet-view.png} | Bin ...{btn-add-comment.png => btn-big-add-comment.png} | Bin ...erthyperlink.png => btn-big-inserthyperlink.png} | Bin .../{btn-sheet-view.png => btn-big-sheet-view.png} | Bin ...{btn-add-comment.png => btn-big-add-comment.png} | Bin ...erthyperlink.png => btn-big-inserthyperlink.png} | Bin .../{btn-sheet-view.png => btn-big-sheet-view.png} | Bin ...{btn-add-comment.svg => btn-big-add-comment.svg} | 0 ...erthyperlink.svg => btn-big-inserthyperlink.svg} | 0 .../{btn-sheet-view.svg => btn-big-sheet-view.svg} | 0 ...{btn-add-comment.png => btn-big-add-comment.png} | Bin ...erthyperlink.png => btn-big-inserthyperlink.png} | Bin .../{btn-sheet-view.png => btn-big-sheet-view.png} | Bin apps/documenteditor/main/app/controller/Toolbar.js | 2 +- apps/documenteditor/main/app/view/FormsTab.js | 2 +- apps/documenteditor/main/app/view/Links.js | 2 +- apps/pdfeditor/main/app/view/InsTab.js | 2 +- apps/pdfeditor/main/app/view/Toolbar.js | 8 ++++---- ...tn-text-callout.png => btn-big-text-callout.png} | Bin ...tn-text-comment.png => btn-big-text-comment.png} | Bin ...tn-text-callout.png => btn-big-text-callout.png} | Bin ...tn-text-comment.png => btn-big-text-comment.png} | Bin ...tn-text-callout.png => btn-big-text-callout.png} | Bin ...tn-text-comment.png => btn-big-text-comment.png} | Bin ...tn-text-callout.png => btn-big-text-callout.png} | Bin ...tn-text-comment.png => btn-big-text-comment.png} | Bin ...tn-text-callout.svg => btn-big-text-callout.svg} | 0 ...tn-text-comment.svg => btn-big-text-comment.svg} | 0 ...tn-text-callout.png => btn-big-text-callout.png} | Bin ...tn-text-comment.png => btn-big-text-comment.png} | Bin .../main/app/controller/Toolbar.js | 2 +- apps/presentationeditor/main/app/view/Toolbar.js | 2 +- .../main/app/controller/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/view/ViewTab.js | 2 +- 41 files changed, 17 insertions(+), 17 deletions(-) rename apps/common/main/resources/img/toolbar/1.25x/big/{btn-add-comment.png => btn-big-add-comment.png} (100%) rename apps/common/main/resources/img/toolbar/1.25x/big/{btn-inserthyperlink.png => btn-big-inserthyperlink.png} (100%) rename apps/common/main/resources/img/toolbar/1.25x/big/{btn-sheet-view.png => btn-big-sheet-view.png} (100%) rename apps/common/main/resources/img/toolbar/1.5x/big/{btn-add-comment.png => btn-big-add-comment.png} (100%) rename apps/common/main/resources/img/toolbar/1.5x/big/{btn-inserthyperlink.png => btn-big-inserthyperlink.png} (100%) rename apps/common/main/resources/img/toolbar/1.5x/big/{btn-sheet-view.png => btn-big-sheet-view.png} (100%) rename apps/common/main/resources/img/toolbar/1.75x/big/{btn-add-comment.png => btn-big-add-comment.png} (100%) rename apps/common/main/resources/img/toolbar/1.75x/big/{btn-inserthyperlink.png => btn-big-inserthyperlink.png} (100%) rename apps/common/main/resources/img/toolbar/1.75x/big/{btn-sheet-view.png => btn-big-sheet-view.png} (100%) rename apps/common/main/resources/img/toolbar/1x/big/{btn-add-comment.png => btn-big-add-comment.png} (100%) rename apps/common/main/resources/img/toolbar/1x/big/{btn-inserthyperlink.png => btn-big-inserthyperlink.png} (100%) rename apps/common/main/resources/img/toolbar/1x/big/{btn-sheet-view.png => btn-big-sheet-view.png} (100%) rename apps/common/main/resources/img/toolbar/2.5x/big/{btn-add-comment.svg => btn-big-add-comment.svg} (100%) rename apps/common/main/resources/img/toolbar/2.5x/big/{btn-inserthyperlink.svg => btn-big-inserthyperlink.svg} (100%) rename apps/common/main/resources/img/toolbar/2.5x/big/{btn-sheet-view.svg => btn-big-sheet-view.svg} (100%) rename apps/common/main/resources/img/toolbar/2x/big/{btn-add-comment.png => btn-big-add-comment.png} (100%) rename apps/common/main/resources/img/toolbar/2x/big/{btn-inserthyperlink.png => btn-big-inserthyperlink.png} (100%) rename apps/common/main/resources/img/toolbar/2x/big/{btn-sheet-view.png => btn-big-sheet-view.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1.25x/big/{btn-text-callout.png => btn-big-text-callout.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1.25x/big/{btn-text-comment.png => btn-big-text-comment.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1.5x/big/{btn-text-callout.png => btn-big-text-callout.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1.5x/big/{btn-text-comment.png => btn-big-text-comment.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1.75x/big/{btn-text-callout.png => btn-big-text-callout.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1.75x/big/{btn-text-comment.png => btn-big-text-comment.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1x/big/{btn-text-callout.png => btn-big-text-callout.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/1x/big/{btn-text-comment.png => btn-big-text-comment.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/2.5x/big/{btn-text-callout.svg => btn-big-text-callout.svg} (100%) rename apps/pdfeditor/main/resources/img/toolbar/2.5x/big/{btn-text-comment.svg => btn-big-text-comment.svg} (100%) rename apps/pdfeditor/main/resources/img/toolbar/2x/big/{btn-text-callout.png => btn-big-text-callout.png} (100%) rename apps/pdfeditor/main/resources/img/toolbar/2x/big/{btn-text-comment.png => btn-big-text-comment.png} (100%) diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index de395441ac..1d92237fa6 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -737,9 +737,9 @@ define([ }, setIconCls: function(cls) { - var btnIconEl = $(this.el).find('.icon'), + var btnIconEl = $(this.el).find('i.icon'), oldCls = this.iconCls, - svgIcon = btnIconEl.find('use.zoom-int'); + svgIcon = $(this.el).find('.icon use.zoom-int'); this.iconCls = cls; if (/svgicon/.test(this.iconCls)) { @@ -760,9 +760,9 @@ define([ changeIcon: function(opts) { var me = this, - btnIconEl = $(this.el).find('.icon'); + btnIconEl = $(this.el).find('i.icon'); if (opts && (opts.curr || opts.next) && btnIconEl) { - var svgIcon = btnIconEl.find('use.zoom-int'); + var svgIcon = $(this.el).find('.icon use.zoom-int'); !!opts.curr && (btnIconEl.removeClass(opts.curr)); !!opts.next && !btnIconEl.hasClass(opts.next) && (btnIconEl.addClass(opts.next)); svgIcon.length && !!opts.next && svgIcon.attr('href', '#' + opts.next); diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-big-add-comment.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.25x/big/btn-add-comment.png rename to apps/common/main/resources/img/toolbar/1.25x/big/btn-big-add-comment.png diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-inserthyperlink.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-big-inserthyperlink.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.25x/big/btn-inserthyperlink.png rename to apps/common/main/resources/img/toolbar/1.25x/big/btn-big-inserthyperlink.png diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-sheet-view.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-big-sheet-view.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.25x/big/btn-sheet-view.png rename to apps/common/main/resources/img/toolbar/1.25x/big/btn-big-sheet-view.png diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-big-add-comment.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.5x/big/btn-add-comment.png rename to apps/common/main/resources/img/toolbar/1.5x/big/btn-big-add-comment.png diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-inserthyperlink.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-big-inserthyperlink.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.5x/big/btn-inserthyperlink.png rename to apps/common/main/resources/img/toolbar/1.5x/big/btn-big-inserthyperlink.png diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-sheet-view.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-big-sheet-view.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.5x/big/btn-sheet-view.png rename to apps/common/main/resources/img/toolbar/1.5x/big/btn-big-sheet-view.png diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-big-add-comment.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.75x/big/btn-add-comment.png rename to apps/common/main/resources/img/toolbar/1.75x/big/btn-big-add-comment.png diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-inserthyperlink.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-big-inserthyperlink.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.75x/big/btn-inserthyperlink.png rename to apps/common/main/resources/img/toolbar/1.75x/big/btn-big-inserthyperlink.png diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-sheet-view.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-big-sheet-view.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1.75x/big/btn-sheet-view.png rename to apps/common/main/resources/img/toolbar/1.75x/big/btn-big-sheet-view.png diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/1x/big/btn-big-add-comment.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1x/big/btn-add-comment.png rename to apps/common/main/resources/img/toolbar/1x/big/btn-big-add-comment.png diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-inserthyperlink.png b/apps/common/main/resources/img/toolbar/1x/big/btn-big-inserthyperlink.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1x/big/btn-inserthyperlink.png rename to apps/common/main/resources/img/toolbar/1x/big/btn-big-inserthyperlink.png diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-sheet-view.png b/apps/common/main/resources/img/toolbar/1x/big/btn-big-sheet-view.png similarity index 100% rename from apps/common/main/resources/img/toolbar/1x/big/btn-sheet-view.png rename to apps/common/main/resources/img/toolbar/1x/big/btn-big-sheet-view.png diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-add-comment.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-big-add-comment.svg similarity index 100% rename from apps/common/main/resources/img/toolbar/2.5x/big/btn-add-comment.svg rename to apps/common/main/resources/img/toolbar/2.5x/big/btn-big-add-comment.svg diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-inserthyperlink.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-big-inserthyperlink.svg similarity index 100% rename from apps/common/main/resources/img/toolbar/2.5x/big/btn-inserthyperlink.svg rename to apps/common/main/resources/img/toolbar/2.5x/big/btn-big-inserthyperlink.svg diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-sheet-view.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-big-sheet-view.svg similarity index 100% rename from apps/common/main/resources/img/toolbar/2.5x/big/btn-sheet-view.svg rename to apps/common/main/resources/img/toolbar/2.5x/big/btn-big-sheet-view.svg diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-add-comment.png b/apps/common/main/resources/img/toolbar/2x/big/btn-big-add-comment.png similarity index 100% rename from apps/common/main/resources/img/toolbar/2x/big/btn-add-comment.png rename to apps/common/main/resources/img/toolbar/2x/big/btn-big-add-comment.png diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-inserthyperlink.png b/apps/common/main/resources/img/toolbar/2x/big/btn-big-inserthyperlink.png similarity index 100% rename from apps/common/main/resources/img/toolbar/2x/big/btn-inserthyperlink.png rename to apps/common/main/resources/img/toolbar/2x/big/btn-big-inserthyperlink.png diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-sheet-view.png b/apps/common/main/resources/img/toolbar/2x/big/btn-big-sheet-view.png similarity index 100% rename from apps/common/main/resources/img/toolbar/2x/big/btn-sheet-view.png rename to apps/common/main/resources/img/toolbar/2x/big/btn-big-sheet-view.png diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 585b89710d..8498f22f99 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3609,7 +3609,7 @@ define([ this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { - this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', this.toolbar.capBtnComment, + this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-big-add-comment', this.toolbar.capBtnComment, [ Common.enumLock.paragraphLock, Common.enumLock.headerLock, Common.enumLock.richEditLock, Common.enumLock.plainEditLock, Common.enumLock.richDelLock, Common.enumLock.plainDelLock, Common.enumLock.cantAddQuotedComment, Common.enumLock.imageLock, Common.enumLock.inSpecificForm, Common.enumLock.inImage, Common.enumLock.lostConnect, Common.enumLock.disableOnStart, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.viewMode ], diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index cd7c8cce77..a43ad6773e 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -480,7 +480,7 @@ define([ this.btnViewFormRoles = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-sheet-view', + iconCls: 'toolbar__icon btn-big-sheet-view', lock: [ _set.previewReviewMode, _set.formsNoRoles, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: this.capBtnView, split: true, diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index e057a71fb3..a36f1240b4 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -173,7 +173,7 @@ define([ this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'toolbar__icon btn-notes', me.capBtnInsFootnote, [_set.paragraphLock, _set.inEquation, _set.inImage, _set.inHeader, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], true, true, undefined, '1', 'bottom', 'small'); - this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-inserthyperlink', me.capBtnInsLink, + this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-big-inserthyperlink', me.capBtnInsLink, [_set.paragraphLock, _set.headerLock, _set.hyperlinkLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], undefined, undefined, undefined, '1', 'bottom', 'small'); Array.prototype.push.apply(this.paragraphControls, this.btnsContents.concat(this.btnsNotes, this.btnsHyperlink)); diff --git a/apps/pdfeditor/main/app/view/InsTab.js b/apps/pdfeditor/main/app/view/InsTab.js index 1f041f34e6..1eedcc384d 100644 --- a/apps/pdfeditor/main/app/view/InsTab.js +++ b/apps/pdfeditor/main/app/view/InsTab.js @@ -216,7 +216,7 @@ define([ me.btnInsertHyperlink = new Common.UI.Button({ id: 'tlbtn-insertlink', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-inserthyperlink', + iconCls: 'toolbar__icon btn-big-inserthyperlink', caption: me.capInsertHyperlink, lock: [_set.hyperlinkLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected], dataHint: '1', diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js index c64ce1c57c..86b8064a23 100644 --- a/apps/pdfeditor/main/app/view/Toolbar.js +++ b/apps/pdfeditor/main/app/view/Toolbar.js @@ -776,7 +776,7 @@ define([ this.btnAddComment = new Common.UI.Button({ id: 'tlbtn-addcomment', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-add-comment', + iconCls: 'toolbar__icon btn-big-add-comment', lock: [_set.disableOnStart], caption: this.capBtnComment, dataHint: '1', @@ -788,7 +788,7 @@ define([ this.btnTextComment = new Common.UI.Button({ id: 'tlbtn-textcomment', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-text-comment', + iconCls: 'toolbar__icon btn-big-text-comment', lock: [_set.disableOnStart], caption: this.capBtnTextComment, menu: true, @@ -1383,14 +1383,14 @@ define([ caption: me.tipInsertTextComment, iconCls : 'menu__icon btn-text-comment', value: AscPDF.FREE_TEXT_INTENT_TYPE.FreeText, - iconClsForMainBtn: 'btn-text-comment', + iconClsForMainBtn: 'btn-big-text-comment', captionForMainBtn: me.capBtnTextComment }, { caption: me.tipInsertTextCallout, iconCls : 'menu__icon btn-text-callout', value: AscPDF.FREE_TEXT_INTENT_TYPE.FreeTextCallout, - iconClsForMainBtn: 'btn-text-callout', + iconClsForMainBtn: 'btn-big-text-callout', captionForMainBtn: me.capBtnTextCallout }, ] diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-text-callout.png b/apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-big-text-callout.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-text-callout.png rename to apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-big-text-callout.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-text-comment.png b/apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-big-text-comment.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-text-comment.png rename to apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-big-text-comment.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-text-callout.png b/apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-big-text-callout.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-text-callout.png rename to apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-big-text-callout.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-text-comment.png b/apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-big-text-comment.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-text-comment.png rename to apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-big-text-comment.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-text-callout.png b/apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-big-text-callout.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-text-callout.png rename to apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-big-text-callout.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-text-comment.png b/apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-big-text-comment.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-text-comment.png rename to apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-big-text-comment.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-text-callout.png b/apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-big-text-callout.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-text-callout.png rename to apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-big-text-callout.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-text-comment.png b/apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-big-text-comment.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-text-comment.png rename to apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-big-text-comment.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-text-callout.svg b/apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-text-callout.svg similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-text-callout.svg rename to apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-text-callout.svg diff --git a/apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-text-comment.svg b/apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-text-comment.svg similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-text-comment.svg rename to apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-text-comment.svg diff --git a/apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-text-callout.png b/apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-big-text-callout.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-text-callout.png rename to apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-big-text-callout.png diff --git a/apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-text-comment.png b/apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-big-text-comment.png similarity index 100% rename from apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-text-comment.png rename to apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-big-text-comment.png diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index d24945a6a5..a376b5c248 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2798,7 +2798,7 @@ define([ this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { var _set = Common.enumLock; - this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides], undefined, undefined, undefined, '1', 'bottom', 'small'); + this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-big-add-comment', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides], undefined, undefined, undefined, '1', 'bottom', 'small'); if ( this.btnsComment.length ) { var _comments = PE.getController('Common.Controllers.Comments').getView(); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index ecba752b6e..077f8dda4d 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -834,7 +834,7 @@ define([ me.btnInsertHyperlink = new Common.UI.Button({ id: 'tlbtn-insertlink', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-inserthyperlink', + iconCls: 'toolbar__icon btn-big-inserthyperlink', caption: me.capInsertHyperlink, lock: [_set.hyperlinkLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected], dataHint: '1', diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index c385714933..faa7c633ed 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -4692,7 +4692,7 @@ define([ this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { var _set = Common.enumLock; - this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', this.toolbar.capBtnComment, + this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-big-add-comment', this.toolbar.capBtnComment, [_set.lostConnect, _set.commentLock, _set.editCell, _set['Objects']], undefined, undefined, undefined, '1', 'bottom', 'small'); if ( this.btnsComment.length ) { diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index ef170d8264..eb0fdb9bb9 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1246,7 +1246,7 @@ define([ me.btnInsertHyperlink = new Common.UI.Button({ id : 'tlbtn-insertlink', cls : 'btn-toolbar x-huge icon-top', - iconCls : 'toolbar__icon btn-inserthyperlink', + iconCls : 'toolbar__icon btn-big-inserthyperlink', caption : me.capInsertHyperlink, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.selSlicer, _set.multiselect, _set.lostConnect, _set.coAuth, _set.editPivot, _set['InsertHyperlinks'], _set.userProtected], dataHint : '1', diff --git a/apps/spreadsheeteditor/main/app/view/ViewTab.js b/apps/spreadsheeteditor/main/app/view/ViewTab.js index e844d7961a..37c479f24f 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/view/ViewTab.js @@ -191,7 +191,7 @@ define([ if ( me.appConfig.canFeatureViews && me.appConfig.isEdit ) { this.btnSheetView = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-sheet-view', + iconCls: 'toolbar__icon btn-big-sheet-view', caption: me.capBtnSheetView, lock : [_set.lostConnect, _set.coAuth, _set.editCell], menu: true,