diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs index a4b0512b..b1b28aac 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs @@ -309,7 +309,7 @@ using System.Text.RegularExpressions; namespace ROEditor { - /// + /// /// Summary description for Form1. /// /// @@ -358,7 +358,7 @@ namespace ROEditor public static string[] PCChildren; //C2021-026 list of Parent/Child Children //private StepTabRibbon _MyStepTabRibbon; - public roRichTextBox CurrentTextBox + public roRichTextBox CurrentTextBox { get { return _CurrentTextBox; } set { _CurrentTextBox = value; } @@ -395,7 +395,7 @@ namespace ROEditor set { _duplicate_active = value; - // C2015-017 hide the label indicating user is working with a duplicate of an exiting RO + // C2015-017 hide the label indicating user is working with a duplicate of an exiting RO lblDuplicateRO.Visible = value; } } @@ -417,9 +417,9 @@ namespace ROEditor // InitializeComponent(); getSymbols(); // RO Editor add symbols C2022 - 003 - // B2019-082 set the date format on the VEPROMS.exe thread to U.S. for i/o of a date string - // this is to correct an issue for a UAE customer who could not open some procedures due to the desktop date setting using the "DD/MM/YYYY" instead of the "MM/DD/YYYY" format - // NOTE: not doing the "Using System.Threading;" statement at beginning of file because it conflicts with the declaration of the "Timer" variable + // B2019-082 set the date format on the VEPROMS.exe thread to U.S. for i/o of a date string + // this is to correct an issue for a UAE customer who could not open some procedures due to the desktop date setting using the "DD/MM/YYYY" instead of the "MM/DD/YYYY" format + // NOTE: not doing the "Using System.Threading;" statement at beginning of file because it conflicts with the declaration of the "Timer" variable System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US"); // The data path the was passed in. @@ -703,7 +703,7 @@ namespace ROEditor { VlnXmlElement curelemforNodeIter = (VlnXmlElement)nodeIter.Tag; if (curelemforNodeIter.Name != "RO_Root" && curelemforNodeIter.Name != "vlnGroup") - { +{ nodeIter.BackColor = MULTISELECTCOLOR; ROsSelectedforMultiMove.Add(nodeIter); } @@ -2070,7 +2070,7 @@ namespace ROEditor PCChildren = args[0].Substring(3).Split(','); //C2021-026 list of Parent/Child Children else ConnectionPath = args[0]; - // Directory.SetCurrentDirectory(ConnectionPath); +// Directory.SetCurrentDirectory(ConnectionPath); } if (ConnectionPath == null) // RO Path was not passed in, find ROPATH { @@ -2326,7 +2326,7 @@ namespace ROEditor testParadoxFile += "ROMASTER.DB"; // Paradox file testAccessFile += "ROMaster.mdb"; // Access file - // if (File.Exists(testParadoxFile)) + // if (File.Exists(testParadoxFile)) if (File.Exists(testParadoxFile) && !(File.Exists(testAccessFile) || UsingSQLServer(ROdir))) { // Display a message to the user that the data needs converted @@ -2422,7 +2422,7 @@ namespace ROEditor { roListView_ClearListDisplay(); bool didcleanup = false; // flags whether we needed to remove elements from trees - // to match xml data to tree. + // to match xml data to tree. VlnXmlElement curelem = (VlnXmlElement)roTreeView.SelectedNode.Tag; LoadKids(roTreeView.SelectedNode); if (curelem.Name == "vlnGroup") diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs index e321c8f0..5219a12b 100644 --- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs +++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs @@ -1279,7 +1279,7 @@ namespace ctlXMLEditLib // When leaving the textbox private void txtBox_Leave(object sender, EventArgs e) { - TextBox tb = sender as TextBox; + roRichTextBox tb = sender as roRichTextBox; string dfTxt = ""; try { @@ -1320,7 +1320,7 @@ namespace ctlXMLEditLib // so clear the textbox so that user can enter the value for that child private void txtBox_Enter(object sender, EventArgs e) { - TextBox tb = sender as TextBox; + roRichTextBox tb = sender as roRichTextBox; if (tb.ForeColor == SystemColors.GrayText) // currently no value set - using parent's value { tb.Text = ""; @@ -1547,7 +1547,6 @@ namespace ctlXMLEditLib public void btnZoom_click(object sender, System.EventArgs e) { - //TextBox tb = (TextBox) sender; TextBoxAttrTag tag; bool doimage = false; if (zoomtextbox.Tag != null) @@ -1591,7 +1590,7 @@ namespace ctlXMLEditLib // file local & keep width/height of file proportional. private void GraphicText_lostfocus(object sender, System.EventArgs e) { - TextBox fnamebox = (TextBox) sender; + roRichTextBox fnamebox = (roRichTextBox) sender; if (fnamebox.Text != "" && fnamebox.Modified == true) { FileInfo ifi = new FileInfo(fnamebox.Text); @@ -1800,7 +1799,7 @@ namespace ctlXMLEditLib // if changed height, calculate associated width private void GraphicsHt_lostfocus(object sender, System.EventArgs e) { - TextBox ht = (TextBox) sender; + roRichTextBox ht = (roRichTextBox) sender; if (ht.Modified == true) { try @@ -1817,7 +1816,7 @@ namespace ctlXMLEditLib // if changed width, calculate associated height private void GraphicsWd_lostfocus(object sender, System.EventArgs e) { - TextBox wd = (TextBox) sender; + roRichTextBox wd = (roRichTextBox) sender; if (wd.Modified == true) { try