diff --git a/PROMS/Volian.Controls.Library/DSOTabPanel.cs b/PROMS/Volian.Controls.Library/DSOTabPanel.cs index 9d0fc98d..ad5f62bb 100644 --- a/PROMS/Volian.Controls.Library/DSOTabPanel.cs +++ b/PROMS/Volian.Controls.Library/DSOTabPanel.cs @@ -8,6 +8,7 @@ using System.Windows.Forms; using VEPROMS.CSLA.Library; using Volian.Controls.Library; using System.Reflection; +using LBWordLibrary; namespace Volian.Controls.Library @@ -26,6 +27,12 @@ namespace Volian.Controls.Library private DSOFile _DSOFile; #endregion #region Public Properties + private String _SearchString; + public String SearchString + { + get { return _SearchString; } + set { _SearchString = value; FindSearchString(); } + } /// /// Count of DSO Pages open. Limited to 18 in DisplayTabControl /// @@ -131,6 +138,8 @@ namespace Volian.Controls.Library this.Leave += new EventHandler(DSOTabPanel_Leave); //this.GotFocus += new EventHandler(DSOTabPanel_GotFocus); //this.LostFocus += new EventHandler(DSOTabPanel_LostFocus); + Application.DoEvents(); + FindSearchString(); } catch (Exception ex) { @@ -140,7 +149,16 @@ namespace Volian.Controls.Library // TODO: Should try to do a direct open using Word. } } - + public void FindSearchString() + { + // Get the Document + LBDocumentClass wordDoc = new LBDocumentClass(_MyDSOFramer.ActiveDocument); + //LBSelection sel = wordDoc.Application.Selection; + LBFind find = wordDoc.Application.Selection.Find; + find.ClearFormatting(); + bool wildCards = SearchString.Contains("?") || SearchString.Contains("*"); + Console.WriteLine("find = {0}", find.Execute(SearchString, false, false, wildCards, false, false, true, LBWdFindWrap.wdFindContinue,null,null,null,false,false,false,false)); + } private string ShowException(Exception ex) { string sep = "\r\n "; diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index fbe859f1..5d5a6f06 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -612,7 +612,9 @@ namespace Volian.Controls.Library if (_ItemInfo != null) { _OpenDocFromSearch = true; - _TabControl.OpenItem(_ItemInfo); // open the corresponding procedure text + DisplayTabItem dti = _TabControl.OpenItem(_ItemInfo); // open the corresponding procedure text + if (dti.MyDSOTabPanel != null) + dti.MyDSOTabPanel.SearchString = this.cbxTextSearchText.Text; _OpenDocFromSearch = false; } }