Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rb18810be6bdfea83a5c74ce79324d570ea98c8b0 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as =================================================================== diff -u -r6c292664546290ce3a5a05afd8e487fb635d41ca -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision 6c292664546290ce3a5a05afd8e487fb635d41ca) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -109,7 +109,6 @@ private var _ccm:CustomContextMenu; private var _debugDialog:MovieClip; //Reference to the debug dialog - private var _tooltipContainer_mc:MovieClip; //Tooltip container private var _cursorContainer_mc:MovieClip; //Cursor container private var _menu_mc:MovieClip; //Menu bar clip private var _container_mc:MovieClip; //Main container @@ -721,22 +720,6 @@ } } - - /** - * Returns the tooltip conatiner mc - * - * @usage Import authoring package and then use - * - */ - static function get tooltip():MovieClip { - //Return root if valid otherwise raise a big system error as app. will not work without it - if(_instance._tooltipContainer_mc != undefined) { - return _instance._tooltipContainer_mc; - } else { - //TODO DI 11/05/05 Raise error if mc hasn't been created - - } - } /** * Returns the Cursor conatiner mc Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision ed0751bf76b6e95126836f3d8a51c7f60277a742) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -21,6 +21,7 @@ * ************************************************************************ */ import org.lamsfoundation.lams.common.Dialog; +import org.lamsfoundation.lams.common.ToolTip; import org.lamsfoundation.lams.common.util.*; import org.lamsfoundation.lams.common.ui.*; import org.lamsfoundation.lams.common.style.*; @@ -48,6 +49,7 @@ class org.lamsfoundation.lams.authoring.br.CanvasBranchView extends CommonCanvasView { private var _tm:ThemeManager; + private var _tip:ToolTip; private var _container:MovieClip; //The container window that holds the dialog @@ -98,6 +100,8 @@ currentActivity_y = null; _tm = ThemeManager.getInstance(); + _tip = new ToolTip(); + defaultSequenceActivity = null; fingerprint = null; _eventsEnabled = true; @@ -276,6 +280,8 @@ close_mc.onRelease = Proxy.create(this, localOnRelease); close_mc.onReleaseOutside = Proxy.create(this, localOnReleaseOutside); + close_mc.onRollOver = Proxy.create(this, this['showToolTip'], close_mc, "close_mc_tooltip"); + close_mc.onRollOut = Proxy.create(this,this['hideToolTip']); setupConnectorHubs(); loadSequenceActivities(); @@ -855,5 +861,31 @@ else return MonitorModel(model).ddm; } + private function getXY():Object { + var pos:Object = new Object(); + + pos.x = (model instanceof CanvasModel) ? org.lamsfoundation.lams.authoring.Application.CANVAS_X + hSpace : model.getMonitor().getMV().getMonitorSequenceScp()._x; + pos.y = (model instanceof CanvasModel) ? org.lamsfoundation.lams.authoring.Application.CANVAS_Y + vSpace : model.getMonitor().getMV().getMonitorSequenceScp()._y; + + Debugger.log("pos x: " + pos.x + " pos y: " + pos.y, Debugger.CRITICAL, "getXY", "CanvasBranchView"); + + return pos; + } + + public function showToolTip(mcObj, btnTT:String):Void{ + var pos = getXY(); + var Xpos = pos.x + mcObj._x - 20; + var Ypos = pos.y + mcObj._y - 20; + + var ttHolder = ApplicationParent.tooltip; + var ttMessage = Dictionary.getValue(btnTT); + + _tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos); + + } + + public function hideToolTip():Void{ + _tip.CloseToolTip(); + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as =================================================================== diff -u -rddbaafba98df3c2f503d7f8cdb755d9f5194dfd0 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as (.../Bin.as) (revision ddbaafba98df3c2f503d7f8cdb755d9f5194dfd0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as (.../Bin.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -77,7 +77,7 @@ private function onRollOver():Void{ var Xpos = (Application.CANVAS_X+ this._x)-tooltipXoffset; var Ypos = (Application.CANVAS_Y+ this._y); - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage = Dictionary.getValue("bin_tooltip"); //param "true" is to specify that tooltip needs to be shown above the component Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as =================================================================== diff -u -r86aae1b21277f5fc950a0303361b63fd7adde39c -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision 86aae1b21277f5fc950a0303361b63fd7adde39c) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -380,7 +380,7 @@ public function showToolTip(btnObj, btnTT:String):Void{ var Xpos = Application.TOOLBAR_X+ btnObj._x; var Ypos = (Application.TOOLBAR_Y+ btnObj._y+btnObj.height)+5; - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage = Dictionary.getValue(btnTT); _tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as =================================================================== diff -u -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as (.../TemplateActivity.as) (revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as (.../TemplateActivity.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -67,7 +67,7 @@ _tm = ThemeManager.getInstance(); _childActivities = new Array(); //Tip = new ToolTip(); - //ttHolder = Application.tooltip; + //ttHolder = ApplicationParent.tooltip; //let it wait one frame to set up the components. MovieClipUtils.doLater(Proxy.create(this,init)); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as (.../ToolkitView.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as (.../ToolkitView.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -275,7 +275,7 @@ } public function showToolTip(ttMsg:String, xpos:Number, ypos:Number, btnObj):Void{ - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage:String; var Xpos:Number; var Ypos:Number; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as =================================================================== diff -u -r691459c3a8be6d76fa38516c01f9bb1e0add7e86 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision 691459c3a8be6d76fa38516c01f9bb1e0add7e86) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -91,8 +91,7 @@ //Application instance is stored as a static in the application class private static var _instance:Application = null; private var _container_mc:MovieClip; //Main container - private var _tooltipContainer_mc:MovieClip; //Tooltip container - private var _debugDialog:MovieClip; //Reference to the debug dialog + private var _debugDialog:MovieClip; //Reference to the debug dialog /** * Application - Constructor @@ -340,24 +339,6 @@ } } } - - - /** - * Returns the tooltip conatiner mc - * - * @usage Import monioring package and then use - * - */ - static function get tooltip():MovieClip { - //Return root if valid otherwise raise a big system error as app. will not work without it - if(_instance._tooltipContainer_mc != undefined) { - return _instance._tooltipContainer_mc; - } else { - //TODO DI 11/05/05 Raise error if mc hasn't been created - - } - } - // onKey*** methods - TODO Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as =================================================================== diff -u -r8e4fc8d67f4733b5b989e9baf079daa75832193d -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as (.../Header.as) (revision 8e4fc8d67f4733b5b989e9baf079daa75832193d) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as (.../Header.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -32,7 +32,8 @@ import org.lamsfoundation.lams.common.util.* import org.lamsfoundation.lams.common.dict.* import org.lamsfoundation.lams.common.style.* -import org.lamsfoundation.lams.common.Config; +import org.lamsfoundation.lams.common.Config; +import org.lamsfoundation.lams.common.ApplicationParent; class Header extends MovieClip { @@ -147,7 +148,7 @@ var Xpos = Application.HEADER_X+ 5; var Ypos = Application.HEADER_Y+( btnObj._y+btnObj._height)+2; - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage = Dictionary.getValue(btnTT); var ttWidth = 150 _tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos, undefined, ttWidth); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as (.../Scratchpad.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as (.../Scratchpad.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -27,6 +27,7 @@ import org.lamsfoundation.lams.common.util.*; import org.lamsfoundation.lams.common.dict.*; import org.lamsfoundation.lams.common.style.*; +import org.lamsfoundation.lams.common.ApplicationParent; import mx.controls.* import mx.utils.* import mx.managers.* @@ -171,7 +172,7 @@ var Xpos = Application.HEADER_X+ 5; var Ypos = Application.HEADER_Y+( btnObj._y+btnObj._height)+2; - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage = Dictionary.getValue(btnTT); var ttWidth = 150 _tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos, undefined, ttWidth); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as =================================================================== diff -u -r9198e1dd59fcbc6d7a3332d29dce42800af2e97b -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as (.../LessonController.as) (revision 9198e1dd59fcbc6d7a3332d29dce42800af2e97b) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as (.../LessonController.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -22,7 +22,8 @@ */ import org.lamsfoundation.lams.learner.ls.*; -import org.lamsfoundation.lams.common.LearnerComplexActivity; +import org.lamsfoundation.lams.common.LearnerComplexActivity; +import org.lamsfoundation.lams.common.ApplicationParent; import org.lamsfoundation.lams.common.mvc.* import org.lamsfoundation.lams.common.util.* import org.lamsfoundation.lams.common.dict.* @@ -149,7 +150,7 @@ var myObj:Object = new Object(); myObj.compX = Application.LESSON_X myObj.compY = Application.LESSON_Y - myObj.ttHolder = Application.tooltip; + myObj.ttHolder = ApplicationParent.tooltip; return myObj; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as =================================================================== diff -u -r6c292664546290ce3a5a05afd8e487fb635d41ca -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision 6c292664546290ce3a5a05afd8e487fb635d41ca) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -96,7 +96,6 @@ private var _config:Config; private var _debugDialog:MovieClip; //Reference to the debug dialog - private var _tooltipContainer_mc:MovieClip; //Tooltip container private var _cursorContainer_mc:MovieClip; //Cursor container private var _menu_mc:MovieClip; //Menu bar clip private var _container_mc:MovieClip; //Main container @@ -588,25 +587,9 @@ //TODO DI 11/05/05 Raise error if mc hasn't been created } - } - - /** - * Returns the tooltip conatiner mc - * - * @usage Import monioring package and then use - * - */ - static function get tooltip():MovieClip { - //Return root if valid otherwise raise a big system error as app. will not work without it - if(_instance._tooltipContainer_mc != undefined) { - return _instance._tooltipContainer_mc; - } else { - //TODO DI 11/05/05 Raise error if mc hasn't been created - - } } - - /** + + /** * Returns the Cursor conatiner mc * * @usage Import authoring package and then use Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -re81958af10d6f71738ab15ba4ee3df5d459cf578 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision e81958af10d6f71738ab15ba4ee3df5d459cf578) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -574,7 +574,7 @@ var myObj:Object = new Object(); myObj.compX = Application.MONITOR_X myObj.compY = Application.MONITOR_Y - myObj.ttHolder = Application.tooltip; + myObj.ttHolder = ApplicationParent.tooltip; return myObj; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -r87e20639548b7a3bf958c1e3a01adf95dc8fb771 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 87e20639548b7a3bf958c1e3a01adf95dc8fb771) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -181,7 +181,7 @@ ddmTransition_keys = new Array(); _resultDTO = new Object(); - ttHolder = Application.tooltip; + ttHolder = ApplicationParent.tooltip; monitor_y = Application.MONITOR_Y; monitor_x = Application.MONITOR_X; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as =================================================================== diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision 058ef2c126172a3ee7eeed3b1883a4b65dab9d8e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as (.../MonitorView.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -342,7 +342,7 @@ } var Xpos = Application.MONITOR_X+ xpos; var Ypos = (Application.MONITOR_Y+ btnObj._y+btnObj.height)+5; - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage = Dictionary.getValue(btnTT); _tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as =================================================================== diff -u -re81958af10d6f71738ab15ba4ee3df5d459cf578 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision e81958af10d6f71738ab15ba4ee3df5d459cf578) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -481,7 +481,7 @@ var xpos:Number = scpWidth - 190; var Xpos = xpos; var Ypos = (Application.MONITOR_Y+ btnObj._y+btnObj.height)+5; - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage = Dictionary.getValue(btnTT); _tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as =================================================================== diff -u -rc8a3ab790f64597f8a37e88e5805014136695b16 -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as (.../MonitorGateView.as) (revision c8a3ab790f64597f8a37e88e5805014136695b16) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as (.../MonitorGateView.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -150,7 +150,7 @@ public function showToolTip(btnTT:String):Void{ var Xpos = this._x + 5; var Ypos = this._y + this._height; - var ttHolder = Application.tooltip; + var ttHolder = ApplicationParent.tooltip; var ttMessage = Dictionary.getValue(btnTT); Debugger.log("ttMessage"+ttMessage, Debugger.CRITICAL); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as =================================================================== diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as (.../Application.as) (revision 60db93c549c96bad95e890f34add10c4ef9d3d2e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as (.../Application.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -82,7 +82,6 @@ private var _dialogueContainer_mc:MovieClip; //Dialog container - private var _tooltipContainer_mc:MovieClip; //Tooltip container private var _cursorContainer_mc:MovieClip; //Cursor container private var _container_mc:MovieClip; //Main container @@ -431,22 +430,6 @@ //TODO DI 11/05/05 Raise error if mc hasn't been created } - } - - /** - * Returns the tooltip conatiner mc - * - * @usage Import authoring package and then use - * - */ - static function get tooltip():MovieClip { - //Return root if valid otherwise raise a big system error as app. will not work without it - if(_instance._tooltipContainer_mc != undefined) { - return _instance._tooltipContainer_mc; - } else { - //TODO DI 11/05/05 Raise error if mc hasn't been created - - } } /** Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as =================================================================== diff -u -r279eb9923e590404e9eec790ee85645ca46e184e -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision 279eb9923e590404e9eec790ee85645ca46e184e) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115) @@ -78,7 +78,8 @@ private var _appRoot_mc:MovieClip; //Application root clip private var _dialogueContainer_mc:MovieClip; //Dialog container - + private var _tooltipContainer_mc:MovieClip; //Tooltip container + // constructor public function ApplicationParent(app:Object) { _instance = ApplicationParent(app); @@ -230,6 +231,22 @@ } } + /** + * Returns the tooltip conatiner mc + * + * @usage Import authoring package and then use + * + */ + static function get tooltip():MovieClip { + //Return root if valid otherwise raise a big system error as app. will not work without it + if(_instance._tooltipContainer_mc != undefined) { + return _instance._tooltipContainer_mc; + } else { + //TODO DI 11/05/05 Raise error if mc hasn't been created + + } + } + public function get loader():LFLoader{ if(_root.loader != undefined) { return _root.loader; } else {