Index: lams_central/web/lams_authoring.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v diff -u -r1.340 -r1.341 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as,v diff -u -r1.55 -r1.56 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as 9 Jan 2008 01:17:09 -0000 1.55 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as 11 Jan 2008 07:32:18 -0000 1.56 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as,v diff -u -r1.3 -r1.4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as 5 Jul 2007 05:59:58 -0000 1.3 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as 11 Jan 2008 07:32:18 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as,v diff -u -r1.5 -r1.6 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as 6 Nov 2007 03:22:40 -0000 1.5 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as 11 Jan 2008 07:32:18 -0000 1.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as,v diff -u -r1.3 -r1.4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as 7 Nov 2007 07:54:55 -0000 1.3 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as 11 Jan 2008 07:32:13 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as,v diff -u -r1.1 -r1.2 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as 5 Jun 2007 02:58:17 -0000 1.1 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as 11 Jan 2008 07:32:13 -0000 1.2 @@ -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/ls/LessonController.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as,v diff -u -r1.3 -r1.4 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as 29 Oct 2007 05:17:34 -0000 1.3 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as 11 Jan 2008 07:32:13 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as,v diff -u -r1.6 -r1.7 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as 22 Nov 2007 01:14:09 -0000 1.6 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as 11 Jan 2008 07:32:17 -0000 1.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as,v diff -u -r1.13 -r1.14 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as 2 Jan 2008 22:45:05 -0000 1.13 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as 11 Jan 2008 07:32:14 -0000 1.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as,v diff -u -r1.22 -r1.23 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as 7 Jan 2008 01:54:49 -0000 1.22 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as 11 Jan 2008 07:32:14 -0000 1.23 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as,v diff -u -r1.10 -r1.11 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as 21 Dec 2007 05:14:18 -0000 1.10 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as 11 Jan 2008 07:32:17 -0000 1.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as,v diff -u -r1.12 -r1.13 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as 2 Jan 2008 22:45:05 -0000 1.12 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as 11 Jan 2008 07:32:18 -0000 1.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as,v diff -u -r1.6 -r1.7 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as 18 Dec 2007 05:18:48 -0000 1.6 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as 11 Jan 2008 07:32:18 -0000 1.7 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as,v diff -u -r1.2 -r1.3 --- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as 26 Jul 2007 08:45:53 -0000 1.2 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as 11 Jan 2008 07:32:18 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as,v diff -u -r1.7 -r1.8 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as 7 Dec 2007 07:42:10 -0000 1.7 +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as 11 Jan 2008 07:32:18 -0000 1.8 @@ -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 {