Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as =================================================================== diff -u -r43fff4250a8f7d70205c6c9f0f7b967d7462d2ad -r3d370bf2dca8dff17a9c3c73c7676f0f8abc5a7b --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision 43fff4250a8f7d70205c6c9f0f7b967d7462d2ad) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as (.../Application.as) (revision 3d370bf2dca8dff17a9c3c73c7676f0f8abc5a7b) @@ -23,7 +23,8 @@ //import org.lamsfoundation.lams.authoring.* //Design Data model n stuffimport org.lamsfoundation.lams.authoring.* //Design Data model n stuff import org.lamsfoundation.lams.monitoring.* -import org.lamsfoundation.lams.monitoring.ls.* //Lessons +import org.lamsfoundation.lams.monitoring.ls.* //Lessons +import org.lamsfoundation.lams.monitoring.mv.* //Monitor import org.lamsfoundation.lams.authoring.tb.* //Toolbar //import org.lamsfoundation.lams.authoring.cv.* //Canvas import org.lamsfoundation.lams.common.ws.* //Workspace @@ -433,7 +434,11 @@ _toolbar = new Toolbar(_appRoot_mc,TOOLBAR_X,TOOLBAR_Y); _toolbar.addEventListener('load',Proxy.create(this,UIElementLoaded)); - //MONITOR + //LESSONS + _lessons = new Lesson(_appRoot_mc,LESSONS_X,LESSONS_Y); + _lessons.addEventListener('load',Proxy.create(this,UIElementLoaded)); + + //MONITOR _monitor = new Monitor(_appRoot_mc,depth++,MONITOR_X,MONITOR_Y,MONITOR_W,MONITOR_H); _monitor.addEventListener('load',Proxy.create(this,UIElementLoaded)); @@ -442,10 +447,8 @@ _workspace = new Workspace(); //_workspace.addEventListener('load',Proxy.create(this,UIElementLoaded)); */ - //LESSONS - _lessons = new Lesson(_appRoot_mc,LESSONS_X,LESSONS_Y); - _lessons.addEventListener('load',Proxy.create(this,UIElementLoaded)); + } /** @@ -484,10 +487,10 @@ //someListener.onMouseUp = function () { //Menu - only need to worry about width - _menu_mc.setSize(w,_menu_mc._height); + _menu_mc.setSize(w,_menu_mc.height); //MONITOR - _monitor.setSize(w-_lessons.width,h-MONITOR_Y); + //_monitor.setSize(w-_lessons.width,h-MONITOR_Y); //_toolkit.setSize(_toolkit.width,h-TOOLKIT_Y); //Toolbar @@ -501,8 +504,9 @@ //Mouse.addListener(someListener); //Canvas - // _canvas.setSize(w-_toolkit.width,h-CANVAS_Y); - _lessons.setSize(_lessons.width,h-LESSONS_Y); + _lessons.setSize(_lessons.width,h-LESSONS_Y); + _monitor.setSize(w-MONITOR_X,h-MONITOR_Y); + //Toolbar //_toolbar.setSize(w,_toolbar.height);