From b4607f8f38a432c56b794fa167275240be8d9f5c Mon Sep 17 00:00:00 2001 From: Felipe Cecagno Date: Mon, 24 Mar 2014 17:37:47 -0300 Subject: [PATCH] better icons in the video windows --- .../branding/default/style/css/BBBDefault.css | 27 ++---- .../css/assets/images/audio_20_white.png | Bin 0 -> 602 bytes .../css/assets/images/audio_20_white.xcf | Bin 0 -> 2758 bytes .../assets/images/audio_muted_20_white.png | Bin 0 -> 697 bytes .../assets/images/icons8_high_volume20.png | Bin 444 -> 0 bytes .../css/assets/images/icons8_low_volume20.png | Bin 371 -> 0 bytes .../style/css/assets/images/icons8_mute20.png | Bin 375 -> 0 bytes .../src/org/bigbluebutton/common/Images.as | 6 ++ .../common/assets/images/moderator_white.png | Bin 0 -> 309 bytes .../common/assets/images/presenter_white.png | Bin 0 -> 377 bytes .../videoconf/maps/VideoEventMapDelegate.as | 3 +- .../videoconf/views/UserGraphicHolder.mxml | 80 ++++++------------ 12 files changed, 42 insertions(+), 74 deletions(-) create mode 100644 bigbluebutton-client/branding/default/style/css/assets/images/audio_20_white.png create mode 100644 bigbluebutton-client/branding/default/style/css/assets/images/audio_20_white.xcf create mode 100644 bigbluebutton-client/branding/default/style/css/assets/images/audio_muted_20_white.png delete mode 100644 bigbluebutton-client/branding/default/style/css/assets/images/icons8_high_volume20.png delete mode 100644 bigbluebutton-client/branding/default/style/css/assets/images/icons8_low_volume20.png delete mode 100644 bigbluebutton-client/branding/default/style/css/assets/images/icons8_mute20.png create mode 100644 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/moderator_white.png create mode 100644 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter_white.png diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css index 5663942a58..33b75b4016 100755 --- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css +++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css @@ -687,10 +687,10 @@ https://www.iconfinder.com/icons/172512/mute_icon#size=128 */ .muteOverlayBtn { - upSkin: Embed('assets/images/icons8_mute20.png'); - overSkin: Embed('assets/images/icons8_mute20.png'); - downSkin: Embed('assets/images/icons8_mute20.png'); - disabledSkin: Embed('assets/images/icons8_mute20.png'); + upSkin: Embed('assets/images/audio_20_white.png'); + overSkin: Embed('assets/images/audio_20_white.png'); + downSkin: Embed('assets/images/audio_20_white.png'); + disabledSkin: Embed('assets/images/audio_20_white.png'); } /* @@ -698,21 +698,10 @@ https://www.iconfinder.com/icons/172499/low_volume_icon#size=128 */ .unmuteOverlayBtn { - upSkin: Embed('assets/images/icons8_low_volume20.png'); - overSkin: Embed('assets/images/icons8_low_volume20.png'); - downSkin: Embed('assets/images/icons8_low_volume20.png'); - disabledSkin: Embed('assets/images/icons8_low_volume20.png'); -} - -/* -https://www.iconfinder.com/icons/172479/high_volume_icon#size=128 -*/ -.talkingOverlayBtn -{ - upSkin: Embed('assets/images/icons8_high_volume20.png'); - overSkin: Embed('assets/images/icons8_high_volume20.png'); - downSkin: Embed('assets/images/icons8_high_volume20.png'); - disabledSkin: Embed('assets/images/icons8_high_volume20.png'); + upSkin: Embed('assets/images/audio_muted_20_white.png'); + overSkin: Embed('assets/images/audio_muted_20_white.png'); + downSkin: Embed('assets/images/audio_muted_20_white.png'); + disabledSkin: Embed('assets/images/audio_muted_20_white.png'); } .resizeHndlr diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/audio_20_white.png b/bigbluebutton-client/branding/default/style/css/assets/images/audio_20_white.png new file mode 100644 index 0000000000000000000000000000000000000000..b337c3ea5863f8b40caa1df013ec034f9a15d34a GIT binary patch literal 602 zcmV-g0;T&XBB0q03X zK~zY`&6iKA)Ibo%e_zPvZN#mRxDxdUlS6m`FW}a5cm$82OVJx>W-SUL>cS54P!LzH z#B$RaYuZeAXXZVg1w)uhQ(yi0x~d{ph?#Xj4|K_^2?&y=T3cEP)+Jyp=&GDh1>oku zktJX++nfV!26TuG{yKh#e`4rhpck8{m2qqUuHf4KtMy>~VZ#7$cCf}_8IcZu!|U==~`k+_XT-xOx+EU#mhzD7fzfpg$(1@In;o25IJA;?GI zWpwsOe7=(OVNIGP?K)R=x+Q&)^c=V&>4l_kYt!t>72J^6HSz_|uL1XCt2{HaN5CiG ziKOqDX#D^R={z3Xfs@DL!c3kA(3sBS;8H#SL$2OOECQ47URS^R9J}mgR^mSAye@IQ oolCcvu`65X|G!U|%l>Hl1KhPHT+4fd@Bjb+07*qoM6N<$g3-Fi0pV0UA%w&WtoQ+lKf?n*fR{eBxi$9mJL_3r+U*;(FP-Sy`R1E*&di<}?@6(| zwr*`^3s#}LnkTe3B$$r_ih{=}Ahxu3@G}E^5(oha;I!myHwAkW{a6uU6Xmr`F`p>b z$~j1cd4=Zdjjh$ZRj;m=bC-d#v* zChWRdU(aOAm7=xiuLW@{NR(P)qf%~IOe# z25h8>Cut$lA}sY+<9s+er@V7FKaJBkOx9=iT(<=JB<9?@>MCygBI~2OsZG~Sl1fJl z-z0zPu$dccOYS1HzjJ5rF5kI~yj-~Y*~RbA&z+&r@{W7+-R(E$h%Vp$)qT6Pf-ncM z<(uoD&+Wd&JUm~y5?y$};UDT>rWAT_ft2N)A9kG!o#gtzQa<}g_jahA$(MFZ2Q87Vr5vOrsP)sO540k6AL?|qVfDjM|Gzy7PKn2DD zg*0&r@cT9iRZJmZ2N5w1r)dQ0X`1ki`n?nxjiYjOO|HhP^6C+}o0#04ft|*&;|VNe zyx#vS&wtBI*{a=2nJ8W-;Ev)bw(6YNP=*P!P6$HSVGEu9HEpNqI6O&gjDc<9Iv<*L zv*|#MfTo;g6Ka@_SOqh>OzX1YE>r0k9xxlBV>mb|{D_ZDL^f%R9(4$%9Ox7D*y{-k zn;7kz*a~@%NjhNBn+E6JGn&Lp!AP}nnE}mKoVJN_e86hIwT!awdCB;XJ<(tLQD<#` zXL5_!>odE@XHC9$?;U&Z-OEKdFl*5lw;&0wqe_^!F zE%JO&ZDjqwu8mwrIc898^J^BSjUPR$-j-1(40lj7{^IeD Ic7Fg*0fAyULI3~& literal 0 HcmV?d00001 diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/audio_muted_20_white.png b/bigbluebutton-client/branding/default/style/css/assets/images/audio_muted_20_white.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf58b88e71bee8b91f37fd380f2ce127dee668c GIT binary patch literal 697 zcmV;q0!ICbP)}5QFdzzof>`G-v$BhYg@P!GVx_P_tRjMK zvRn8Fg4)FAu{j%0_Rh}EO$>41HZyb2cji0ad8{zQQq=+|fueKN0JVrTxwd3Ru%ZJ- zWG~AJ$p9SpT!{huwUTmRlmMNW(GsZpUev=#**c}FRSbNT0G-%Yo$}uHx=ysS#{Ee}BH+Djr0#(&H;3%*TEZY4~zHwSq&I0qM@Q1(>a5uA(ZHYK^gPx%3r^R;-_y$}BegPkV z1rb>rz}_a}5X-T|dIP)zo&hg`lfWZjUR4(c{<}@YA(mr_S8p2VE2DbD99agI`U**` zR)koN4XE>n(LHCi`n!m%TD%YC(Co!kyC$(!$RnN$a0NII9I=``R@Db0@-*>U-+=0F zKc2V?yKak-p4>K|s+-5PqkIBPQt{rwAkcUr@Biqt(_t?$5|=6GWe>;OHgr+O_HCg5 f|2|>%`lIa+6X8i!GU6Lg00000NkvXXu0mjf&N@0; literal 0 HcmV?d00001 diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/icons8_high_volume20.png b/bigbluebutton-client/branding/default/style/css/assets/images/icons8_high_volume20.png deleted file mode 100644 index 431d218fb863cc17c6c2dc5422dd1a3c1a76f71c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0YmzoKXr%s1@gBDV0i9fiJ diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/icons8_low_volume20.png b/bigbluebutton-client/branding/default/style/css/assets/images/icons8_low_volume20.png deleted file mode 100644 index b926abab29ee3d4c596c511735e126057919df8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR+M_;=vbiaamJ*fU78H7xNcBTff-qHa6GTqiQo=X{m5U{uam) zNZG#o!(nf;*=Ntx%$z$j_U5xmucpYT*n0h%@Fm1`%iP!l5)q8&4}7w}@9e{xBXIs< z&I7|Wq6VzitT(2Xu_O&rOA+0+2YD-I9qviz$Mv1gj0*~yNt9J5OADI8P^{v3} zeR?Vd%r%}try}MYPQF>kUU%dAF53-DCO1xsYp8x;o%){1)-yOknz^mjDzCBAcz#2} zs*Mvxa?Fov$5d@t|NqOnPnIeRiXUt?HE@z|Fi!|!4q5g)J)8a08tKQY4#%(n{m$U& L>gTe~DWM4fn`@1B diff --git a/bigbluebutton-client/branding/default/style/css/assets/images/icons8_mute20.png b/bigbluebutton-client/branding/default/style/css/assets/images/icons8_mute20.png deleted file mode 100644 index d549aada82229a4ac04e0c4e4b29de569c39cfdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR z=)xivtCMOzopr0B)d?V*mgE diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as index 7174c82160..e4df05cbcf 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as +++ b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as @@ -303,5 +303,11 @@ package org.bigbluebutton.common [Embed(source="assets/images/grid_icon.png")] public var grid_icon:Class; + + [Embed(source="assets/images/moderator_white.png")] + public var moderator_white:Class; + + [Embed(source="assets/images/presenter_white.png")] + public var presenter_white:Class; } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/moderator_white.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/moderator_white.png new file mode 100644 index 0000000000000000000000000000000000000000..002f1b8e858db0e3d6977ad4f730986e16560ec2 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqvxtza>h+I{76FA0dAc};Se!mO*)faBQNZ1TO(qLQW39yZ5?eB8Za-TkR6uPk)* zUB$JfAv}TmO@sLYS*@!t_Eelzx#Tuo{;F?4!qRPeUoQ&JI-qcZzp;Ia*v`4}TUEKb!+N(I)c7)&m{LV?-?bWsaH&;Ghao|eHv!i?0 zY~hY~F#pJ2FMey&dgBL{+dqoQKG@8$X?Ol(d9lxl$$Y6Y8-TuH@O1TaS?83{1OPZr Bc!2-_ literal 0 HcmV?d00001 diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter_white.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter_white.png new file mode 100644 index 0000000000000000000000000000000000000000..273b2f17075bd8cd474e201de74004239f0978f8 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqvxtzaxr)c-R}2h{Y@RNTAr_~nPBQd%b`)sY-;%J9 z@oiIY)RNBDAIkR{xVDLjnKdo>7=L3aN7GV9>y097=bTboI^mefw`pdcpEqpSdEn!o z7kgWumZg`s@7$d$;(E|%^IqOL9#T55Gj%v}_#63tmMLf6>1wb}FfWg~B%z@8g7LVi z$Q@=A;a2kpi<*2Jmp{0?V}jC-sV1kVUi|a8Z~1{#5AOuAJw3mpI&bcK8`yFFfA9pQ z8_espZ*X1cd!*vXc}BZA`{5g=XhFOGTRl2;-!P?f7kP$nl@qjJn%7vKaP^y?S>s#2 z4g5K5KjRN1%CfQ_XkOy}fLVgc_O|p+miY&=w+P=qz!7o&r<=-NmzOFDlSAI~t2f%& UH+@lf4-6y*Pgg&ebxsLQ00@SbDgXcg literal 0 HcmV?d00001 diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as index a2ea8e2cc9..cbfc75c306 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as @@ -228,7 +228,8 @@ package org.bigbluebutton.modules.videoconf.maps } private function openAvatarWindowFor(userID:String):void { - + if (! UsersUtil.hasUser(userID)) return; + closeWindow(userID); var userAvatar:UserGraphicHolder = new UserGraphicHolder(); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml index cdfbd6e7f9..5bd58e9ae4 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml @@ -57,17 +57,10 @@ with BigBlueButton; if not, see . private var _dispatcher:Dispatcher = new Dispatcher(); private var _images:Images = new Images(); - [Bindable] public var glowColor:String = ""; - [Bindable] public var glowBlurSize:Number = 0; - - [Bindable] - private var _videoOptions:VideoConfOptions = new VideoConfOptions(); + private const TITLE_BACKGROUND_TALKING:uint = 0x20c600; + private const TITLE_BACKGROUND_NOT_TALKING:uint = 0x42444c; protected function onCreationComplete():void { -// loadAvatar("https://avatars3.githubusercontent.com/u/5931345?s=140"); - - this.glowColor = _videoOptions.glowColor; - this.glowBlurSize = _videoOptions.glowBlurSize; } public function loadAvatar(user:BBBUser, options:VideoConfOptions):void { @@ -174,37 +167,25 @@ with BigBlueButton; if not, see . private function updateButtons():void { if (user != null) { - if (_rolledOverMuteBtn) { - if (user.voiceMuted) { - muteBtn.styleName = "unmuteOverlayBtn"; - } else { - muteBtn.styleName = "muteOverlayBtn"; - } + if (_rolledOverMuteBtn == user.voiceMuted) { + muteBtn.styleName = "muteOverlayBtn"; } else { - if (user.voiceMuted) { - muteBtn.styleName = "muteOverlayBtn"; - } else { - if (user.talking) { - muteBtn.styleName = "talkingOverlayBtn"; - } else { - muteBtn.styleName = "unmuteOverlayBtn"; - } - } + muteBtn.styleName = "unmuteOverlayBtn"; } if (_rolledOverCanvas || _rolledOverMuteBtn) { - muteBtn.visible = user.voiceJoined; + muteBtnWrapper.visible = user.voiceJoined; } else { - muteBtn.visible = user.voiceJoined && (user.talking || user.voiceMuted); + muteBtnWrapper.visible = user.voiceJoined && user.voiceMuted; } var userIconVisibility:Boolean; if (user.presenter) { - userIcon.source = _images.presenter_new; + userIcon.source = _images.presenter_white; userIconVisibility = true; } else { if (user.role == BBBUser.MODERATOR) { - userIcon.source = _images.moderator; + userIcon.source = _images.moderator_white; userIconVisibility = true; } else { userIconVisibility = false; @@ -217,15 +198,11 @@ with BigBlueButton; if not, see . private function handleUserTalkingEvent(event:CoreEvent):void { if (user && event.message.userID == user.userID) { updateButtons(); -/* if (event.message.talking) { - notTalkingEffect.end(); - talkingEffect.play([muteBtn]); + titleBox.setStyle("backgroundColor", TITLE_BACKGROUND_TALKING); } else { - talkingEffect.end(); - notTalkingEffect.play([muteBtn]); + titleBox.setStyle("backgroundColor", TITLE_BACKGROUND_NOT_TALKING); } -*/ } } @@ -238,19 +215,13 @@ with BigBlueButton; if not, see . ]]> - - - - - . - - - + + + +