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

Properly Save Text from DisplayText

Browse Source 
Fixed logic to support single character in a stepRTB
(Fixed 127) Corrected code to deal with null AERStepItem
Added code to respond to a Right Arrow for steps that don't have RNOs
Changed KeyDown (Keys.Down) logic to support a Hard-Return at the end of a StepRTB
This commit is contained in:
Rich
2010-10-19 15:55:08 +00:00
parent 4e8b7932bd
commit 8f110a10e3
4 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PROMS/Volian.Controls.Library/DisplayText.cs
View File

@@ -362,12 +362,7 @@ namespace Volian.Controls.Library
_MyItem.DTS = DateTime.Now;
_MyItem.UserID = Environment.UserName;
// Do the Save once rather than multiple times
bool saveAtOnce = false;
// If it is a new Item, save it before the transitions and ROs are saved
if (_MyItem.ItemID < 0)
_MyItem.Save();
else
saveAtOnce = true;
_MyItem.Save();
if (ctReplacements.Count > 0)
{
EditText = FixCtReplacements(EditText, ctReplacements);
@@ -375,15 +370,13 @@ namespace Volian.Controls.Library
foreach (ContentTransition ct in ctReplacements.Values)
using (TransitionInfo tran = TransitionInfo.Get(ct.TransitionID))
_MyItem.MyContent.FixTransitionText(tran);
saveAtOnce = true;
_MyItem.Save();
}
if (roUsgReplacements.Count > 0)
{
EditText = FixRoUsgReplacements(EditText, roUsgReplacements);
saveAtOnce = true;
}
if(saveAtOnce)
_MyItem.Save();
}
modtext = EditText;
}
else
@@ -783,10 +776,9 @@ namespace Volian.Controls.Library
retval = Regex.Replace(retval, @"(\\[^' \\?\r\n\t]+) (?=\\)", "$1"); // remove space between tokens
retval = Regex.Replace(retval, @"(\\[^' \\?\r\n\t]+) (?=\r\n)", "$1"); // remove space before /r/n
// remove \r\n at end of string if the string has 2 or more characters
if (retval.Length > 1 && retval.Substring(retval.Length - 2, 2) == "\r\n") retval = retval.Remove(retval.Length - 2, 2);
if (retval.EndsWith("\r\n")) retval = retval.Remove(retval.Length - 2, 2);
if (retval.Length == 0) return "";
if (retval.Substring(retval.Length - 2, 2) == @"\v") retval = retval.Remove(retval.Length - 2, 2);
if (retval.EndsWith(@"\v")) retval = retval.Remove(retval.Length - 2, 2);
retval = _MyItemInfo.RemoveRtfStyles(retval); // RemoveRtfStyles(retval);
retval = retval.Replace(@"(![", @"\{");
retval = retval.Replace(@"(!]", @"\}");