This commit is contained in:
parent
8abee9cea2
commit
924b84475e
@ -49,14 +49,15 @@ namespace VEPROMS
|
||||
public DocVersionInfo SelectedDVI
|
||||
{
|
||||
get { return _SelectedDVI; }
|
||||
set
|
||||
{
|
||||
if (_SelectedDVI != value)
|
||||
{
|
||||
_SelectedDVI = value;
|
||||
_SelectedROFst = null;
|
||||
}
|
||||
}
|
||||
set
|
||||
{
|
||||
if (_SelectedDVI != value)
|
||||
{
|
||||
_SelectedDVI = value;
|
||||
_SelectedROFst = null;
|
||||
}
|
||||
InitiateSearch(false);
|
||||
}
|
||||
}
|
||||
// TODO: Should the following be an info
|
||||
// For the initial release, we are assuming there will be only one rofst fro a docversion. Changes
|
||||
@ -126,8 +127,6 @@ namespace VEPROMS
|
||||
_MyBookMarks = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["BookMarks"]));
|
||||
SetupMRU();
|
||||
SetupBookMarks();
|
||||
//CtrlAnnotationSearch.SetupAnnotationSearch(ctrlAnnotationDetails, tc);
|
||||
//ctrlAnnotationDetails.SetupAnnotations(CtrlAnnotationSearch);
|
||||
displaySearch1.SetupAnnotationSearch(ctrlAnnotationDetails, tc);
|
||||
ctrlAnnotationDetails.SetupAnnotations(displaySearch1);
|
||||
|
||||
@ -695,12 +694,8 @@ namespace VEPROMS
|
||||
/// <param name="e"></param>
|
||||
private void btnGlbSrch_Click(object sender, EventArgs e)
|
||||
{
|
||||
//infoPanel.Expanded = true;
|
||||
//infoTabs.SelectedTab = toolstabResults;
|
||||
//btnSrchRslt.Checked = true;
|
||||
toolsPanel.Expanded = true;
|
||||
toolsTabs.SelectedTab = toolstabResults;
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
@ -1182,13 +1177,21 @@ namespace VEPROMS
|
||||
private void infotabResults_Click(object sender, EventArgs e)
|
||||
{
|
||||
toolsPanel.Expanded = true;
|
||||
if (SelectedDVI != null)
|
||||
{
|
||||
displaySearch1.Mydocversion = SelectedDVI;
|
||||
displaySearch1.advTreeStepTypesFillIn();
|
||||
}
|
||||
displaySearch1.advTreeProcSetsFillIn();
|
||||
InitiateSearch(true);
|
||||
}
|
||||
|
||||
private void InitiateSearch(bool searchFocus)
|
||||
{
|
||||
if (displaySearch1.Mydocversion == null)//!displaySearch1.OpenDocFromSearch)
|
||||
{
|
||||
if (SelectedDVI != null)
|
||||
{
|
||||
displaySearch1.Mydocversion = SelectedDVI;
|
||||
displaySearch1.advTreeStepTypesFillIn();
|
||||
}
|
||||
displaySearch1.advTreeProcSetsFillIn(searchFocus);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user