From f7aa80ba452feafbc77833fddb04705f7b1756e0 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Fri, 13 Apr 2012 21:36:59 +0000 Subject: [PATCH] - change icons for voice, video and deskshare --- .../src/org/bigbluebutton/common/Images.as | 6 ++++++ .../common/assets/images/deskshare_close.png | Bin 0 -> 1549 bytes .../common/assets/images/webcam_close.png | Bin 0 -> 1583 bytes .../deskshare/managers/ToolbarButtonManager.as | 3 ++- .../deskshare/view/components/ToolbarButton.mxml | 6 +++++- .../modules/phone/views/assets/Images.as | 3 +++ .../phone/views/assets/images/headset_close.png | Bin 0 -> 1471 bytes .../phone/views/components/ToolbarButton.mxml | 7 ++++++- .../modules/videoconf/views/ToolbarButton.mxml | 2 ++ 9 files changed, 24 insertions(+), 3 deletions(-) create mode 100755 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_close.png create mode 100755 bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_close.png create mode 100755 bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/assets/images/headset_close.png diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as index dbf18a0806..b91f36def7 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/common/Images.as +++ b/bigbluebutton-client/src/org/bigbluebutton/common/Images.as @@ -21,6 +21,12 @@ package org.bigbluebutton.common [Bindable] public class Images { + [Embed(source="assets/images/webcam_close.png")] + public var webcamClose:Class; + + [Embed(source="assets/images/deskshare_close.png")] + public var deskshareClose:Class; + [Embed(source="assets/images/fit-to-page.png")] public var fitToPage:Class; diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_close.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_close.png new file mode 100755 index 0000000000000000000000000000000000000000..2c68797e1e5ec4ecde6df2e3ffc0ad1cc4c91302 GIT binary patch literal 1549 zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3HFiZux8nQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?_nZLn2Bde0{8v^Ko2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1?ON>1>eNv%sdbu ztlrnx$}_LHBrz{J)zigR321^|W@d_&tBIwBtGTJOxr?)jp`ojxlcR~HlZBIkrKzKl zxw(ZIOs`9Ra%paAUI|QZ3PP_7PQ9R{kXrz>*(J3ovn(~mttdZN0qkX~Oe}73wls1! zGH^A-X&zK>3Kq9O^%~*Ss}FRHJ}6?5A{r(HOg$hbJlO&{@Pwb52Tbinz+~;(`n`mK zfvM5c#WAGf){@C*v#tb4w9TJ9=Z|mwhOnHYT#v4;<5F@GXAO_t8rRURcW1{7*$URZ z4BT&5vAzxx*W1ImRC{B@7FI_srGHma(u`)FJmcAS|Kx)pbG1Dx&sCmVzW-j=$z-*t z>%Vo4?3tKgetG-d2KM5Uj~Iwn`?OpLQgCLPGABW2O2jXt6YkUYh_ExC{=L|Eo?TVK zmQT*bPk;G}t;EVH`e@BeJ{4CZ2B&;RMhbNwqT`#xG z@A&xWWPEg(=Y+W2V+(Y0&AsYVmpoq?6TGk1`{$RR>~G7~M;h$je*DjD^NP!tkCeYJ z`ue7)^Y{0{(rgtC_D?pwe9Vtj6gyIGX}N7>S!~0$*KkG6*RG1x)|-E8|Fp8c(n&6< z(o$ei>CIg(ndd8V^oxqk_p=<5Yqz$%4SeFtd}{l4PBHP!wd>6vmlRKa_)xKL$=tOz z+1!3jUyEi2^&0C+{@kZu>}6%brn-9dk<+KIWOmJ(m6Vj+eDR~9%-&)J=b2AKmMSc{ zUMKR%vg3sCgzV@*9;pjQ=gQ{H`<$HHn~>Q#bFHr4yLX4y-d?w*D(k~v5q+;Ct<4!z zzDajX+H@z~)@Q%j0{uy+=O>pGITaRMxN|#g_eX!}zpwlE2)n+DoAjf;`rpMF@A4Vh Z7)~}TbJ?wVJ|9#-d%F6$taD0e0st@ePGkT8 literal 0 HcmV?d00001 diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_close.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_close.png new file mode 100755 index 0000000000000000000000000000000000000000..5265a7305e18196d51edcf9db18789c935bb9e9e GIT binary patch literal 1583 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 literal 0 HcmV?d00001 diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml index d645d9c63e..4e857ae043 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml @@ -60,8 +60,9 @@ phoneOptions.autoJoin = (vxml.@autoJoin.toString().toUpperCase() == "TRUE") ? true : false; phoneOptions.skipCheck = (vxml.@skipCheck.toString().toUpperCase() == "TRUE") ? true : false; } - + phoneIcon = images.headsetClose; if (phoneOptions.skipCheck || noMicrophone()) { + /* * If the user had no mic, let her join but she'll just be listening. * We should indicate a warning that the user is joining without mic @@ -74,6 +75,7 @@ dispatcher.dispatchEvent(new BBBEvent("SHOW_MIC_SETTINGS")); } } else { + phoneIcon = images.headset_icon; var leaveEvent:BBBEvent = new BBBEvent("LEAVE_VOICE_CONFERENCE_EVENT"); leaveEvent.payload["userRequested"] = true; dispatcher.dispatchEvent(leaveEvent); @@ -91,9 +93,12 @@ private function handleMicSettingsClosedEvent(event:BBBEvent):void { this.selected = false; + this.enabled = true; + phoneIcon = images.headset_icon; } private function handleBBBJoinConferenceEvent(event:BBBEvent):void { + phoneIcon = images.headsetClose; var joinEvent:BBBEvent = new BBBEvent("JOIN_VOICE_CONFERENCE_EVENT"); joinEvent.payload['useMicrophone'] = false; dispatcher.dispatchEvent(joinEvent); diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml index 770d52faf8..c51242da18 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml @@ -49,10 +49,12 @@ private function openPublishWindow():void{ dispatchEvent(new OpenPublishWindowEvent()); this.enabled = false; + camIcon = images.webcamClose; } public function show():void{ this.enabled = true; + camIcon = images.webcam; } public function getAlignment():String{