Changed the “Search RO Text” checkbox label to “Search RO and Transition Text” (B2016-110)

Fixed null reference issues when adding/deleting Figures off of Figures (B2016 -111)
Added a public method that will set the cursor focus to the Find Text box when Find/Replace is first started (B2016-107)
When a new Figure substep is added, the Step Properties Panel is automatically opened with the RO tab selected.  Changed the RO button in Step Structure grouping of the Insert tab to read “RO Figure”.
This commit is contained in:
John Jenko 2016-05-13 19:00:03 +00:00
parent 65ad595afc
commit 5942d14798
5 changed files with 18 additions and 7 deletions

View File

@ -466,11 +466,10 @@ namespace Volian.Controls.Library
this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbxIncROTextSrch.Location = new System.Drawing.Point(9, 26);
this.cbxIncROTextSrch.Name = "cbxIncROTextSrch";
this.cbxIncROTextSrch.Size = new System.Drawing.Size(112, 15);
this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO Text", "", "When this box is checked, Search will find matches of RO text. This finds matche" +
"s whether the matched text is an inserted RO or entered as text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbxIncROTextSrch.Size = new System.Drawing.Size(172, 15);
this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbxIncROTextSrch.TabIndex = 5;
this.cbxIncROTextSrch.Text = "Search RO Text";
this.cbxIncROTextSrch.Text = "Search RO and Transition Text";
//
// cbxCaseSensitive
//

View File

@ -578,11 +578,12 @@ namespace Volian.Controls.Library
EditItem lastChild = LastChild(siblingEditItems);
siblingEditItems.Add(this);
MyPreviousEditItem = lastChild;
if (MyParentEditItem == null) MyParentEditItem = parentEditItem;
}
else // Add to the middle of the list before a particular item
{
EditItem prevChild = nextEditItem.MyPreviousEditItem;
EditItem parent = nextEditItem.MyParentEditItem;
EditItem parent = nextEditItem.MyParentEditItem??parentEditItem;
if(siblingEditItems.Contains(nextEditItem))
siblingEditItems.Insert(siblingEditItems.IndexOf(nextEditItem), this);
else
@ -591,7 +592,7 @@ namespace Volian.Controls.Library
_MyNextEditItem = nextEditItem;
nextEditItem._MyPreviousEditItem = this;
MyPreviousEditItem = prevChild;// If a previous exists - this will adjust the location and width of the EditItem
nextEditItem.MyParentEditItem = null;
//nextEditItem.MyParentEditItem = null; // jsj 5-13-2016 commented out got null referenced error when deleting an empty figure type substep
MyParentEditItem = parent; // If a parent exists - this will adjust the location and width of the EditItem
//nextEditItem.MyPreviousEditItem = this;
MyStepPanel.ItemMoving--;

View File

@ -127,6 +127,11 @@ namespace Volian.Controls.Library
// cmboFindText.Focus();
//}
// bug fix: B2016-107, when Find/Replace is initially opened, set the cursor focus to the Find Text box (called from frmVEPROMS.cs)
public void SetFocusToTextBox()
{
cmboFindText.Focus();
}
private void btnReplace_Click(object sender, EventArgs e)
{

View File

@ -975,6 +975,8 @@ namespace Volian.Controls.Library
else
{
_MyEditItem.AddChild((E_FromType)fromtype, contenttype);
if (_MyEditItem.MyItemInfo.IsFigure)
btnInsRO_Click(sender, e); // open the step properties RO tab when a figure substep is added
}
}
@ -1056,11 +1058,15 @@ namespace Volian.Controls.Library
private void btnInsBefore_Click(object sender, EventArgs e)
{
_MyEditItem.AddSiblingBefore();
if (_MyEditItem.MyItemInfo.IsFigure)
btnInsRO_Click(sender, e); // open the step properties RO tab when a figure substep is added
}
private void btnInsAfter_Click(object sender, EventArgs e)
{
_MyEditItem.AddSiblingAfter();
if (_MyEditItem.MyItemInfo.IsFigure)
btnInsRO_Click(sender, e); // open the step properties RO tab when a figure substep is added
}
/// <summary>
/// Using style for step type, enable/disable formatting buttons
@ -2079,7 +2085,7 @@ namespace Volian.Controls.Library
{
StartGridEditing(SelectionOption.Start);
// see if user is positioned 'on' an ReferencedObject within the rtb, if so do a modify, otherwise,
// insert transition.
// insert referenced object.
StepTabPanel tmp = Parent as StepTabPanel;
tmp.MyDisplayTabControl.OnLinkModifyRO(this, new StepPanelLinkEventArgs(MyStepRTB.MyLinkText));
}