added showbutton to deskshare module

markoscalderon · markoscalderon · commit b2dd27d56ff4 · 2013-03-05T10:01:42.000-05:00
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
@@ -46,6 +46,7 @@
 		<module name="DeskShareModule" 
 			url="http://HOST/client/DeskShareModule.swf?v=4105" 
 			uri="rtmp://HOST/deskShare"
+			showButton="true"
 			autoStart="false"
 			baseTabIndex="101"
 		/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
@@ -67,13 +67,15 @@ package org.bigbluebutton.modules.deskshare.managers
 											
 		public function handleMadePresenterEvent(e:MadePresenterEvent):void {
 			LogUtil.debug("Got MadePresenterEvent ");
-			toolbarButtonManager.addToolbarButton();
 			sharing = false;
 			var option:DeskshareOptions = new DeskshareOptions();
 			option.parseOptions();
 			if (option.autoStart) {
 				handleStartSharingEvent(true);
 			}
+			if(option.showButton){
+				toolbarButtonManager.addToolbarButton();
+			}
 		}
 		
 		public function handleMadeViewerEvent(e:MadePresenterEvent):void{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/model/DeskshareOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/model/DeskshareOptions.as
@@ -22,6 +22,7 @@ package org.bigbluebutton.modules.deskshare.model
 	
 	public class DeskshareOptions
 	{
+		[Bindable] public var showButton:Boolean = true;
 		[Bindable] public var autoStart:Boolean = false;
 		[Bindable] public var baseTabIndex:int;
 		
@@ -37,6 +38,9 @@ package org.bigbluebutton.modules.deskshare.model
 				else{
 					baseTabIndex = 101;
 				}
+				if (vxml.@showButton != undefined){
+					showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false; 
+				}
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ package org.bigbluebutton.modules.deskshare.model`
`22`	`22`
`23`	`23`	`public class DeskshareOptions`
`24`	`24`	`{`
	`25`	`+ [Bindable] public var showButton:Boolean = true;`
`25`	`26`	`[Bindable] public var autoStart:Boolean = false;`
`26`	`27`	`[Bindable] public var baseTabIndex:int;`
`27`	`28`
`@@ -37,6 +38,9 @@ package org.bigbluebutton.modules.deskshare.model`
`37`	`38`	`else{`
`38`	`39`	`baseTabIndex = 101;`
`39`	`40`	`}`
	`41`	`+ if (vxml.@showButton != undefined){`
	`42`	`+ showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;`
	`43`	`+ }`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`	`}`