From 9e090ad2ac743fa2d6bdeb62a30e183fea6178ec Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 21 Nov 2024 20:47:26 +0300
Subject: [PATCH 1/2] [PE] Select pointer type

---
 .../toolbar/1.25x/big/btn-big-hand-tool.png   | Bin
 .../toolbar/1.5x/big/btn-big-hand-tool.png    | Bin
 .../toolbar/1.75x/big/btn-big-hand-tool.png   | Bin
 .../img/toolbar/1x/big/btn-big-hand-tool.png  | Bin
 .../toolbar/2.5x/big/btn-big-hand-tool.svg    |   0
 .../img/toolbar/2x/big/btn-big-hand-tool.png  | Bin
 .../toolbar/1.25x/big/btn-big-hand-tool.png   | Bin 526 -> 0 bytes
 .../toolbar/1.5x/big/btn-big-hand-tool.png    | Bin 661 -> 0 bytes
 .../toolbar/1.75x/big/btn-big-hand-tool.png   | Bin 870 -> 0 bytes
 .../img/toolbar/1x/big/btn-big-hand-tool.png  | Bin 485 -> 0 bytes
 .../toolbar/2.5x/big/btn-big-hand-tool.svg    |   1 -
 .../img/toolbar/2x/big/btn-big-hand-tool.png  | Bin 961 -> 0 bytes
 .../main/app/controller/Main.js               |   2 -
 .../main/app/controller/ViewTab.js            |  25 ++++++++-
 .../main/app/view/ViewTab.js                  |  48 ++++++++++++++++++
 apps/presentationeditor/main/locale/en.json   |   6 ++-
 16 files changed, 77 insertions(+), 5 deletions(-)
 rename apps/{documenteditor => common}/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png (100%)
 rename apps/{documenteditor => common}/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png (100%)
 rename apps/{documenteditor => common}/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png (100%)
 rename apps/{documenteditor => common}/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png (100%)
 rename apps/{documenteditor => common}/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg (100%)
 rename apps/{documenteditor => common}/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png (100%)
 delete mode 100644 apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png
 delete mode 100644 apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png
 delete mode 100644 apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png
 delete mode 100644 apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png
 delete mode 100644 apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg
 delete mode 100644 apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png

diff --git a/apps/documenteditor/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png
rename to apps/common/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png
rename to apps/common/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png
rename to apps/common/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png b/apps/common/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png
rename to apps/common/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png
diff --git a/apps/documenteditor/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg
rename to apps/common/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg
diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png b/apps/common/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png
similarity index 100%
rename from apps/documenteditor/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png
rename to apps/common/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png
diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png b/apps/pdfeditor/main/resources/img/toolbar/1.25x/big/btn-big-hand-tool.png
deleted file mode 100644
index 1e3722ba1178e1fcca95993ca21af751ef110524..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq002e+001Kh1^@s6DHnWg0005iNkl<Zc-rll
zVa)>}42F?_gp)7_I|*|z93TM+lYoRtI0=)01SIf5QnH3*yDL{<U&5O->3&>teb%>>
z6Jly=YHI4=NyYFnT#Wn37YQM#7(RxJaUTsP0a+mYU@!^D0^vu42}M4vdm@a0^AX*H
z?Nfs3+C7DRN-*8K2iqrn>7L&937@)Wlzm2m36%U-z%-vXN5S-(H%GxVpEm?BUFJ>r
z6<blQ)Y?`P%mg#Rkd=n#2F2MJaugUCo*N8P8$*r+^MJ^?DGGHvxnu<MNP%)w6z#s{
zB}fi18Wrh?g)RlKvtTqT(oqV9j&odK6j&+C5W!qxycq9A8~SaCU@kFUTwo+DXtL;<
zqgo5FXTV6<U?uJv!t*Nz%b^VltdWMH&2<W;;k#BotJBct1fx&<>v%?SfYG)8I-XJ7
zc3LXC?aBxy+i9unwyR*4sjx(o3nUC(OMIr;1u_p^ioX@-d?~udQDzOCXjU}RD&Al3
zj_xl@ix+_t#vQR#-d}3$N43;m!Ku5RXk%`5PcnN2Lw7y%#@t#8;8^G)yyM(pp|d?+
z1T5m<?z9#=&Mhr;EiLrPDtRmR;{7R;^%NouRt2YyN1rmAoI+DmQ&SxJ1Au{`<v$}1
QSO5S307*qoM6N<$f<<%T1^@s6

diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png b/apps/pdfeditor/main/resources/img/toolbar/1.5x/big/btn-big-hand-tool.png
deleted file mode 100644
index 89a0851c570d42bf533497f8ca758eb3dde228dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq002|~001fo1^@s6Ekk^800079Nkl<Zc-rln
zfsKPO3`H{n8(c={2-%<`&<)B48G#Wx0wXX&Mqq@D;EQ!e%H^ViLYx{YmMqm(iRhF4
z6C0Fj)~s2xW>QQCpMyhiN3l2q03CdWA9EN>1&R<YeYONwB2a{A>9a++Qh~xoECne1
z7fS~!P6Bd3rAR=knK_^zmw=3B=75TjfK)R<q6B0#6QoK2oQy?iW&_%Q{)&C@C3r6x
zXfPjq3EoQws>!`@pqkuYrR3oXC11Pz8&E+&v6Q+C07WhBt^gD_rmqVC#f^#OKD$gt
zi35t+lxCDfpaYetr}j}x1RDPMKqcy_)zngfLIiP)dU9z%A%ZxrJ-IZXU2<kzV<QPD
zmAX&k;6`GG&IC{;lOxE$-y3seD3-a2V!KY6QuupgE}%A=D#clP=8VPx)UH#dBunAM
znk+z#`a8?C0)d)zmYEyZNdUSY#J`d(oeG{|OF{K90Ls$o#CmL<Qd;(<n*x@yFWnTB
zv|GUm5w7K!fZj??h-fXR7!CEQ#C$NP$)$JuzQ8($`}vZg&E%{-sX^cZiXfH(>pZbR
z;GQ+i)QX;6<IX$~!7LpLta0ZCx@xIDc)g|#sbdCuqa9x#yk1i)TV-@NoY25W@K=qS
zq+!W?@Y+Z4D)$+e?RX$N7gg~M5-QvAKz1&*-yrGe=rg|gdt37+>0s~nLXCc3^*&=r
zquPEfY~F;=0d?GZEKH{ZS7T@2ql=EfPEl9&qVK9chu_deM_{M5t3s`$@2WqC-=mTD
v2xw2I0#Qa9d5?hhcq&lMnl)?I?4$M#oz;C;;|FE500000NkvXXu0mjfs0b%`

diff --git a/apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png b/apps/pdfeditor/main/resources/img/toolbar/1.75x/big/btn-big-hand-tool.png
deleted file mode 100644
index 889b06d8e3be00f99442976011897e91658c05a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 870
zcmV-s1DX7ZP)<h;3K|Lk000e1NJLTq003eD001!v1^@s6A-{ZA0009mNkl<Zc-rlo
zjg71z5XUKj4$cznVC}%`;MsxKf!l#4Sb`-`f+bjjC3wuspBI)>pS#N-<d|d<oz2|_
ze#{30D@2woS+Zowa;=nFtCR<@u4}0^*)bGaCrfA8QUXwDoh+TnmKumrYiGUFvq}ua
zsI{}+JFO}?k9OYWhAnmwtMe{hTZ$lz?GxTYE9*~6AdF4RC%i>zjcyE-%z9{X0D^Kw
z4W;L=h$g<$+Cz&25R@xwC_P6r23q9{@<4|P-UCrM71a_61X|?_@<4|P-UCrM71a_8
z2%7kt;~nc0;VK3YH1RjbJJz$|D)xMk5{T8OErZA)-m)o#x8bTy-@71CK~Z=cuH5v!
z3xX=Gk1IEQ9zal~^>Ov4&u3^_Qx8p7hN=uAgUBE<hz#QQg7`vtxmRLF4}$tZC@(il
z%oIRWRtuv<i8-YN0_}>wEe!OAsKlI717R9@wkYw~HH{raXCLsurtGe13Lu(|O;#Zu
zk3M~Ypu?ku0Yu|&ve4%Kcl7BC1P+f_y0K<*<c6n=2NOKLU^9SygOF%(%MDK%4<>kg
z)@A^6C2J*q-o%iYw8~>RVF6)<qG|)syw~!6@q1W7wCD%zC30UNDz09Wo}8BYK?jN4
z7l?|p*R&U&1j^YIKx~F5d^V&4!i1-K2a>NZZU9y=hNpT5lJfK&R2U4LAlO#xe@bQF
z`w7-DY?aC!vIySmlLPV*=R_@>*C!F?S`lEya=M)okCza*RxEe;yK#dsNxNk9ILQpc
zB<+&X<D>{6T*sLdE~XFz;5yDk4hk{`BQry;=y&!iTrg(exx(BM3<<()<fLb~Wk3*S
zBPTt>Ek$4<@}tN7!xVY|Siz&G|J8&JOKz2O_v8(i+^R;EbNA#8m)#6EjlXvWa%V1y
z&s0(KJ22>Pxp&iNqyUWmg`9C`$ThD_q&b`DpUoM7Fo!Bx&v-`vM2Io%5_L5M$20n~
zA;z>zpizv$mRdaCV{MU$8$1vAY!Z?FS_nTrvG1|ANW=}E2Yfcg_-mo9aAnRg251jk
wDH0Hbs}^1|KzrDd7(<pUS+ZowlEssJ1L~PYz#DTC9smFU07*qoM6N<$f@nd4ssI20

diff --git a/apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png b/apps/pdfeditor/main/resources/img/toolbar/1x/big/btn-big-hand-tool.png
deleted file mode 100644
index c7478cb15bb8908ee97bc36eeee71f3cae49ea38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq001}u000~a1^@s6G`oC000053Nkl<Zc-rk)
z0j-2E44s5ZKmroZ!JPweaOVIVAOQ&{VG@uq36rqjC2g`S`3EiAF1gU;g^@t$<Mp)z
zW3IU3Cu2l-ghLFq9~MFw5gy?XLkohDSV!;;2u5NZ!M7k7vUOE8kyJ?6wbV?@GACGE
z&8#eQf>qQ^%QAdWvqo8l|J1BmmbD26$+{)MB7Qtdu%sW45-j3J0l{K^3@yu5TB0S&
z_2&rQ5EG(rK@ju1AtprMf?!9DVxr?COW5tKLE=I3kRyWe_{frXpVoK;sR!dwUlS#r
zP?0Vpeq^YxiIPsD2)`f+K~@0hd=(OmWwr?t1Zwv{=c|xlkJzLhw1}rh5mMa>J!lb6
zjUuGF)ifEWY=SY-MbTtb&x<bxv1snK${ooYaaSa2H9Hc#=Z&~)2(pTx+?X4UitI({
z##}pd7h$=LQvYSiE|PMi4y=A2chsoJOQ7Cxf*_D0FM)ceH`?4q=bh{3WPYC6rt#pP
zcdnaxewGL(xsgJUD9mHQD*U=fa*GNjGZJ_#5Wo};_Lxt;|E#I^KV~E%KKcH$t^TfE
b@$L8nN25{upm|}}00000NkvXXu0mjf9K_Rl

diff --git a/apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg b/apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg
deleted file mode 100644
index 5350e920f9..0000000000
--- a/apps/pdfeditor/main/resources/img/toolbar/2.5x/big/btn-big-hand-tool.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9 3.5a1.5 1.5 0 0 1 2.947-.395A1.5 1.5 0 0 1 14 4.5v1.585a1.506 1.506 0 0 1 2.004 1.412c0 .13 0 .26.002.39.008 1.241.016 2.44-.041 3.541-.063 1.214-.206 2.344-.53 3.31-.327.975-.846 1.806-1.67 2.388-.824.58-1.897.874-3.266.874-1.676 0-3.065-1.152-4.147-2.499-1.096-1.365-1.973-3.05-2.608-4.35C3.259 10.158 3.994 9 5.092 9c.394 0 .771.156 1.05.435l.858.858V5.5a1.5 1.5 0 0 1 2-1.415V3.5Zm1 0V10a.5.5 0 0 1-1 0V5.5a.5.5 0 1 0-1 0v6a.5.5 0 0 1-.854.354l-1.712-1.712A.484.484 0 0 0 5.092 10a.5.5 0 0 0-.45.712c.632 1.293 1.469 2.892 2.49 4.163C8.167 16.164 9.298 17 10.499 17c1.228 0 2.082-.263 2.689-.691.605-.427 1.02-1.056 1.299-1.888.281-.84.418-1.864.48-3.044.054-1.07.047-2.24.039-3.487l-.003-.386A.506.506 0 0 0 14.5 7a.5.5 0 0 0-.5.5V10a.5.5 0 1 1-1 0V4.5a.5.5 0 1 0-1 0V10a.5.5 0 1 1-1 0V3.5a.5.5 0 1 0-1 0Z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png b/apps/pdfeditor/main/resources/img/toolbar/2x/big/btn-big-hand-tool.png
deleted file mode 100644
index 87ea9eb23bdc8accc2dc692efce7d60dcde66834..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 961
zcmV;y13vtTP)<h;3K|Lk000e1NJLTq003|R001}$1^@s6CF^`j000AsNkl<Zc-rlp
zjcxNF5QaShBQSzDh&O0Aa5qRda5wM>?gklw5i$ZJcmzI2-=Ut6!AZ-V0o^MhRoBW0
zo*egs)2<VVL?V$$Boc{Qm)?fi#<~r+jT_jSkaJFN!)#-9|8;xVT7u`n;jy*=5#V`n
zSZgZ~ZvbrBh5~5cU^5K>yaBLf8w!AagUvK?!oa|vMuohvc7R?Q*_8LfmH@`=RmVn8
zF9Ejt*mwl6>e%=Mz^Y>7UbcAzu$tHy$u^GwRudaz+2#?zDq>?I+dKkTO>9hMo9-7!
zYfagvd-Z6oE!%7XV9KMK0!U>qI$05b0<bxNMb(G70hU-F<_1_)eMkVXxcV?Rz@q9y
z0)WNUhq(b3RUZ-nEUrGJPGU|?Zm5%(5|SGMC;$bZ02F`%uvLH>71t~LteHTOXQ9DW
z(F#9n4p1Cf=wl%^Qeck^05#YwAv_x?utx@f8qAgo;DTCOzPO%{SEOzoY-HnKu~P$F
zP)o}f*AwcHq;4JT-p0RT=KyG611}N#OdO*I%1#U%mk(Vc_L(w9ZI2zOJ2C#U_8Qpx
z?)c`t27vyu_8Qpxqnr0y0A3RtI5PlzM@Klt23}(uh`o;x;JZJ<sQ{|(=W1t2{LT@7
zfM%i%ROo7FNc_$be}LwWP;+7vCt`qp?uoFBm}8rW5*kN5_e2S>53<f@v&x(?_>B-?
zkF(Bav&zgd_^l(Bq4tD`?vX5*DjQ{8-!|WUFAJv324h}G-KJB-8#$!Bkh)FBH7B<h
z`lI{Kw3)14h>q?%*9V5%3w;K<Fl{KS7orSw=@?}w)B4C<Bjb@~IMVuHu8|YqfZ|e5
zI1lczYDRzqic3A=JZkS987|EXvFW2b>1{Mro81ZL_&D=zG}ZlFF;N{gmizb&yu(r+
zrRe!%cam^3dnEEcd)DHDX7)(reW$I@>k~m7GCfnD>3zXQe<FxOrf2FBybo*2?1?wd
z+V6=CpK^L4YMm9azCDOve~7E!=;+j?EG~ff^~+}{^cuY_@w@UEqJ7aD2Xt(%#N|m2
zi1rn4gwn*KCP8uQ+XLZ2PGDDoxAo9zF~Q&KQWqD1@E|9!tH9fO=(L#N?~7eum_^3k
zWQ%=$Z0dNM<bTZ~t$SW8fUaVFSQn@h@fS8dutyMI;Ha%`VF2<1MZXFDi^U4pM2|P#
j#u~wiL?V$$RHFU?|7KY$gQX=#00000NkvXXu0mjfX(+fc

diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 6ba03a3caf..59dddc4d35 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -943,8 +943,6 @@ define([
                 value = Common.localStorage.getBool('pe-hidden-notes', this.appOptions.customization && this.appOptions.customization.hideNotes===true);
                 me.api.asc_ShowNotes(!value);
 
-                me.api.asc_setViewerTargetType(this.appOptions.customization && this.appOptions.customization.pointerMode==='hand' ? 'hand' : 'select');
-
                 function checkWarns() {
                     if (!Common.Controllers.Desktop.isActive()) {
                         var tips = [];
diff --git a/apps/presentationeditor/main/app/controller/ViewTab.js b/apps/presentationeditor/main/app/controller/ViewTab.js
index c526d84abe..72b72d50c7 100644
--- a/apps/presentationeditor/main/app/controller/ViewTab.js
+++ b/apps/presentationeditor/main/app/controller/ViewTab.js
@@ -67,6 +67,7 @@ define([
             Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this));
             Common.NotificationCenter.on('settings:unitschanged', _.bind(this.unitsChanged, this));
             Common.NotificationCenter.on('tabstyle:changed', this.onTabStyleChange.bind(this));
+            Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
         },
 
         setApi: function (api) {
@@ -112,7 +113,9 @@ define([
                     'gridlines:spacing': _.bind(this.onGridlinesSpacing, this),
                     'gridlines:custom': _.bind(this.onGridlinesCustom, this),
                     'gridlines:aftershow': _.bind(this.onGridlinesAfterShow, this),
-                    'macros:click':  _.bind(this.onClickMacros, this)
+                    'macros:click':  _.bind(this.onClickMacros, this),
+                    'pointer:select': _.bind(this.onPointerType, this, 'select'),
+                    'pointer:hand': _.bind(this.onPointerType, this, 'hand')
                 },
                 'Toolbar': {
                     'view:compact': _.bind(function (toolbar, state) {
@@ -428,12 +431,32 @@ define([
             this.changeViewMode(mode);
         },
 
+        onPointerType: function (type) {
+            if (this.api) {
+                this.api.asc_setViewerTargetType(type);
+                Common.NotificationCenter.trigger('edit:complete', this.view);
+            }
+        },
+
         onTabStyleChange: function () {
             if (this.view && this.view.menuTabStyle) {
                 _.each(this.view.menuTabStyle.items, function(item){
                     item.setChecked(Common.Utils.InternalSettings.get("settings-tab-style")===item.value, true);
                 });
             }
+        },
+
+        onAppReady: function (config) {
+            var me = this;
+            (new Promise(function (accept, reject) {
+                accept();
+            })).then(function () {
+                if (me.view && me.view.btnHandTool) {
+                    var hand = config && config.customization && config.customization.pointerMode==='hand';
+                    me.api && me.api.asc_setViewerTargetType(hand ? 'hand' : 'select');
+                    me.view[hand ? 'btnHandTool' : 'btnSelectTool'].toggle(true, true);
+                }
+            });
         }
 
     }, PE.Controllers.ViewTab || {}));
diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index 863df586a0..f50cb6b47b 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -51,6 +51,11 @@ define([
                     '<span class="btn-slot text x-huge" id="slot-btn-slide-master"></span>' +
                 '</div>' +
                 '<div class="separator long slide-master-separator"></div>' +
+                '<div class="group group-tool-select">' +
+                    '<span class="btn-slot text x-huge" id="slot-btn-hand-tool"></span>' +
+                    '<span class="btn-slot text x-huge" id="slot-btn-select-tool"></span>' +
+                '</div>' +
+                '<div class="separator long group-tool-select"></div>' +
                 '<div class="group small">' +
                     '<div class="elset" style="display: flex;">' +
                         '<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
@@ -189,6 +194,12 @@ define([
                 me.btnMacros.on('click', function () {
                     me.fireEvent('macros:click');
                 });
+                me.btnSelectTool && me.btnSelectTool.on('toggle', _.bind(function(btn, state) {
+                    state && me.fireEvent('pointer:select');
+                }, me));
+                me.btnHandTool && me.btnHandTool.on('toggle', _.bind(function(btn, state) {
+                    state && me.fireEvent('pointer:hand');
+                }, me));
             },
 
             initialize: function (options) {
@@ -394,6 +405,36 @@ define([
                     dataHintOffset: 'small'
                 });
                 this.lockedControls.push(this.btnMacros);
+                if (!this.appConfig.isEdit && !this.appConfig.isRestrictedEdit) {
+                    this.btnSelectTool = new Common.UI.Button({
+                        cls: 'btn-toolbar x-huge icon-top',
+                        iconCls: 'toolbar__icon btn-select',
+                        lock: [_set.disableOnStart],
+                        caption: me.capBtnSelect,
+                        toggleGroup: 'select-tools-tb',
+                        enableToggle: true,
+                        allowDepress: false,
+                        dataHint: '1',
+                        dataHintDirection: 'bottom',
+                        dataHintOffset: 'small'
+                    });
+                    this.lockedControls.push(this.btnSelectTool);
+
+                    this.btnHandTool = new Common.UI.Button({
+                        cls: 'btn-toolbar x-huge icon-top',
+                        iconCls: 'toolbar__icon btn-big-hand-tool',
+                        lock: [_set.disableOnStart],
+                        caption: me.capBtnHand,
+                        toggleGroup: 'select-tools-tb',
+                        enableToggle: true,
+                        allowDepress: false,
+                        dataHint: '1',
+                        dataHintDirection: 'bottom',
+                        dataHintOffset: 'small'
+                    });
+                    this.lockedControls.push(this.btnHandTool);
+                }
+
                 Common.UI.LayoutManager.addControls(this.lockedControls);
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },
@@ -424,6 +465,8 @@ define([
                 this.chLeftMenu.render($host.find('#slot-chk-leftmenu'));
                 this.chRightMenu.render($host.find('#slot-chk-rightmenu'));
                 this.btnMacros.render($host.find('#slot-btn-macros'));
+                this.btnSelectTool && this.btnSelectTool.render($host.find('#slot-btn-select-tool'));
+                this.btnHandTool && this.btnHandTool.render($host.find('#slot-btn-hand-tool'));
                 return this.$el;
             },
 
@@ -440,6 +483,8 @@ define([
                     me.btnGuides.updateHint(me.tipGuides);
                     me.btnGridlines.updateHint(me.tipGridlines);
                     me.btnMacros.updateHint(me.tipMacros);
+                    me.btnSelectTool && me.btnSelectTool.updateHint(me.tipSelectTool);
+                    me.btnHandTool && me.btnHandTool.updateHint(me.tipHandTool);
                     
                     me.btnGuides.setMenu( new Common.UI.Menu({
                         cls: 'shifted-right',
@@ -501,6 +546,9 @@ define([
                         me.btnSlideMaster.$el.closest('.group').remove();
                         me.$el.find('.slide-master-separator').remove();
                     }
+                    if (config.isEdit || config.isRestrictedEdit) {
+                        me.$el.find('.group-tool-select').remove();
+                    }
 
                     if (Common.UI.Themes.available()) {
                         function _add_tab_styles() {
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 66ec589749..f9a3ff527c 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -2952,5 +2952,9 @@
   "PE.Views.ViewTab.tipSlideMaster": "Slide master",
   "PE.Views.Toolbar.textTabDesign": "Design",
   "PE.Views.ViewTab.textMacros": "Macros",
-  "PE.Views.ViewTab.tipMacros": "Macros"
+  "PE.Views.ViewTab.tipMacros": "Macros",
+  "PE.Views.ViewTab.capBtnHand": "Hand",
+  "PE.Views.ViewTab.capBtnSelect": "Select",
+  "PE.Views.ViewTab.tipSelectTool": "Select tool",
+  "PE.Views.ViewTab.tipHandTool": "Hand tool"
 }

From 5a22979ba53048ff1780b32a84df4480be64d2e8 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 21 Nov 2024 22:36:39 +0300
Subject: [PATCH 2/2] [PE] Refactoring

---
 apps/presentationeditor/main/app/view/ViewTab.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js
index f50cb6b47b..155fa80465 100644
--- a/apps/presentationeditor/main/app/view/ViewTab.js
+++ b/apps/presentationeditor/main/app/view/ViewTab.js
@@ -51,11 +51,11 @@ define([
                     '<span class="btn-slot text x-huge" id="slot-btn-slide-master"></span>' +
                 '</div>' +
                 '<div class="separator long slide-master-separator"></div>' +
-                '<div class="group group-tool-select">' +
+                '<div class="group">' +
                     '<span class="btn-slot text x-huge" id="slot-btn-hand-tool"></span>' +
                     '<span class="btn-slot text x-huge" id="slot-btn-select-tool"></span>' +
                 '</div>' +
-                '<div class="separator long group-tool-select"></div>' +
+                '<div class="separator long"></div>' +
                 '<div class="group small">' +
                     '<div class="elset" style="display: flex;">' +
                         '<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
@@ -547,7 +547,7 @@ define([
                         me.$el.find('.slide-master-separator').remove();
                     }
                     if (config.isEdit || config.isRestrictedEdit) {
-                        me.$el.find('.group-tool-select').remove();
+                        me.$el.find('#slot-btn-hand-tool').closest('.group').next().addBack().remove();
                     }
 
                     if (Common.UI.Themes.available()) {