Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as =================================================================== diff -u -r731cf22641a368d8cc2aa4cf3f23322d3f211770 -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision 731cf22641a368d8cc2aa4cf3f23322d3f211770) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -496,11 +496,17 @@ * Handles KEY Releases for Application */ private function onKeyUp(){ - var c:String = Cursor.getCurrentCursor(); - if(c == C_TRANSITION){ - _controlKeyPressed = ""; - //Cursor.showCursor(C_DEFAULT); - _canvas.stopTransitionTool() + Debugger.log('Key released.',Debugger.GEN,'onKeyUp','Application'); + if(!Key.isDown(Key.CONTROL)) { + if(_controlKeyPressed == ApplicationParent.TRANSITION) + Debugger.log('Control Key released.',Debugger.GEN,'onKeyUp','Application'); + + var c:String = Cursor.getCurrentCursor(); + + if(c == ApplicationParent.C_TRANSITION){ + _controlKeyPressed = ""; + _canvas.stopTransitionTool() + } } } @@ -541,14 +547,9 @@ }else if(Key.isDown(Key.CONTROL)) { - //_canvas.toggleTransitionTool() var c:String = Cursor.getCurrentCursor(); - if(c != C_TRANSITION){ - _controlKeyPressed = "transition"; - //Cursor.showCursor(C_TRANSITION); - //_canvas.model.selectedItem = null; - //_canvas.model.resetTransitionTool(); - //_canvas.model.setActiveTool("TRANSITION") ; + if(c != ApplicationParent.C_TRANSITION){ + _controlKeyPressed = ApplicationParent.TRANSITION; _canvas.startTransitionTool() } Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 8631b0fa18d10b78cd3150b63cd7da4e6926d2b0) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -28,6 +28,7 @@ import org.lamsfoundation.lams.common.ui.* import org.lamsfoundation.lams.common.dict.* import org.lamsfoundation.lams.common.ws.Workspace +import org.lamsfoundation.lams.common.ApplicationParent import org.lamsfoundation.lams.common.* import mx.managers.* import mx.utils.* @@ -836,7 +837,7 @@ */ public function toggleGroupTool():Void{ var c:String = Cursor.getCurrentCursor(); - if(c==Application.C_GROUP){ + if(c==ApplicationParent.C_GROUP){ stopGroupTool(); }else{ startGroupTool(); @@ -845,7 +846,7 @@ public function toggleGateTool():Void{ var c:String = Cursor.getCurrentCursor(); - if(c==Application.C_GATE){ + if(c==ApplicationParent.C_GATE){ stopGateTool(); }else{ startGateTool(); @@ -854,23 +855,28 @@ public function toggleOptionalActivity():Void{ var c:String = Cursor.getCurrentCursor(); - if(c==Application.C_OPTIONAL){ + if(c==ApplicationParent.C_OPTIONAL){ stopOptionalActivity(); }else{ startOptionalActivity(); } } public function toggleTransitionTool():Void{ + Debugger.log('Switch on Transition Tool', Debugger.GEN,'toogleTransitionTool','Canvas'); var c:String = Cursor.getCurrentCursor(); - if(c==Application.C_TRANSITION){ - stopTransitionTool(); - }else{ - startTransitionTool(); + Debugger.log('Current Cursor: ' + c, Debugger.GEN, 'toogleTransitionTool', 'Canvas'); + + if(c==ApplicationParent.C_TRANSITION) { + stopTransitionTool(); + } else { + startTransitionTool(); } + } public function stopActiveTool(){ + Debugger.log('Stopping Active Tool: ' + canvasModel.activeTool, Debugger.GEN,'stopActiveTool','Canvas'); switch(canvasModel.activeTool){ case CanvasModel.GATE_TOOL : stopGateTool(); @@ -885,45 +891,46 @@ stopTransitionTool(); break; default : - Cursor.showCursor(Application.C_DEFAULT); + Debugger.log('No tool active. Setting Default.', Debugger.GEN,'stopActiveTool','Canvas'); + Cursor.showCursor(ApplicationParent.C_DEFAULT); canvasModel.activeTool = null; } } public function startGateTool(){ Debugger.log('Starting gate tool',Debugger.GEN,'startGateTool','Canvas'); - Cursor.showCursor(Application.C_GATE); + Cursor.showCursor(ApplicationParent.C_GATE); canvasModel.activeTool = CanvasModel.GATE_TOOL; } public function stopGateTool(){ Debugger.log('Stopping gate tool',Debugger.GEN,'stopGateTool','Canvas'); - Cursor.showCursor(Application.C_DEFAULT); + Cursor.showCursor(ApplicationParent.C_DEFAULT); canvasModel.activeTool = null; } public function startOptionalActivity(){ Debugger.log('Starting Optioanl Activity',Debugger.GEN,'startOptionalActivity','Canvas'); - Cursor.showCursor(Application.C_OPTIONAL); + Cursor.showCursor(ApplicationParent.C_OPTIONAL); canvasModel.activeTool = CanvasModel.OPTIONAL_TOOL; } public function stopOptionalActivity(){ Debugger.log('Stopping Optioanl Activity',Debugger.GEN,'stopOptionalActivity','Canvas'); - Cursor.showCursor(Application.C_DEFAULT); + Cursor.showCursor(ApplicationParent.C_DEFAULT); canvasModel.activeTool = null; } public function startGroupTool(){ Debugger.log('Starting group tool',Debugger.GEN,'startGateTool','Canvas'); - Cursor.showCursor(Application.C_GROUP); + Cursor.showCursor(ApplicationParent.C_GROUP); canvasModel.activeTool = CanvasModel.GROUP_TOOL; } public function stopGroupTool(){ Debugger.log('Stopping group tool',Debugger.GEN,'startGateTool','Canvas'); - Cursor.showCursor(Application.C_DEFAULT); + Cursor.showCursor(ApplicationParent.C_DEFAULT); canvasModel.activeTool = null; } @@ -934,8 +941,8 @@ * @return */ public function startTransitionTool():Void{ - //Debugger.log('Starting transition tool',Debugger.GEN,'startTransitionTool','Canvas'); - Cursor.showCursor(Application.C_TRANSITION); + Debugger.log('Starting transition tool',Debugger.GEN,'startTransitionTool','Canvas'); + Cursor.showCursor(ApplicationParent.C_TRANSITION); canvasModel.lockAllComplexActivities(); canvasModel.startTransitionTool(); @@ -947,8 +954,8 @@ * @return */ public function stopTransitionTool():Void{ - //Debugger.log('Stopping transition tool',Debugger.GEN,'stopTransitionTool','Canvas'); - Cursor.showCursor(Application.C_DEFAULT); + Debugger.log('Stopping transition tool',Debugger.GEN,'stopTransitionTool','Canvas'); + Cursor.showCursor(ApplicationParent.C_DEFAULT); canvasModel.unlockAllComplexActivities(); canvasModel.stopTransitionTool(); } Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r73a6e11c215638c7c417667a1706f5a01c9d82d4 -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 73a6e11c215638c7c417667a1706f5a01c9d82d4) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -521,31 +521,37 @@ private function getAssociatedStyle():Object{ trace("Category ID for Activity "+_activity.title +": "+_activity.activityCategoryID) var styleObj:Object = new Object(); - switch (String(_activity.activityCategoryID)){ - case '0' : - styleObj = _tm.getStyleObject('ACTPanel0') - break; - case '1' : - styleObj = _tm.getStyleObject('ACTPanel1') - break; - case '2' : - styleObj = _tm.getStyleObject('ACTPanel2') - break; - case '3' : - styleObj = _tm.getStyleObject('ACTPanel5') - break; - case '4' : - styleObj = _tm.getStyleObject('ACTPanel4') - break; - case '5' : - styleObj = _tm.getStyleObject('ACTPanel0') - break; - case '6' : - styleObj = _tm.getStyleObject('ACTPanel3') - break; - default : - styleObj = _tm.getStyleObject('ACTPanel0') + + if(_root.actColour == "true") { + switch (String(_activity.activityCategoryID)){ + case '0' : + styleObj = _tm.getStyleObject('ACTPanel0') + break; + case '1' : + styleObj = _tm.getStyleObject('ACTPanel1') + break; + case '2' : + styleObj = _tm.getStyleObject('ACTPanel2') + break; + case '3' : + styleObj = _tm.getStyleObject('ACTPanel5') + break; + case '4' : + styleObj = _tm.getStyleObject('ACTPanel4') + break; + case '5' : + styleObj = _tm.getStyleObject('ACTPanel0') + break; + case '6' : + styleObj = _tm.getStyleObject('ACTPanel3') + break; + default : + styleObj = _tm.getStyleObject('ACTPanel0') + } + } else { + styleObj = _tm.getStyleObject('ACTPanel'); } + return styleObj; } Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r0e10ae9d55f1bf5e4f7140d5d240bdd092ed508f -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 0e10ae9d55f1bf5e4f7140d5d240bdd092ed508f) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -340,7 +340,9 @@ public function transitionClick(ct:CanvasTransition):Void{ Debugger.log('transitionClick Transition:'+ct.transition.uiID,Debugger.GEN,'transitionClick','CanvasController'); - _canvasModel.selectedItem = ct; + _canvasModel.getCanvas().stopActiveTool(); + + _canvasModel.selectedItem = ct; _canvasModel.isDragging = true; ct.startDrag(false); @@ -361,7 +363,7 @@ } public function transitionRelease(ct:CanvasTransition):Void{ - _canvasModel.getCanvas().stopActiveTool(); + Debugger.log("transitionRelease Transition:" + ct.transition.uiID, Debugger.GEN, "transitionRelease", "CanvasController"); if(_canvasModel.isDragging){ ct.stopDrag(); Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -r9ab50c7ac0968734ac995676cdba54f0c80bbeed -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 9ab50c7ac0968734ac995676cdba54f0c80bbeed) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -250,6 +250,7 @@ } public function lockAllComplexActivities():Void{ + Debugger.log("Locking all Complex Activities", Debugger.GEN, "lockAllComplexActivities", "CanvasModel"); var k:Array = _activitiesDisplayed.values(); //trace("findOptionalActivities Called "+k.length ) for (var i=0; i @@ -218,7 +219,7 @@ -?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&uniqueID= +?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&actColour=<%= actColour %>&uniqueID= lams_preloader.swf lams_preloader Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 -r09d397307cdeb56f597caf45fde99302c4b541bd Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r8631b0fa18d10b78cd3150b63cd7da4e6926d2b0 -r09d397307cdeb56f597caf45fde99302c4b541bd Binary files differ Index: lams_central/web/lams_preloader.swf =================================================================== diff -u -r9aac31f8fe206db9456b2855b295e585563ebdd2 -r09d397307cdeb56f597caf45fde99302c4b541bd Binary files differ Index: lams_common/db/sql/insert_unix_config_data.sql =================================================================== diff -u -rc503a9d3016276580bb71589946960e23272e4f8 -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_common/db/sql/insert_unix_config_data.sql (.../insert_unix_config_data.sql) (revision c503a9d3016276580bb71589946960e23272e4f8) +++ lams_common/db/sql/insert_unix_config_data.sql (.../insert_unix_config_data.sql) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -14,6 +14,7 @@ insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400'); insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false'); insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7'); +insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true'); insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.@datetimestamp@'); insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.@datetimestamp@'); insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.@datetimestamp@'); Index: lams_common/db/sql/insert_windows_config_data.sql =================================================================== diff -u -rc503a9d3016276580bb71589946960e23272e4f8 -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_common/db/sql/insert_windows_config_data.sql (.../insert_windows_config_data.sql) (revision c503a9d3016276580bb71589946960e23272e4f8) +++ lams_common/db/sql/insert_windows_config_data.sql (.../insert_windows_config_data.sql) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -14,6 +14,7 @@ insert into lams_configuration (config_key, config_value) values ('UserInactiveTimeout','86400'); insert into lams_configuration (config_key, config_value) values ('UseCacheDebugListener','false'); insert into lams_configuration (config_key, config_value) values ('CleanupPreviewOlderThanDays','7'); +insert into lams_configuration (config_key, config_value) values ('AuthoringActivitiesColour', 'true'); insert into lams_configuration (config_key, config_value) values ('AuthoringClientVersion','2.0.@datetimestamp@'); insert into lams_configuration (config_key, config_value) values ('MonitorClientVersion','2.0.@datetimestamp@'); insert into lams_configuration (config_key, config_value) values ('LearnerClientVersion','2.0.@datetimestamp@'); Index: lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as =================================================================== diff -u -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384 -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384) +++ lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -41,8 +41,10 @@ public static var C_GATE:String = "c_gate"; public static var C_GROUP:String = "c_group"; public static var C_DEFAULT:String = "default"; - public static var C_LICON:String = "c_licon"; + public static var C_LICON:String = "c_licon"; + public static var TRANSITION:String = "transition"; + public static var SERIAL_NO = "0000-0000-0000-0001-AAAA"; public static var FLASH_TOOLSIGNATURE_GATE:String = "lagat11"; public static var FLASH_TOOLSIGNATURE_GROUP:String = "lagrp11"; Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -rc503a9d3016276580bb71589946960e23272e4f8 -r09d397307cdeb56f597caf45fde99302c4b541bd --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision c503a9d3016276580bb71589946960e23272e4f8) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 09d397307cdeb56f597caf45fde99302c4b541bd) @@ -95,6 +95,9 @@ */ public static String USE_CACHE_DEBUG_LISTENER = "UseCacheDebugListener"; + /** Value for controlling style colour on Canvas Activities */ + public static String AUTHORING_ACTS_COLOUR = "AuthoringActivitiesColour"; + /** Values for client updates */ public static String AUTHORING_CLIENT_VERSION = "AuthoringClientVersion";