From fcd1e4f70efa71d29980077aadc62ac38210a89f Mon Sep 17 00:00:00 2001 From: Calvin Walton Date: Tue, 2 May 2017 16:11:14 -0400 Subject: [PATCH] New cursors for flash client --- .../common/assets/images/ellipse.png | Bin 442 -> 926 bytes .../bigbluebutton/common/assets/images/line.png | Bin 219 -> 336 bytes .../common/assets/images/pencil.png | Bin 712 -> 850 bytes .../common/assets/images/square.png | Bin 164 -> 345 bytes .../bigbluebutton/common/assets/images/text.png | Bin 414 -> 621 bytes .../common/assets/images/triangle.png | Bin 366 -> 939 bytes .../whiteboard/views/WhiteboardCanvas.mxml | 8 ++++---- 7 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png mode change 100755 => 100644 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png mode change 100755 => 100644 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png mode change 100755 => 100644 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png mode change 100755 => 100644 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png old mode 100755 new mode 100644 index ce5466bfe0cdf9a697052b5ecf4939b3c59b95fe..d58b3f79fe2be522f6b6a602c6666f4fb3f460bd GIT binary patch literal 926 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy%*9TgAsieWw;%dH0CG7CJR*yM z%CCbkqm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?76CpX zu0X}aga2Saym~w;85tRw!GMK@1xWMo@bL2T^7He{$;rvf%j@as>Feto7#J8D8X6fH znVXwiT3T9JSy@|KySlo%ySoPm2Zw}&gocKOhleL7CMG8*r>3T+rKM$NW@cq&WoKvS zlw+Pn$Mv`t<2DX3Us5bLO#Q$BrLAe&WQ5YuBz_zkdA|7~H;n`|jPlU%q_# z`t|F*d-onZc<}Gvzvs`Nzj*QD<;$0^UcCZ}fBW|B*RNl{fBy#h$kx^t7z|y-ch>+p zsU<;v!3->H>>Qk2GO}{o#wMoL4o=Q4t{$FV-eKV}v2pPU**Up+Ma5I5u358w!-kCq z4jw#m z|0)5fjjMV5HRfK5oUvJ&<(tfzOCIei zdrZp`QY!W|Ralr*b4c1U{Oi|b2ybMSKUD6u%yz=ZcMeYGmQLm?8_#Owp3I;7{rrht9` literal 442 zcmV;r0Y(0aP)QO*FNca_07fJiumJHyAa(@e?Ld4Lh(7``KM-pJvFD@LUvJ2Xa)$%izp=SsIuOeP zaTO3B0^+wo{0B;d_*Fp7tS4{2xnNSTofX{xYbc%##JBSr0og#j zgUE2(;iM0~^H zfW(u5nl&%ndk?b|B_*;Rx%T>;jg}}gG$mdE1sKTBAZLSYUVY?|X7BoI41fOqpL%A3 zXAUg+!ocr>S!aygj3ie&=!h4Aq6!q+pa28;8RTrJ&C`Im5L;e=17IStfhI0HXlTEI k`Wa;N5nP#xEC3K-031_y58%|j{r~^~07*qoM6N<$f`i7bssI20 diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png old mode 100755 new mode 100644 index e0abedeaaea9868fceee6038e75524d663cf883e..bd1fa8bcb6adaa97abd27556369d35b1331bc470 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*RgT^vIq zTHju?qyt?Z#gYNrE zdy4}rD!MD~JeK?ZgTe~DWM4fA9I6z literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XYCT;XLn>}1{rUgjo>{e_lgIX!!yc(~%sU%c*6i;^U1^?F^4#bRG5isE>l|JCe*!{JB+cwsd@03Z;0MD$( zm;c6hcXw+vO=nkESF4Jm=!1iUA58qII<&Fs<`sCzf8NdpFC${4(%L*=+D_bg+P6;9U#Kgq5iF>WaljGy# zm+(|7Ri!A3E0@bPLWmxXMs2}8|H6~W0`@_S--?A)g z=7w7V@W^T$0A4Z-Q&d$|kH_Oj6h(3S`}?9{7=|QCS}+)F;t%b>9RQZ*=H@ER)-Nn9 zd=7;|MM;vhv9Yl&00}g{g0{pBAWhSBHj~K+hG7_rqUaPwaYI8xc@yuq3kMpzJKZc| zety0Zi9|{r9UUwhzgB&A!4C7;2_OdGrukk2unnMq#(qDwtALB?M57b;09?BYu$5L? cX$1iO07Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk* z1SAEjUFRbJ00Kx!L_t(I%bk>6NK;`L$N%Sj_u-jt=WKHuK_fq?DY)ZDlc8kNh1yLQ zLQ$C1O+{1`QQ*xY$csKMqClyOE)u$^guv=TF(fi`>a7r_wmw`oX*Kul&UW4|qEd_L z_P_o=Ki>cIKF>pur|z|sl)A0FW@I560|1f_$J7^Fn^Lr?EWW`vi-{qRICzt=3PNB*km3noghq0000~}U&Ktysm`%asKR@pAbU4{w zDXpD8<&gL!mIsfGj;+u+9dzm3>^-^(Mmu#Af__#Xcv8eLMP-t~F@@8cv^*y%pZwf! zoB6s+<@UMmecKO?x=m3Ume#h zda|~?hNp=4gJL=V2bJ<;=?C7Z3otnyc*E%T=PRd{}oeV2}1nVh?S%z-n3Q7~Pt;-7lxV$XwRZaWwQ1RR?F z@jCEqnliDo(a9j|zzW6?!v`$PH44$rj JF6*2Ung9gXG|~V7 diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png old mode 100755 new mode 100644 index 819b5803925d8254c7ced6199719aeac3ac1735d..7b49878d92775719aa30e72c873239bf2d09b4f2 GIT binary patch literal 621 zcmV-z0+RiSP)Xh3pEJsUT8l)4{(u&)T8jt~Zj5Mo|CZJl zTD5Xl3ztD9+^vg5ulcdMl>{LS2u5T4Y zd>|V%pU+1ka*KUQL4=x|l z=`_V+aTtk2?kT0pKn}RM!Gf%i8BE#X(U0Z4j zs0;>!sbyJCDwR5k$K&;QJYH`$n_omk3WdVyGM33?UiW&vaktwY0!Lo_4G|fK!{NJ1 zspFM+5KyLR8o6BVL!;4nthGMSTECmkW^;haWHQ%UA8V}-N~O}1d_LbZP168OF91QM z)SWf+B>QMFo)0!4Y}tEP5O@eY zk4B>}`~ChzM5NtrJE2gh%;NC5zfXYcu~@9$>2%!DXf#_r{T#=cwpy+4KxNnB+w9xl zY}@{vOeR}rB^UP@-tP*q?Kcbo*DlC^0;an{`10k;*FV)S2$WhV;bQNf00000NkvXX Hu0mjfD#RIZ literal 414 zcmV;P0b%}$P)nzgRViK#MR6Xm{H>>-zCC&K?Sa0cpp7se`@4OY zUS0e%od65v=g)`%wm-m47*4X#_%H3 zfe0B4)s}rvMt|UzyG3+eV}Dci_aH0BDr!fuDUo-?rE54Ff*`x}pMTlmmR*+1dG6 zmSsgz6t%Ur^>1J&Uw!~t%1eMLzu*7L2zA@>gxIj=qMOK6vep4sF@4~gJ*4RE$()^gMbql^>{p?<>lp=PN$m& zjClj>V$RPE4h}v|BogV`+S+@-m%#D*`uh8lB*}e!eM`WZyaBS5mm7`7--5wl(&cgm zfU6mM*WGS+aARX5QBqPe!@K`O(RE>Xc=&lN7JFM&RrM!Oow0Ycy1M$VD2nN!p`jI^ zx7g)}%FD~W+uPeIr_=cY7~H{g)#Y*pLZQ%`va+&20BbP;E{~3mu7|_nl*MB40-x{T zIc&9B??fUIX=G&NIdHL9+0%!!0~(lT(h&YFBcaVqrk7gCplzGbvoVj%F4>?si~<= z;Ky9cPc=6;Kayox?da%u40HjX<+#rF^z`^;Syt?J`$NED$}e zmvW`g)ZE1 zSoDRQ{=K5nXgU&!JOW;8`7-Zx2Y@5w_Tgzs0t7%Q();$cuYG-_`WKPT0n_w`;0FKz N002ovPDHLkV1iTs%IE+9 literal 366 zcmV-!0g?WRP)ufNTMx3;^1$1EjKmcsW#Pd7z~%r<3~FAYMc$ z>9VmfF~mD7rJcL`4wOo7Ga_ZCEkNu|LN?e6#6HM*!Dm2nBS3%w04@VOyzBGzhyVZp M07*qoM6N<$f<1kTa{vGU diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml index 6188e8721a..e6012b5aef 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml @@ -211,16 +211,16 @@ with BigBlueButton; if not, see . } else if(toolType == DrawObject.RECTANGLE) { CursorManager.setCursor(rectangle_icon); } else if(toolType == DrawObject.TRIANGLE) { - CursorManager.setCursor(triangle_icon, 2, -7, 0); + CursorManager.setCursor(triangle_icon); } else if(toolType == DrawObject.PENCIL) { - CursorManager.setCursor(pencil_icon, 2, 0, -16); + CursorManager.setCursor(pencil_icon, 2, -1, -21); } else if(toolType == DrawObject.LINE) { - CursorManager.setCursor(line_icon, 2, 0, -14); + CursorManager.setCursor(line_icon); } else if(toolType == DrawObject.HIGHLIGHTER) { CursorManager.setCursor(highlighter_icon); } else if(toolType == DrawObject.ERASER) { CursorManager.setCursor(eraser_icon); - } else if(toolType == TextObject.TEXT_TOOL) { + } else if(toolType == DrawObject.TEXT) { CursorManager.setCursor(text_icon); // } else if(toolType == SelectObject.SELECT_TOOL) { // CursorManager.setCursor(select_icon);