Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as
===================================================================
diff -u -r0c2b4dfc986b05777044767beaa31b6f56cf515a -red050212fcf3c093fb885cc2442721fb26797b1e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision 0c2b4dfc986b05777044767beaa31b6f56cf515a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision ed050212fcf3c093fb885cc2442721fb26797b1e)
@@ -29,36 +29,28 @@
 	 */
 	public function click(evt):Void{
 		Debugger.log('click evt.target.label:'+evt.target.label,Debugger.GEN,'click','ToolbarController');
-		switch (evt.target.label) {
-            case 'New' :
-                _app.getCanvas().clearCanvas(false);
-                break;
-            case 'Open' :
-                //Call main open method on toolbar class
-				_app.getCanvas().openDesignBySelection();
-                break;
-            case 'Save' :
-                _app.getCanvas().saveDesign();
-                break;
-			case 'Copy' :
-                _app.copy();
-                break;
-			case 'Paste' :
-                _app.copy();
-                break;
-			case 'Transition' :
-                _app.getCanvas().toggleTransitionTool();
-                break;
-			case 'Optional' :
-                
-                break;
-			case 'Preview' :
-                
-                break;
-            default :
-                //TODO: DI-Deal with default case where button type is not caught
-                trace('Unknown button click');
-        }
+		var tgt:String = new String(evt.target);
+		
+		if(tgt.indexOf("new") != -1){
+			_app.getCanvas().clearCanvas(false);
+		
+		}else if(tgt.indexOf("open") != -1){
+			_app.getCanvas().openDesignBySelection();
+		}else if(tgt.indexOf("save") != -1){
+			_app.getCanvas().saveDesign();
+		}else if(tgt.indexOf("copy") != -1){
+			_app.copy();
+		}else if(tgt.indexOf("paste") != -1){
+			_app.paste();
+		}else if(tgt.indexOf("trans") != -1){
+			_app.getCanvas().toggleTransitionTool();
+		}else if(tgt.indexOf("optional") != -1){
+			
+		}else if(tgt.indexOf("gate") != -1){
+			_app.getCanvas().startGateTool();
+		}else if(tgt.indexOf("preview") != -1){
+			
+		}
 	}
      
 }
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
===================================================================
diff -u -rc8104fbbdd0a27d9915defa7ad30e1f5400062b9 -red050212fcf3c093fb885cc2442721fb26797b1e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	(.../ToolbarView.as)	(revision c8104fbbdd0a27d9915defa7ad30e1f5400062b9)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	(.../ToolbarView.as)	(revision ed050212fcf3c093fb885cc2442721fb26797b1e)
@@ -60,6 +60,7 @@
 		_toolbar_mc.paste_btn.addEventListener("click",controller);
 		_toolbar_mc.trans_btn.addEventListener("click",controller);
 		_toolbar_mc.optional_btn.addEventListener("click",controller);
+		_toolbar_mc.gate_btn.addEventListener("click",controller);
 		_toolbar_mc.preview_btn.addEventListener("click",controller);