diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 5f139285..3b6ac9f0 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -957,16 +957,19 @@ namespace Volian.Controls.Library private string ConvertSpecialChars(string str) { string rtnVal = str; - rtnVal = rtnVal.Replace("\u00A0", @"\u160?"); //convert \u00A0 to a hard space (\u00A0 shows as a blank in the search text field) - rtnVal = rtnVal.Replace("\n", ""); - FormatData fmtdata = _MyDocVersion.ActiveFormat.PlantFormat.FormatData; - SymbolList sl = fmtdata.SymbolList; - if (sl != null) + if (_MyDocVersion != null) { - foreach (Symbol sym in sl) + rtnVal = rtnVal.Replace("\u00A0", @"\u160?"); //convert \u00A0 to a hard space (\u00A0 shows as a blank in the search text field) + rtnVal = rtnVal.Replace("\n", ""); + FormatData fmtdata = _MyDocVersion.ActiveFormat.PlantFormat.FormatData; + SymbolList sl = fmtdata.SymbolList; + if (sl != null) { - string rplace = string.Format(sym.Unicode < 256 ? @"\'{0:X2}" : @"\u{0}", sym.Unicode); - rtnVal = rtnVal.Replace(((char)sym.Unicode).ToString(), rplace); + foreach (Symbol sym in sl) + { + string rplace = string.Format(sym.Unicode < 256 ? @"\'{0:X2}" : @"\u{0}", sym.Unicode); + rtnVal = rtnVal.Replace(((char)sym.Unicode).ToString(), rplace); + } } } return rtnVal; @@ -1017,7 +1020,9 @@ namespace Volian.Controls.Library //TypesSelected = "Step Types Searched: " + ((typstr != null) ? typstr : "all step types"); //TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "all step types"); //TypesSelected = (typstr != null) ? "Searched Step Types: " + typstr : "Searched All Step Types"; - string unitPrefix = Mydocversion.DocVersionConfig.Unit_ProcedureNumber; + string unitPrefix = ""; + if(Mydocversion != null) + unitPrefix = Mydocversion.DocVersionConfig.Unit_ProcedureNumber; if (unitPrefix.EndsWith("#")) unitPrefix = unitPrefix.Replace("#", ""); @@ -1291,16 +1296,20 @@ namespace Volian.Controls.Library { if (lstCheckedDocVersions.Count == 0) { - xpSetToSearch.Expanded = true; - xpSetToSearch.TitleStyle.BackColor1.Color = Color.Crimson; - btnSearch.Enabled = false; - tabSearchTypes.Enabled = false; // disable all the search tabs - //if (xpSetToSearch.Expanded) - xpSetToSearch.TitleText = "Select Procedure Sets to Search"; - //else - // xpSetToSearch.TitleText = "Click Here to Select Procedure Sets"; + xpSetToSearch.TitleText = string.Format("All Procedure Sets Selected"); + xpSetToSearch.TitleStyle.BackColor1.Color = Color.PapayaWhip; + btnSearch.Enabled = true; + tabSearchTypes.Enabled = true; // enable all the search tabs + // xpSetToSearch.Expanded = true; + // xpSetToSearch.TitleStyle.BackColor1.Color = Color.Crimson; + // btnSearch.Enabled = false; + // tabSearchTypes.Enabled = false; // disable all the search tabs + // //if (xpSetToSearch.Expanded) + // xpSetToSearch.TitleText = "Select Procedure Sets to Search"; + // //else + // // xpSetToSearch.TitleText = "Click Here to Select Procedure Sets"; - //xpSetToSearch.TitleStyle.BackColor1.Color = saveXpSetToSearchColor; + // //xpSetToSearch.TitleStyle.BackColor1.Color = saveXpSetToSearchColor; } else //if (lstCheckedDocVersions.Count > 0) {