From 5942d14798e6a53aa54ab7e6344e913743257bbd Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 May 2016 19:00:03 +0000 Subject: [PATCH] =?UTF-8?q?Changed=20the=20=E2=80=9CSearch=20RO=20Text?= =?UTF-8?q?=E2=80=9D=20checkbox=20label=20to=20=E2=80=9CSearch=20RO=20and?= =?UTF-8?q?=20Transition=20Text=E2=80=9D=20(B2016-110)=20Fixed=20null=20re?= =?UTF-8?q?ference=20issues=20when=20adding/deleting=20Figures=20off=20of?= =?UTF-8?q?=20Figures=20(B2016=20-111)=20Added=20a=20public=20method=20tha?= =?UTF-8?q?t=20will=20set=20the=20cursor=20focus=20to=20the=20Find=20Text?= =?UTF-8?q?=20box=20when=20Find/Replace=20is=20first=20started=20(B2016-10?= =?UTF-8?q?7)=20When=20a=20new=20Figure=20substep=20is=20added,=20the=20St?= =?UTF-8?q?ep=20Properties=20Panel=20is=20automatically=20opened=20with=20?= =?UTF-8?q?the=20RO=20tab=20selected.=20=20Changed=20the=20RO=20button=20i?= =?UTF-8?q?n=20Step=20Structure=20grouping=20of=20the=20Insert=20tab=20to?= =?UTF-8?q?=20read=20=E2=80=9CRO=20Figure=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DisplaySearch.Designer.cs | 7 +++---- PROMS/Volian.Controls.Library/EditItem.cs | 5 +++-- PROMS/Volian.Controls.Library/FindReplace.cs | 5 +++++ .../Volian.Controls.Library/StepTabRibbon.cs | 8 +++++++- .../StepTabRibbon.designer.cs | Bin 526660 -> 526672 bytes 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 51b2a2c1..8183bd3b 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -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 // diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 6457a907..581a7fc0 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -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--; diff --git a/PROMS/Volian.Controls.Library/FindReplace.cs b/PROMS/Volian.Controls.Library/FindReplace.cs index 49a6341f..99000dc3 100644 --- a/PROMS/Volian.Controls.Library/FindReplace.cs +++ b/PROMS/Volian.Controls.Library/FindReplace.cs @@ -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) { diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 9d6e018d..ca0eaefa 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -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 } /// /// 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)); } diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index c7c71c86b091efb7d634f5646496c04e0536c76f..4f2f423c204e4c0c2d7aafa91434bb2337c790d3 100644 GIT binary patch delta 56 zcmX>yN#VjIg@!GR^CmI}G5AlPJ(2M{E0DpU&^~bzBM>tIF*6Xe05K~Nvu&R^iG6b! E0DSHiod5s; delta 51 zcmcaGN#V#Og@!GR^CnJTGLiAi^aGWwEbWUXF#<6Y5HkZYh|dbdY}*%2VqaGV0CA!h Aga7~l