- change icons for voice, video and deskshare

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;
 

bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ToolbarButtonManager.as

@@ -68,10 +68,11 @@ package org.bigbluebutton.modules.deskshare.managers
 
 		public function enableToolbarButton():void {
 			button.enabled = true;
+			button.stopDeskshare();
 		}
 
 		public function disableToolbarButton():void {
-			button.enabled = false;
+			button.enabled = false;			
 		}
 	}
 }

bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml

@@ -40,11 +40,15 @@
 			[Bindable] public var deskShareIcon:Class = images.deskShareIcon;
 
 			private function startDeskShare():void {
-				LogUtil.debug("desk share button clicked");
+				deskShareIcon = images.deskshareClose;
 				this.enabled = false;
 				dispatchEvent(new ShareEvent(ShareEvent.START_SHARING));
 			}
 			
+			public function stopDeskshare():void {
+				deskShareIcon = images.deskShareIcon;
+			}
+			
 			public function getAlignment():String{
 				return MainToolbar.ALIGN_LEFT;
 			}

bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/assets/Images.as

@@ -24,6 +24,9 @@ package org.bigbluebutton.modules.phone.views.assets
 	{             
         [Embed(source="images/headset.png")]
         public var headset_icon:Class;  
+
+		[Embed(source="images/headset_close.png")]
+		public var headsetClose:Class;  
 
 	}
 }

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);

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{