Index: lams_central/conf/flashxml/lams/defaultTheme.xml =================================================================== diff -u -r7457cc82a05752050f053af407be12d4f7f33db2 -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_central/conf/flashxml/lams/defaultTheme.xml (.../defaultTheme.xml) (revision 7457cc82a05752050f053af407be12d4f7f33db2) +++ lams_central/conf/flashxml/lams/defaultTheme.xml (.../defaultTheme.xml) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -1 +1 @@ -
0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnone \ No newline at end of file +
0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnoneAlertDialog1000100010001000 \ No newline at end of file Index: lams_central/conf/flashxml/rams/defaultTheme.xml =================================================================== diff -u -r8a07360d6683eb011c44ed869deaa113468ed525 -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_central/conf/flashxml/rams/defaultTheme.xml (.../defaultTheme.xml) (revision 8a07360d6683eb011c44ed869deaa113468ed525) +++ lams_central/conf/flashxml/rams/defaultTheme.xml (.../defaultTheme.xml) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -1 +1 @@ -
0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnone \ No newline at end of file +
0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnoneAlertDialog1000100010001000 \ No newline at end of file Index: lams_central/conf/flashxml/rams/ramsTheme.xml =================================================================== diff -u -r8a07360d6683eb011c44ed869deaa113468ed525 -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_central/conf/flashxml/rams/ramsTheme.xml (.../ramsTheme.xml) (revision 8a07360d6683eb011c44ed869deaa113468ed525) +++ lams_central/conf/flashxml/rams/ramsTheme.xml (.../ramsTheme.xml) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -1 +1 @@ -0x33364810Verdana0xFFEBD00xFFEBD00xFFEBD0insetdefaultbutton0x3336489Verdana0xF98C3D0xF98C3D0xF98C3D0xF98C3Dlabel0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xF98C3D0xF98C3D0xF98C3Dinsettreeview0x33364814Verdana0xF98C3D0xF98C3D0xF98C3DElasticdatagrid0x33364814Verdana0xF98C3D0xF98C3D0xF98C3DElasticcombo0x33364811Verdana0xFFEEC80xFFEEC80xFFEEC8picombo0x3336489Verdana0xFFEEC80xF98C3D0xF98C3DLFMenuBar0x33364811Verdana0xF98C3D0xF98C3D0xF98C3DBGPaneloutset0xE3E3E3FlowPanelnone0xE3E3E3WZPaneloutset0xEFEFEFMHPanelnone0xE3E3E3TAPaneloutset0xE3E3E30x000000scrollpane0xE3E3E3textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xFFEBD0ACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0xFFEBD0OptActPanelnone0xE3E3E3parallelHeadPaneloutset0xE3E3E3OptHeadPaneloutset0xE3E3E3ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0xA3A3A3TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xA3A3A3CAHighlightBorder0x333648LTVLearnerText0x555555Verdana11bold0xFDF8F2solidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnone
\ No newline at end of file +0x33364810Verdana0xFFEBD00xFFEBD00xFFEBD0insetdefaultbutton0x3336489Verdana0xF98C3D0xF98C3D0xF98C3D0xF98C3Dlabel0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xF98C3D0xF98C3D0xF98C3Dinsettreeview0x33364814Verdana0xF98C3D0xF98C3D0xF98C3DElasticdatagrid0x33364814Verdana0xF98C3D0xF98C3D0xF98C3DElasticcombo0x33364811Verdana0xFFEEC80xFFEEC80xFFEEC8picombo0x3336489Verdana0xFFEEC80xF98C3D0xF98C3DLFMenuBar0x33364811Verdana0xF98C3D0xF98C3D0xF98C3DBGPaneloutset0xE3E3E3FlowPanelnone0xE3E3E3WZPaneloutset0xEFEFEFMHPanelnone0xE3E3E3TAPaneloutset0xE3E3E30x000000scrollpane0xE3E3E3textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xFFEBD0ACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0xFFEBD0OptActPanelnone0xE3E3E3parallelHeadPaneloutset0xE3E3E3OptHeadPaneloutset0xE3E3E3ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0xA3A3A3TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xA3A3A3CAHighlightBorder0x333648LTVLearnerText0x555555Verdana11bold0xFDF8F2solidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnoneAlertDialog101850100001000
\ No newline at end of file Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r8ad16270f3ad03c45a8aa73353d6485bd2631a1c -rea5dd39341c9597a297fe0e292479b5e184196c5 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r8ad16270f3ad03c45a8aa73353d6485bd2631a1c -rea5dd39341c9597a297fe0e292479b5e184196c5 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as =================================================================== diff -u -rb5ea111fe1fbd34945b46883d3c83164603cf705 -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as (.../Activity.as) (revision b5ea111fe1fbd34945b46883d3c83164603cf705) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as (.../Activity.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -161,6 +161,7 @@ private var _groupingSupportType:Number; //* + private var _stopAfterActivity:Boolean; private var _readOnly:Boolean; private var _viewID:Boolean; @@ -184,6 +185,7 @@ //defaults _objectType = "Activity"; _applyGrouping = false; + _stopAfterActivity = false; _runOffline = false; _defineLater = false; _readOnly = false; @@ -336,6 +338,7 @@ _createDateTime = dto.createDateTime; _groupingSupportType = dto.groupingSupportType; _readOnly = dto.readOnly; + _stopAfterActivity = dto.stopAfterActivity; } @@ -370,6 +373,7 @@ if(_createDateTime){ dto.createDateTime = _createDateTime; } if(_groupingSupportType){ dto.groupingSupportType = _groupingSupportType; } if(_readOnly){ dto.readOnly = _readOnly; } + if(_stopAfterActivity){ dto.stopAfterActivity = _stopAfterActivity } return dto; } @@ -745,4 +749,16 @@ return _readOnly; } + /** + * + * @usage + * @return + */ + public function get stopAfterActivity():Boolean { + return _stopAfterActivity; + } + + public function set stopAfterActivity(a:Boolean):Void { + _stopAfterActivity = a; + } } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as =================================================================== diff -u -r5ffdfb896de13994030991c7634bb54a7c862404 -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision 5ffdfb896de13994030991c7634bb54a7c862404) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -217,7 +217,6 @@ loader.complete(); setupData(); checkDataLoaded(); - } /** @@ -230,9 +229,7 @@ _dictionary = Dictionary.getInstance(); _dictionary.addEventListener('load',Delegate.create(this,onDictionaryLoad)); _dictionary.load(language); - - //Set reference to StyleManager and load Themes and setup load handler. var theme:String = String(_config.getItem('theme')); _themeManager = ThemeManager.getInstance(); @@ -254,18 +251,15 @@ _DataLoadCheckIntervalID = setInterval(Proxy.create(this, checkDataLoaded), DATA_LOAD_CHECK_INTERVAL); } else { _dataLoadCheckCount++; + // if dictionary and theme data loaded setup UI if(_dictionaryLoaded && _themeLoaded) { clearInterval(_DataLoadCheckIntervalID); setupUI(); checkUILoaded(); - - } else if(_dataLoadCheckCount >= DATA_LOAD_CHECK_TIMEOUT_COUNT) { Debugger.log('reached timeout waiting for data to load.',Debugger.CRITICAL,'checkUILoaded','Application'); clearInterval(_UILoadCheckIntervalID); - - } } } @@ -287,9 +281,7 @@ }else { //If UI loaded check which events can be broadcast if(_UILoaded){ - //Debugger.log('ALL UI LOADED, waiting for all true to dispatch init events: _dictionaryLoaded:'+_dictionaryLoaded+'_themeLoaded:'+_themeLoaded ,Debugger.GEN,'checkUILoaded','Application'); - - //If dictionary is loaded and event hasn't been dispatched - dispatch it + //If dictionary is loaded and event hasn't been dispatched - dispatch it if(_dictionaryLoaded && !_dictionaryEventDispatched){ _dictionaryEventDispatched = true; _dictionary.broadcastInit(); @@ -313,6 +305,7 @@ msg+=Dictionary.getValue("app_fail_continue"); var e:LFError = new LFError(msg,"Canvas.setDroppedTemplateActivity",this,'_themeEventDispatched:'+_themeEventDispatched+' _dictionaryEventDispatched:'+_dictionaryEventDispatched); e.showErrorAlert(); + //todo: give the user a message clearInterval(_UILoadCheckIntervalID); } @@ -372,7 +365,7 @@ _ccm.showCustomCM(_ccm.loadMenu("application", "authoring")) //Create the application root - _appRoot_mc = _container_mc.createEmptyMovieClip('appRoot_mc',APP_ROOT_DEPTH); + _appRoot_mc = _container_mc.createEmptyMovieClip('appRoot_mc', APP_ROOT_DEPTH); //Create screen elements _dialogueContainer_mc = _container_mc.createEmptyMovieClip('_dialogueContainer_mc',DIALOGUE_DEPTH); @@ -576,7 +569,6 @@ public function cut():Void{ - trace("testing cut"); var ca = _canvas.model.selectedItem if (CanvasActivity(ca) != null){ if (ca.activity.parentUIID == null || ca.activity.parentUIID == undefined){ @@ -591,7 +583,6 @@ } public function copy():Void{ - trace("testing copy"); var ca = _canvas.model.selectedItem if (CanvasActivity(ca) != null){ if (ca.activity.parentUIID == null || ca.activity.parentUIID == undefined){ @@ -605,7 +596,6 @@ } public function openEditActivtiyContent():Void{ - trace("testing openEditActivtiyContent"); var ca = _canvas.model.selectedItem if (CanvasActivity(ca) != null){ _canvas.view.getController().activityDoubleClick(ca); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -rca5d6a85e553398cbfbb1b05a41b5c50de33fcd3 -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision ca5d6a85e553398cbfbb1b05a41b5c50de33fcd3) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -195,7 +195,7 @@ activityComplexLayer = content.createEmptyMovieClip("_activityComplexLayer_mc", content.getNextHighestDepth()); activityLayer = content.createEmptyMovieClip("_activityLayer_mc", content.getNextHighestDepth()); - transparentCover = content.createClassObject("Panel", "_transparentCover_mc", content.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50}); + transparentCover = content.createClassObject(Panel, "_transparentCover_mc", content.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50}); transparentCover.onPress = null; bkg_pnl.onRelease = function(){ @@ -509,7 +509,8 @@ canvas_scp.setSize(s.w,s.h); bkg_pnl.setSize(s.w, s.h); - + transparentCover.setSize(s.w, s.h); + //Create the grid. The gris is re-drawn each time the canvas is resized. grid_mc = Grid.drawGrid(gridLayer,Math.round(s.w),Math.round(s.h),V_GAP,H_GAP); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as =================================================================== diff -u -r07d4a7ad4a915dbc625048153e29e2f731b09edb -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision 07d4a7ad4a915dbc625048153e29e2f731b09edb) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -409,10 +409,10 @@ public function checkValidDesign(){ if(_ddm.validDesign){ - Application.getInstance().getToolbar().setButtonState('preview',true); + Application.getInstance().getToolbar().setButtonState('preview_btn',true); LFMenuBar.getInstance().enableExport(true); }else{ - Application.getInstance().getToolbar().setButtonState('preview',false); + Application.getInstance().getToolbar().setButtonState('preview_btn',false); LFMenuBar.getInstance().enableExport(false); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -r040a7f802674100a097d8bf608a718165a4a4104 -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 040a7f802674100a097d8bf608a718165a4a4104) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -401,6 +401,7 @@ seqAct.groupingSupportType = Activity.GROUPING_SUPPORT_OPTIONAL; seqAct.activityCategoryID = Activity.CATEGORY_SYSTEM; seqAct.orderID = 1; + seqAct.stopAfterActivity = true; if(parent != null) { seqAct.parentActivityID = parent.activityID; @@ -661,6 +662,7 @@ //add it to the DDM if(b instanceof LFError) { + b.sequenceActivity.stopAfterActivity = false; return b; } else if(b != null){ var success:Object = _cv.ddm.addBranch(Branch(b)); @@ -855,6 +857,7 @@ return new LFError("Cannot create end-branch connection to an unconnected Sequence.", "createBranchStartConnector", this); } else { return new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_TO_END, fromAct.activityUIID, activeView.endHub.activity.activityUIID, sequence, _cv.ddm.learningDesignID); + } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as (.../Toolbar.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as (.../Toolbar.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -97,6 +97,24 @@ } } + public function disableAll() { + Debugger.log("disabling all", Debugger.CRITICAL, "disableAll", "Toolbar"); + enableAll(false); + } + + public function enableAll(a:Boolean) { + if(a == null) a = true; + var buttons:Array = toolbarView.toolbarMenu; + + Debugger.log("disabling all", Debugger.CRITICAL, "disableAll", "Toolbar"); + + + for(var i=0; i < buttons.length; i++) { + + setButtonState(buttons[i]._name, a); + } + } + public function setButtonState(btnName:String, btnState:Boolean){ toolbarModel.setButtonState(btnName, btnState); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as (.../ToolbarModel.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as (.../ToolbarModel.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -105,15 +105,14 @@ infoObj.data = buttonArr; notifyObservers(infoObj); - } /** * set the button state to enabled/disabled and set a changed flag and notify view and controller. */ public function setDefaultState(){ Debugger.log('setDefaultState is called: ',Debugger.GEN,'setDefaultState','Toolbar'); - setButtonState("preview", false) + setButtonState("preview_btn", false) } /** Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as =================================================================== diff -u -r30b7641a18c8c83b3722fc22bb936d54f4eaa18b -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision 30b7641a18c8c83b3722fc22bb936d54f4eaa18b) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as (.../ToolbarView.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -334,10 +334,7 @@ */ private function setState(tm:ToolbarModel, infoObj:Object):Void{ Debugger.log('button name in setButtonState is : '+infoObj.button, Debugger.GEN,'setState','ToolbarView'); - if (infoObj.button == "preview"){ - - this.preview_btn.enabled = infoObj.buttonstate; - } + this[infoObj.button].enabled = infoObj.buttonstate; } public function showToolTip(btnObj, btnTT:String):Void{ @@ -416,5 +413,9 @@ */ public function defaultController (model:Observable):Controller { return new ToolbarController(model); - } + } + + public function get toolbarMenu():Array { + return _toolbarMenu; + } } Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as =================================================================== diff -u -r8ad16270f3ad03c45a8aa73353d6485bd2631a1c -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as (.../AlertDialog.as) (revision 8ad16270f3ad03c45a8aa73353d6485bd2631a1c) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as (.../AlertDialog.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -45,6 +45,7 @@ public static var CONFIRM:Number = 1; private var _bgpanel:MovieClip; + private var _bgcolor:Color; private var ok_btn:Button; //OK+Cancel buttons private var cancel_btn:Button; @@ -56,17 +57,18 @@ private var _cancelHandler:Function; private var _type:Number; - + + private var app:Object; private var fm:FocusManager; //Reference to focus manager private var themeManager:ThemeManager; //Theme manager + + private var transparentCover:MovieClip; - //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher private var dispatchEvent:Function; public var addEventListener:Function; public var removeEventListener:Function; - /** * constructor */ @@ -75,6 +77,8 @@ EventDispatcher.initialize(this); this._visible = false; + + app = ApplicationParent.getInstance(); //set the reference to the StyleManager themeManager = ThemeManager.getInstance(); @@ -109,6 +113,8 @@ else setPosition(Stage.width/2 - _parent._x, Stage.height/2 - _parent._y); + addTransparentLayer(ApplicationParent.root); + contentLoaded(); } @@ -117,11 +123,23 @@ * method called by content when it is loaded */ public function contentLoaded() { - this._visible = true; - //dispatch an onContentLoaded event to listeners dispatchEvent({type:'contentLoaded',target:this}); } + + private function addTransparentLayer(target:MovieClip) { + var styleObj = themeManager.getStyleObject('CanvasPanel'); + + transparentCover = target.createClassObject(Panel, "transparentCover", this.getDepth()-1, {_visible: true, enabled: false, _alpha: 15, _width: Stage.width, _height: Stage.height, styleName: styleObj}); + transparentCover.onPress = null; + + org.lamsfoundation.lams.authoring.Application.getInstance().getToolbar().disableAll(); + } + + private function removeTransparentLayer() { + transparentCover.removeMovieClip(); + org.lamsfoundation.lams.authoring.Application.getInstance().getToolbar().enableAll(); + } public function setOKButton(lbl:String,fn:Function){ if(lbl != null) { @@ -243,7 +261,13 @@ _title.setStyle("styleName", styleObj); _title.setStyle("disabledColor", "0xFFFFFF"); - + + styleObj = themeManager.getStyleObject('AlertDialog'); + var colorTransform = styleObj.colorTransform; + + _bgcolor = new Color(_bgpanel); + _bgcolor.setTransform(colorTransform); + } /** Fade out on click if normal Alert (not Confirm)*/ @@ -267,8 +291,10 @@ private function cancel(){ Debugger.log('cancel click',Debugger.GEN,'cancel','org.lamsfoundation.lams.common.ui.InputDialog'); + _cancelHandler(); + + removeTransparentLayer(); this.removeMovieClip(); - _cancelHandler(); } /** @@ -277,15 +303,18 @@ public function ok(){ Debugger.log('ok click',Debugger.GEN,'ok','org.lamsfoundation.lams.common.ui.InputDialog'); - _okHandler(); + _okHandler(); + + removeTransparentLayer(); this.removeMovieClip(); } /** * If an alert was spawned by this dialog this method is called when it's closed */ - private function alertClosed(){ - this.removeMovieClip(); + private function alertClosed(){ + removeTransparentLayer(); + this.removeMovieClip(); } /** Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as =================================================================== diff -u -r8ad16270f3ad03c45a8aa73353d6485bd2631a1c -rea5dd39341c9597a297fe0e292479b5e184196c5 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as (.../Dialog.as) (revision 8ad16270f3ad03c45a8aa73353d6485bd2631a1c) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as (.../Dialog.as) (revision ea5dd39341c9597a297fe0e292479b5e184196c5) @@ -115,7 +115,7 @@ evt.target.setCancelButton(_inputCancelButtonLabel,_inputCancelHandler); evt.target.type = (_inputType != null) ? _inputType : AlertDialog.ALERT; - + evt.target._visible = true; } } \ No newline at end of file