Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2009-12-04 14:16:40 +00:00
parent b8344c8ca1
commit ecff8237a2
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
PROMS/Volian.Controls.Library/DisplayTransition.cs
View File

@ -657,7 +657,9 @@ namespace Volian.Controls.Library
private void tvTran_BeforeExpand(object sender, TreeViewCancelEventArgs e) private void tvTran_BeforeExpand(object sender, TreeViewCancelEventArgs e)
{ {
VETreeNode tn = ((VETreeNode)e.Node); VETreeNode tn = ((VETreeNode)e.Node);
tn.LoadChildren(false); // true fixes empty expand, but allows for transitions 'way down' in RNO tree. HVJ & PAL wanted to
// allow this (12/2/09)
tn.LoadChildren(true);
} }
private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e) private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e)
{ {
@ -703,6 +705,25 @@ namespace Volian.Controls.Library
private void tvTran_AfterSelect(object sender, TreeViewEventArgs e) private void tvTran_AfterSelect(object sender, TreeViewEventArgs e)
{ {
if (_InitializingTrans) return; if (_InitializingTrans) return;
// check if node is a true end-point, i.e. not a 'part' node. If part node, don't
// allow selection.
bool allowSave = false;
VETreeNode vt = tvTran.SelectedNode as VETreeNode;
if (vt != null)
{
ItemInfo ii = vt.VEObject as ItemInfo;
if (ii != null) allowSave = true;
}
if (!_DoingRange)
{
btnTranSave.Enabled = allowSave;
return;
}
if (!allowSave)
{
MessageBox.Show("Must select a valid step, not a grouping part such as 'RNO', 'Steps', etc");
return;
}
if (_DoingRange) if (_DoingRange)
{ {
if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null)) if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null))

5
PROMS/Volian.Controls.Library/LinkText.cs
View File

@ -26,7 +26,7 @@ namespace VEPROMS.CSLA.Library
case "ReferencedObject": case "ReferencedObject":
_MyParsedLinkType = ParsedLinkType.ReferencedObject; _MyParsedLinkType = ParsedLinkType.ReferencedObject;
string[] subs = m.Groups[3].Value.Split(" ".ToCharArray()); string[] subs = m.Groups[3].Value.Split(" ".ToCharArray());
if (subs[0] == "<NewID>") if (subs[0].IndexOf("CROUSGID")>-1)
_MyRoUsageInfo = null; _MyRoUsageInfo = null;
else else
{ {
@ -37,7 +37,8 @@ namespace VEPROMS.CSLA.Library
case "Transition": case "Transition":
case "TransitionRange": case "TransitionRange":
_MyParsedLinkType = (ParsedLinkType)Enum.Parse(_MyParsedLinkType.GetType(), m.Groups[2].Value); _MyParsedLinkType = (ParsedLinkType)Enum.Parse(_MyParsedLinkType.GetType(), m.Groups[2].Value);
if (m.Groups[3].Value.Split(" ".ToCharArray())[1] == "<NewID>") string[] subst = m.Groups[3].Value.Split(" ".ToCharArray());
if (subst[0].IndexOf("CTID") > -1)
_MyTransitionInfo = null; _MyTransitionInfo = null;
else else
{ {

6
PROMS/Volian.Controls.Library/StepRTB.cs
View File

@ -168,6 +168,12 @@ namespace Volian.Controls.Library
_SelectedRtfSB.Remove(0, _SelectedRtfSB.Length); _SelectedRtfSB.Remove(0, _SelectedRtfSB.Length);
DisplayText vlntxt = new DisplayText(_MyItemInfo, EpMode, VwMode, !edit, FieldToEdit); DisplayText vlntxt = new DisplayText(_MyItemInfo, EpMode, VwMode, !edit, FieldToEdit);
if (_origDisplayText != null && vlntxt.StartText == _origDisplayText.StartText)
{
ReadOnly = !(EpMode == E_EditPrintMode.Edit && VwMode == E_ViewMode.Edit);
if (!ReadOnly && !edit) ReadOnly = true;
return;
}
_origDisplayText = vlntxt; _origDisplayText = vlntxt;
#if(DEBUG) #if(DEBUG)
// Use Times New Roman for Debugging // Use Times New Roman for Debugging