Merge pull request #215 from bigbluebutton/deskshare-fullscreen-config

Added autoFullScreen in config xml

bigbluebutton-client/resources/config.xml.template

@@ -37,6 +37,7 @@
 			uri="rtmp://HOST/deskShare"
 			showButton="true"
 			autoStart="false"
+			autoFullScreen="false"
 			baseTabIndex="201"
 		/>
 		

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

@@ -91,7 +91,9 @@ package org.bigbluebutton.modules.deskshare.managers
 			LogUtil.debug("DeskshareManager::handleStartSharingEvent");
 			//toolbarButtonManager.disableToolbarButton();
 			toolbarButtonManager.startedSharing();
-			publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom(), autoStart);
+			var option:DeskshareOptions = new DeskshareOptions();
+			option.parseOptions();
+			publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom(), autoStart, option.autoFullScreen);
 			sharing = true;
 		}
 		

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

@@ -53,19 +53,19 @@ package org.bigbluebutton.modules.deskshare.managers
 			if (shareWindow != null) shareWindow.stopSharing();
 		}
 																			
-		public function startSharing(uri:String, room:String, autoStart:Boolean):void {
+		public function startSharing(uri:String, room:String, autoStart:Boolean, autoFullScreen:Boolean):void {
-			LogUtil.debug("DS:PublishWindowManager::opening desk share window, autostart=" + autoStart );
+			LogUtil.debug("DS:PublishWindowManager::opening desk share window, autostart=" + autoStart + " autoFullScreen=" + autoFullScreen);
 			shareWindow = new DesktopPublishWindow();
-			shareWindow.initWindow(service.getConnection(), uri, room, autoStart);
+			shareWindow.initWindow(service.getConnection(), uri, room, autoStart, autoFullScreen);
 			shareWindow.visible = true;
 			openWindow(shareWindow);
-			if (autoStart) {
+			if (autoStart || autoFullScreen) {
 				/*
 				* Need to have a timer to trigger auto-publishing of deskshare.
 				*/
 				shareWindow.btnFSPublish.enabled = false;
 				shareWindow.btnRegionPublish.enabled = false;
-				autoPublishTimer = new Timer(3000, 1);
+				autoPublishTimer = new Timer(2000, 1);
 				autoPublishTimer.addEventListener(TimerEvent.TIMER, autopublishTimerHandler);
 				autoPublishTimer.start();
 			}			

bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml

@@ -47,11 +47,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	</EventHandlers>
 		
 	<EventHandlers type="{ShareEvent.START_SHARING}">
-		<MethodInvoker generator="{DeskshareManager}" method="handleStartSharingEvent" arguments="false"/>
+		<MethodInvoker generator="{DeskshareManager}" method="handleStartSharingEvent" arguments="{false}"/>
 	</EventHandlers>
 	
 	<EventHandlers type="{BBBEvent.START_DESKSHARE}">
-		<MethodInvoker generator="{DeskshareManager}" method="handleStartSharingEvent" arguments="true"/>
+		<MethodInvoker generator="{DeskshareManager}" method="handleStartSharingEvent" arguments="{true}"/>
 	</EventHandlers>
 	
 	<EventHandlers type="{MadePresenterEvent.SWITCH_TO_PRESENTER_MODE}">

bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/model/DeskshareOptions.as

@@ -24,6 +24,7 @@ package org.bigbluebutton.modules.deskshare.model
 	{
 		[Bindable] public var showButton:Boolean = true;
 		[Bindable] public var autoStart:Boolean = false;
+		[Bindable] public var autoFullScreen:Boolean = false;
 		[Bindable] public var baseTabIndex:int;
 		
 		public function parseOptions():void {
@@ -32,6 +33,9 @@ package org.bigbluebutton.modules.deskshare.model
 				if (vxml.@autoStart != undefined) {
 					autoStart = (vxml.@autoStart.toString().toUpperCase() == "TRUE") ? true : false;
 				}
+				if (vxml.@autoFullScreen != undefined){
+					autoFullScreen = (vxml.@autoFullScreen.toString().toUpperCase() == "TRUE") ? true : false;
+				}
 				if (vxml.@baseTabIndex != undefined) {
 					baseTabIndex = vxml.@baseTabIndex;
 				}

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

@@ -23,10 +23,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <dspub:MDIWindow 
 	xmlns:mx="http://www.adobe.com/2006/mxml" 
 	implements="org.bigbluebutton.common.IBbbModuleWindow"
-	xmlns:mate="http://mate.asfusion.com/"
+	xmlns:mate="http://mate.asfusion.com/"
 	xmlns:dspub="flexlib.mdi.containers.*"
 	backgroundColor="#C0C0C0"
-	initialize="init()"
+	initialize="init()"
 	creationComplete="onCreationComplete()"
 	
 	verticalScrollPolicy="off" horizontalScrollPolicy="off"
@@ -153,11 +153,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			 */			
 			public function resetWidthAndHeight():void{/* do nothing */}
 			
-			public function initWindow(connection:NetConnection, uri:String, room:String, autoStart:Boolean):void {
+			public function initWindow(connection:NetConnection, uri:String, room:String, autoStart:Boolean, autoFullScreen:Boolean):void {
 				this.connection = connection;
 				this.uri = uri;
 				this.room = room;				
-				this.autoStart = autoStart;		
+				this.autoStart = autoStart;
+				/*if(autoFullScreen)
+					shareScreen(true);*/		
 			}
 			
 			public function shareScreen(fullScreen:Boolean):void {