change shortcutkeys property name in config.xml

markoscalderon · markoscalderon · commit d6a368f32eb3 · 2013-03-07T15:20:27.000-05:00
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
@@ -7,7 +7,7 @@
     <application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter" />
     <language userSelectionEnabled="true" />
     <skinning enabled="true" url="http://HOST/client/branding/css/BBBDefault.css.swf" />
-    <shortcutKeys userSelectionEnabled="true" />
+    <shortcutKeys showButton="true" />
     <layout showLogButton="false" showVideoLayout="false" showResetLayout="true" defaultLayout="Default"
             showToolbar="true" showFooter="true" showHelpButton="true" showLogoutWindow="true"/>
             
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as b/bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
@@ -67,7 +67,7 @@ package org.bigbluebutton.core.model
 		
 		public function get shortcutKeys():Object {
 			var a:Object = new Object();
-			a.userSelectionEnabled = ((config.shortcutKeys.@userSelectionEnabled).toUpperCase() == "TRUE") ? true : false;
+			a.showButton = ((config.shortcutKeys.@showButton).toUpperCase() == "TRUE") ? true : false;
 			return a
 		}
 			
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/vo/Config.as b/bigbluebutton-client/src/org/bigbluebutton/core/vo/Config.as
@@ -27,7 +27,7 @@ package org.bigbluebutton.core.vo {
 		private var _host:String;
 		private var _numModules:int;
 		private var _languageEnabled:Boolean;
-		private var _shortcutKeysEnabled:Boolean;
+		private var _shortcutKeysShowButton:Boolean;
 		private var _skinning:String = "";
 		private var _showDebug:Boolean = false;
 		
@@ -41,7 +41,7 @@ package org.bigbluebutton.core.vo {
 			_host = builder.host;
 			_numModules = builder.numModules;
 			_languageEnabled = builder.languageEnabled;
-			_shortcutKeysEnabled = builder.shortcutKeysEnabled;
+			_shortcutKeysShowButton = builder.shortcutKeysShowButton;
 			_skinning = builder.skinning;
 			_showDebug = builder.showDebug;
 		}
@@ -82,8 +82,8 @@ package org.bigbluebutton.core.vo {
 			return _languageEnabled;
 		}
 		
-		public function get shortcutKeysEnabled():Boolean {
-			return _shortcutKeysEnabled;
+		public function get shortcutKeysShowButton():Boolean {
+			return _shortcutKeysShowButton;
 		}
 		
 		public function get skinning():String {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/vo/ConfigBuilder.as b/bigbluebutton-client/src/org/bigbluebutton/core/vo/ConfigBuilder.as
@@ -27,7 +27,7 @@ package org.bigbluebutton.core.vo {
 		internal var host:String;
 		internal var numModules:int;
 		internal var languageEnabled:Boolean;
-		internal var shortcutKeysEnabled:Boolean;
+		internal var shortcutKeysShowButton:Boolean;
 		internal var skinning:String = "";
 		internal var showDebug:Boolean = false;
 		
@@ -71,8 +71,8 @@ package org.bigbluebutton.core.vo {
 			return this;
 		}
 		
-		public function withShortcutKeysEnabled(shortcutKeysEnabled:Boolean):ConfigBuilder {
-			this.shortcutKeysEnabled = shortcutKeysEnabled;
+		public function withShortcutKeysShowButton(shortcutKeysShowButton:Boolean):ConfigBuilder {
+			this.shortcutKeysShowButton = shortcutKeysShowButton;
 			return this;
 		}
 		
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as
@@ -52,7 +52,7 @@ package org.bigbluebutton.main.model
 		public var host:String;
 		public var numModules:int;
 		public var languageEnabled:Boolean;
-		public var shortcutKeysEnabled:Boolean;
+		public var shortcutKeysShowButton:Boolean;
 		public var skinning:String = "";
 		public var showDebug:Boolean = false;
 		
@@ -102,8 +102,8 @@ package org.bigbluebutton.main.model
 			if (xml.language.@userSelectionEnabled == "true") languageEnabled = true;
 			else languageEnabled = false;
 			
-			if (xml.shortcutKeys.@userSelectionEnabled == "true") shortcutKeysEnabled = true;
-			else shortcutKeysEnabled = false;
+			if (xml.shortcutKeys.@showButton == "true") shortcutKeysShowButton = true;
+			else shortcutKeysShowButton = false;
 			
 			if (xml.skinning.@enabled == "true") skinning = xml.skinning.@url;
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
@@ -140,7 +140,7 @@ package org.bigbluebutton.main.model.modules
 						.withHelpUrl(c.helpURL)
 						.withHost(c.host)
 						.withLanguageEnabled(c.languageEnabled)
-						.withShortcutKeysEnabled(c.shortcutKeysEnabled)
+						.withShortcutKeysShowButton(c.shortcutKeysShowButton)
 						.withNumModule(c.numModules)
 						.withPortTestApplication(c.portTestApplication)
 						.withPortTestHost(c.portTestHost)
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -192,7 +192,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 						
 			private function gotConfigParameters(e:ConfigEvent):void{
 				langSelector.visible = e.config.languageEnabled;
-				shortcutKeysBtn.includeInLayout = shortcutKeysBtn.visible = e.config.shortcutKeysEnabled; 
+				shortcutKeysBtn.includeInLayout = shortcutKeysBtn.visible = e.config.shortcutKeysShowButton; 
 				DEFAULT_HELP_URL = e.config.helpURL;
 			}
 			

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ package org.bigbluebutton.core.model`
`67`	`67`
`68`	`68`	`public function get shortcutKeys():Object {`
`69`	`69`	`var a:Object = new Object();`
`70`		`- a.userSelectionEnabled = ((config.shortcutKeys.@userSelectionEnabled).toUpperCase() == "TRUE") ? true : false;`
	`70`	`+ a.showButton = ((config.shortcutKeys.@showButton).toUpperCase() == "TRUE") ? true : false;`
`71`	`71`	`return a`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.`
`192`	`192`
`193`	`193`	`private function gotConfigParameters(e:ConfigEvent):void{`
`194`	`194`	`langSelector.visible = e.config.languageEnabled;`
`195`		`- shortcutKeysBtn.includeInLayout = shortcutKeysBtn.visible = e.config.shortcutKeysEnabled;`
	`195`	`+ shortcutKeysBtn.includeInLayout = shortcutKeysBtn.visible = e.config.shortcutKeysShowButton;`
`196`	`196`	`DEFAULT_HELP_URL = e.config.helpURL;`
`197`	`197`	`}`
`198`	`198`