Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== diff -u -r92689d7e29f66c0e0d5c3783d2f6c0af6e0755b8 -ra6bbf35a54791ce4c1cd0145bd9231099abea446 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 92689d7e29f66c0e0d5c3783d2f6c0af6e0755b8) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision a6bbf35a54791ce4c1cd0145bd9231099abea446) @@ -94,7 +94,7 @@ //let it wait one frame to set up the components. MovieClipUtils.doLater(Proxy.create(this,init)); - //_dictionary = Dictionary.getInstance(); + _dictionary = Dictionary.getInstance(); //_dictionary.addEventListener('init',Proxy.create(this,setupLabels)); } @@ -202,6 +202,7 @@ //its a gate showGroupingControls(false); showToolActivityControls(false); + showOptionalControls(false); showGateControls(true); showAppliedGroupingControls(true); showGateActivityProperties(GateActivity(a)); @@ -211,7 +212,9 @@ title_txt.text = StringUtils.cleanNull(a.title); }else if(a.isGroupActivity()){ //its a grouping activity + showGroupingControls(true); + showOptionalControls(false); showRelevantGroupOptions(); showToolActivityControls(false); showGateControls(false); @@ -221,19 +224,6 @@ //show the title title_txt.text = StringUtils.cleanNull(a.title); - }else if(a.isOptionalActivity()){ - //its an optional activity - showOptionalControls(true); - showGroupingControls(false); - //showRelevantGroupOptions(); - showToolActivityControls(false); - showGateControls(false); - showAppliedGroupingControls(true); - populateGroupingProperties(GroupingActivity(a)); - showAppliedGroupingProperties(a); - //show the title - title_txt.text = StringUtils.cleanNull(a.title); - }else{ //its a tool activity showOptionalControls(false); @@ -248,19 +238,36 @@ } + }else if(CanvasOptionalActivity(cm.selectedItem) != null){ + var co = CanvasOptionalActivity(cm.selectedItem); + var cca:ComplexActivity = ComplexActivity(co.activity); + //its an optional activity + showOptionalControls(true); + showGroupingControls(false); + //showRelevantGroupOptions(); + showToolActivityControls(false); + showGateControls(false); + showAppliedGroupingControls(true); + populateGroupingProperties(GroupingActivity(cca)); + showAppliedGroupingProperties(cca); + showOptionalActivityProperties(cca); + //show the title + title_txt.text = StringUtils.cleanNull(cca.title); + }else if(CanvasTransition(cm.selectedItem) != null){ var ct = CanvasTransition(cm.selectedItem); var t:Transition = ct.transition; Debugger.log('Its a canvas transition',4,'updateItemProperties','PropertyInspector'); showTransitionProperties(t); - + showOptionalControls(false); showGroupingControls(false); showToolActivityControls(false); showGateControls(false); }else{ Debugger.log('Its a something we dont know',Debugger.CRITICAL,'updateItemProperties','PropertyInspector'); + showOptionalControls(false); showGroupingControls(false); showToolActivityControls(false); showGateControls(false); @@ -284,6 +291,20 @@ } + private function showOptionalActivityProperties(ca:ComplexActivity){ + + + toolDisplayName_lbl.text = Dictionary.getValue('pi_optional_title'); + //title_txt.text = StringUtils.cleanNull(ta.title); + //desc_txt.text = StringUtils.cleanNull(ta.description); + runOffline_chk.selected = ca.runOffline; + defineLater_chk.selected = ca.defineLater; + + currentGrouping_lbl.text = "GroupingUIID:"+StringUtils.cleanNull(ca.runOffline.groupingUIID); + + + } + private function showGateActivityProperties(ga:GateActivity){ toolDisplayName_lbl.text = Dictionary.getValue('pi_activity_type_gate'); //loop through combo to fins SI of our gate activity type @@ -622,7 +643,6 @@ bar_pnl.setStyle('styleName',styleObj); - } //Gets+Sets