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

Corrected lookup of UserName to use ToUpper

Browse Source 
Added code to support Text vs RTF content
This commit is contained in:
Rich 2011-02-14 21:54:41 +00:00
parent 5786528a44
commit 1b58295cfe
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -111,7 +111,7 @@ namespace VEPROMS
//use local data (for development/debug mode) //use local data (for development/debug mode)
if (Environment.MachineName == "RMARK-PC") if (Environment.MachineName == "RMARK-PC")
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG"; VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
else if (Environment.UserName == "BODINE") else if (Environment.UserName.ToUpper() == "BODINE")
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEBUG"; VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_BODINE_DEBUG";
else else
VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL"; VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL";

7
PROMS/Volian.Controls.Library/GridItem.cs
View File

@ -371,8 +371,11 @@ namespace Volian.Controls.Library
CellRange cr = MyFlexGrid.GetMergedRange(r, c); CellRange cr = MyFlexGrid.GetMergedRange(r, c);
if (cr.r1 == r && cr.c1 == c) if (cr.r1 == r && cr.c1 == c)
{ {
myRTB.Rtf = MyFlexGrid.GetCellRTFString(r, c); string rtf = MyFlexGrid.GetCellRTFString(r, c);
if (rtf.StartsWith(@"{\rtf"))
myRTB.Rtf = rtf;
else
myRTB.Text = rtf;// RHM 20110214 This should not happen
//string strp = DisplayText.StaticStripRtfCommands((string)MyFlexGrid[r, c]); // probably still need to remove link stuff //string strp = DisplayText.StaticStripRtfCommands((string)MyFlexGrid[r, c]); // probably still need to remove link stuff
//strp = StepRTB.RemoveLinkComments(strp); //strp = StepRTB.RemoveLinkComments(strp);
sb.Append(myRTB.Text.Replace(@"\r\n", " ")); // strp.Replace(@"\r\n", " ")); sb.Append(myRTB.Text.Replace(@"\r\n", " ")); // strp.Replace(@"\r\n", " "));