This commit is contained in:
parent
e3131bfff9
commit
4849d4aecf
@ -2803,10 +2803,12 @@ namespace Volian.Controls.Library
|
|||||||
MyItemInfo.MyContent.RefreshContentRoUsages();
|
MyItemInfo.MyContent.RefreshContentRoUsages();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Match mt = Regex.Match(Rtf, "Transition.*:.* <NewID>");
|
// Need to look for any 'New' transitions, don't include existing ones.
|
||||||
|
Match mt = Regex.Match(Rtf, @"#Link:Transition:([0-9]+) <NewID> ");
|
||||||
|
if (mt.Length <= 0) mt = Regex.Match(Rtf, @"#Link:TransitionRange:([0-9]+) <NewID> ");
|
||||||
if (mt.Length > 0)
|
if (mt.Length > 0)
|
||||||
{
|
{
|
||||||
indx = mt.Index;
|
indx = mt.Index+6; // get past '#Link:"
|
||||||
Match m = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*)\[END>");
|
Match m = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*)\[END>");
|
||||||
bool isSingleTran = true;
|
bool isSingleTran = true;
|
||||||
if (Rtf.Substring(indx, 16).IndexOf("TransitionRange") >= 0) isSingleTran = false;
|
if (Rtf.Substring(indx, 16).IndexOf("TransitionRange") >= 0) isSingleTran = false;
|
||||||
@ -2842,7 +2844,6 @@ namespace Volian.Controls.Library
|
|||||||
ContentTransition ct = itm.MyContent.ContentTransitions.Add(itm1, itm2);
|
ContentTransition ct = itm.MyContent.ContentTransitions.Add(itm1, itm2);
|
||||||
//Console.WriteLine("CT {0},{1},{2},{3}", ct.TransitionID, itm.ItemID, itm.MyContent.MyContentUnique, itm.MyContent.ContentTransitions.Count);
|
//Console.WriteLine("CT {0},{1},{2},{3}", ct.TransitionID, itm.ItemID, itm.MyContent.MyContentUnique, itm.MyContent.ContentTransitions.Count);
|
||||||
ct.TranType = type;
|
ct.TranType = type;
|
||||||
|
|
||||||
if (isSingleTran)
|
if (isSingleTran)
|
||||||
ct.IsRange = 0;
|
ct.IsRange = 0;
|
||||||
else if (tr1 != tr2)
|
else if (tr1 != tr2)
|
||||||
@ -2861,7 +2862,6 @@ namespace Volian.Controls.Library
|
|||||||
if (dispose2) itm2.Dispose();
|
if (dispose2) itm2.Dispose();
|
||||||
if (dispose1) itm1.Dispose();
|
if (dispose1) itm1.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
return Rtf;
|
return Rtf;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
Loading…
x
Reference in New Issue
Block a user