Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -red9f070b260cd96e225c1f5bfcf6fe357f90645b -r74a445235e221c4f913040bb71336c990d54db9b
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -red9f070b260cd96e225c1f5bfcf6fe357f90645b -r74a445235e221c4f913040bb71336c990d54db9b
Binary files differ
Index: lams_flash/src/central/flash/lams_authoring.fla
===================================================================
diff -u -rbcf9450991007fe65f3b373b83da167905ba3fd0 -r74a445235e221c4f913040bb71336c990d54db9b
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e -r74a445235e221c4f913040bb71336c990d54db9b
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 4bc848a9453ad7ee50f0c8dc41f058451ca5838e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 74a445235e221c4f913040bb71336c990d54db9b)
@@ -452,9 +452,10 @@
}
private function showOptionalActivityProperties(ca:ComplexActivity){
- if(ca.isSequenceBased) return showOptionalSequenceActivityProperties(ca);
+ if(ca.isSequenceBased) showOptionalSequenceActivityProperties(ca);
- toolDisplayName_lbl.text = ""+Dictionary.getValue('pi_title')+" - "+Dictionary.getValue('pi_optional_title');
+ toolDisplayName_lbl.text = (!ca.isSequenceBased) ? ""+Dictionary.getValue('pi_title')+" - "+Dictionary.getValue('pi_optional_title')
+ : toolDisplayName_lbl.text = ""+Dictionary.getValue('pi_title')+" - "+Dictionary.getValue('opt_activity_seq_title');
runOffline_chk.selected = ca.runOffline;
defineLater_chk.selected = ca.defineLater;
@@ -475,10 +476,10 @@
}
private function showOptionalSequenceActivityProperties(ca:ComplexActivity){
- toolDisplayName_lbl.text = ""+Dictionary.getValue('pi_title')+" - "+Dictionary.getValue('opt_activity_seq_title');
+ //toolDisplayName_lbl.text = ""+Dictionary.getValue('pi_title')+" - "+Dictionary.getValue('opt_activity_seq_title');
- runOffline_chk.selected = ca.runOffline;
- defineLater_chk.selected = ca.defineLater;
+ //runOffline_chk.selected = ca.runOffline;
+ //defineLater_chk.selected = ca.defineLater;
if(ca.noSequences == undefined)
noSeqAct_cmb.selectedIndex = 0;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c -r74a445235e221c4f913040bb71336c990d54db9b
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 44e31ab62e679f0c173f0269d7ee6d306ca6eb2c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 74a445235e221c4f913040bb71336c990d54db9b)
@@ -192,8 +192,8 @@
runOffline_chk.label = Dictionary.getValue('pi_runoffline');
//Complex Activity
- min_lbl.text = Dictionary.getValue('pi_min_act');
- max_lbl.text = Dictionary.getValue('pi_max_act');
+ //min_lbl.text = Dictionary.getValue('pi_min_act');
+ //max_lbl.text = Dictionary.getValue('pi_max_act');
noSeqAct_lbl.text = Dictionary.getValue('pi_no_seq_act');
@@ -356,19 +356,13 @@
}
private function showOptionalSequenceControls(v:Boolean, e:Boolean){
- desc_lbl.visible = v;
- desc_txt.visible = v;
noSeqAct_lbl.visible = v;
noSeqAct_cmb.visible = v;
if(e != null) {
noSeqAct_cmb.enabled = e;
noSeqAct_lbl.enabled = e;
- desc_lbl.enabled = e;
- desc_txt.enabled = e;
}
-
- grouping_lbl.visible = false;
}
@@ -401,34 +395,42 @@
}
private function checkEnableOptionalControls(e:Boolean):Void {
-
+ if(e != null) {
+ minAct_stp.enabled = e;
+ maxAct_stp.enabled = e;
+ } else {
+ minAct_stp.enabled = true;
+ maxAct_stp.enabled = true;
+ }
+
if(CanvasOptionalActivity(_canvasModel.selectedItem).type == CanvasOptionalActivity.SEQ_TYPE) {
if(e != null)
noSeqAct_cmb.enabled = e;
else
noSeqAct_cmb.enabled = true;
+
- MovieClipUtils.doLater(Proxy.create(this,showOptionalControlsLater, true));
- } else {
- if(e != null) {
- minAct_stp.enabled = e;
- maxAct_stp.enabled = e;
- } else {
- minAct_stp.enabled = true;
- maxAct_stp.enabled = true;
- }
+ MovieClipUtils.doLater(Proxy.create(this, showOptionalControlsLater, true));
+ } else {
MovieClipUtils.doLater(Proxy.create(this, showOptionalControlsLater, false));
}
-
}
private function showOptionalControlsLater(isSequence:Boolean):Void {
- if(isSequence)
+ if(isSequence) {
+ min_lbl.text = Dictionary.getValue('pi_min_act', [Dictionary.getValue('pi_seq')]);
+ max_lbl.text = Dictionary.getValue('pi_max_act', [Dictionary.getValue('pi_seq')]);
+
MovieClipUtils.doLater(Proxy.create(this, showOptionalSequenceControls, true));
- else
MovieClipUtils.doLater(Proxy.create(this, showOptionalActivityControls, true));
+ } else {
+ min_lbl.text = Dictionary.getValue('pi_min_act', [Dictionary.getValue('pi_act')]);
+ max_lbl.text = Dictionary.getValue('pi_max_act', [Dictionary.getValue('pi_act')]);
+
+ MovieClipUtils.doLater(Proxy.create(this, showOptionalActivityControls, true));
+ }
}
private function showGateControls(v:Boolean, e:Boolean){