Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -rcdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision cdaf8d56ec7cf8c47c0b11eb79f00621d5148eb5) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -110,7 +110,7 @@ currentActivity_y = null; _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); defaultSequenceActivity = null; fingerprint = null; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as =================================================================== diff -u -r9d5eeace842b7971ad47f350fef71c0e11a352c0 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -96,7 +96,7 @@ mx.events.EventDispatcher.initialize(this); _tm = ThemeManager.getInstance(); _dictionary = Dictionary.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); } /** Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as (.../Header.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as (.../Header.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -77,7 +77,7 @@ EventDispatcher.initialize(this); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); _dictionary = Dictionary.getInstance(); _dictionary.addEventListener('init',Proxy.create(this,setLabels)); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as =================================================================== diff -u -r3fc9626d0692f03e5998d786766a82f45e640e03 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as (.../Presence.as) (revision 3fc9626d0692f03e5998d786766a82f45e640e03) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as (.../Presence.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -81,7 +81,7 @@ EventDispatcher.initialize(this); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); _dictionary = Dictionary.getInstance(); _dictionary.addEventListener('init',Proxy.create(this,setLabels)); this._visible = false; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/PresenceXIFF.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/PresenceXIFF.as (.../PresenceXIFF.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/PresenceXIFF.as (.../PresenceXIFF.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -118,7 +118,7 @@ EventDispatcher.initialize(this); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); _dictionary = Dictionary.getInstance(); _dictionary.addEventListener('init',Proxy.create(this,setLabels)); regNecessaryFields = new Object(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Reference.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Reference.as (.../Reference.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Reference.as (.../Reference.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -79,7 +79,7 @@ EventDispatcher.initialize(this); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); _dictionary = Dictionary.getInstance(); _dictionary.addEventListener('init',Proxy.create(this,setLabels)); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as (.../Scratchpad.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as (.../Scratchpad.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -83,7 +83,7 @@ EventDispatcher.initialize(this); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); _dictionary = Dictionary.getInstance(); _dictionary.addEventListener('init',Proxy.create(this,setLabels)); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as =================================================================== diff -u -rcbfac9ce613068af91c96c8d61215902e39d8abf -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as (.../LearnerIndexView.as) (revision cbfac9ce613068af91c96c8d61215902e39d8abf) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as (.../LearnerIndexView.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -101,7 +101,7 @@ function LearnerIndexView(){ Debugger.log("LearnerIndexView Constructor", Debugger.CRITICAL, "LearnerIndexView", "LearnerIndexView"); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); nextPosition = 0; btnWidth = 40; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as =================================================================== diff -u -r239ac988c69a779577a0d586a1f5107b1e276b4b -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision 239ac988c69a779577a0d586a1f5107b1e276b4b) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as (.../LearnerTabView.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -109,7 +109,7 @@ _learnerTabView = this; _learnerTabViewContainer_mc = this; _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); //Init for event delegation mx.events.EventDispatcher.initialize(this); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as =================================================================== diff -u -r239ac988c69a779577a0d586a1f5107b1e276b4b -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision 239ac988c69a779577a0d586a1f5107b1e276b4b) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -155,7 +155,7 @@ _app = ApplicationParent.getInstance(); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); //Init for event delegation mx.events.EventDispatcher.initialize(this); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as (.../MonitorGateView.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as (.../MonitorGateView.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -74,7 +74,7 @@ _monitorGateView = this; _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); this._visible = false; Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as (.../LearnerActivity.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -123,7 +123,7 @@ Debugger.log("learner:"+ learner,4,'Constructor','LearnerActivity'); _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); _dcStartTime = new Date().getTime(); Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as =================================================================== diff -u -rc646d49c75891d4de941930ea911e55046d0ba00 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision c646d49c75891d4de941930ea911e55046d0ba00) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -145,7 +145,7 @@ _visible = false; _tm = ThemeManager.getInstance(); - _tip = new ToolTip(); + _tip = new ToolTip(_tm); _visibleHeight = container_pnl._height; _visibleWidth = container_pnl._width; Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -rb450423ef9e42f91ca86bafbc161eef1683f4930 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as (.../ToolTip.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as (.../ToolTip.as) (revision b450423ef9e42f91ca86bafbc161eef1683f4930) @@ -23,8 +23,17 @@ import mx.managers.* import mx.controls.* +import org.lamsfoundation.lams.common.style.* +import org.lamsfoundation.lams.common.util.Debugger class org.lamsfoundation.lams.common.ToolTip extends MovieClip { + // Theme Manager + private static var TOOLTIP_TM_SO:String = "ToolTip"; + private static var TOOLTIPSHAD_TM_SO:String = "ToolTipShadow"; + var _tm:ThemeManager; + var _tooltip_so:Object; + var _tooltip_shad_so:Object; + // The button to display the ToolTip on var btn:Button; var ttHolder:MovieClip; @@ -51,6 +60,7 @@ var tiptext:TextFormat; var tiptextshadow:TextFormat; + // color defaults var backgroundcolour:Number = 0xF5EFC0; var bordercolour:Number = 0x666666; @@ -65,7 +75,17 @@ // All of the tooltips properties have default values except the actual message to display // in the tip. Because of this, only the message is required to be sent to the constructor. - public function ToolTip(){ + public function ToolTip(tm:ThemeManager){ + _tm = (tm != undefined || tm != null) ? tm : ThemeManager.getInstance(); + _tooltip_so = _tm.getStyleObject(TOOLTIP_TM_SO); + _tooltip_shad_so = _tm.getStyleObject(TOOLTIPSHAD_TM_SO); + + if(_tooltip_so != null) { + // set style color options + backgroundcolour = _tooltip_so.getStyle('backgroundColor'); + bordercolour = _tooltip_so.getStyle('borderColor'); + } + textFormat = formatText(); } @@ -157,15 +177,28 @@ private function formatText():Object{ var FObj:Object = new Object(); var TipText:TextFormat = new TextFormat(); - TipText.color = 0x333333; - TipText.font = "Verdana"; - TipText.size = 9; - var TipTextShadow:TextFormat = new TextFormat(); - TipTextShadow.color = 0xECE9D8; - TipTextShadow.font = "Verdana"; - TipTextShadow.size = 9; + if(_tooltip_so != null) { + TipText.color = _tooltip_so.getStyle('color'); + TipText.font = String(_tooltip_so.getStyle('fontFamily')); + TipText.size = Number(_tooltip_so.getStyle('fontSize')); + } else { + TipText.color = 0x333333; + TipText.font = "Verdana"; + TipText.size = 9; + } + + if(_tooltip_shad_so != null) { + TipTextShadow.color = _tooltip_shad_so.getStyle('color'); + TipTextShadow.font = String(_tooltip_shad_so.getStyle('fontFamily')); + TipTextShadow.size = Number(_tooltip_shad_so.getStyle('fontSize')); + } else { + TipTextShadow.color = 0xECE9D8; + TipTextShadow.font = "Verdana"; + TipTextShadow.size = 9; + } + FObj.tiptext = TipText FObj.tiptextshadow = TipTextShadow