From dcf50073e766015214bc8d7a1c8f430b6183e746 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 4 Nov 2024 14:39:41 -0500 Subject: [PATCH 1/9] B2024-089 Loic to clean up transitioning to a section that does not have a section number. Also added and updated comments. --- .../Extension/TransitionExt.cs | 46 +++++++++++-------- .../Format/PlantFormat.cs | 6 ++- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index eb2a7849..2b47b89f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -676,37 +676,47 @@ namespace VEPROMS.CSLA.Library } public void AppendPrefix() { - if (HasText && Prefix != null) + if (Prefix == null) return; // no Prefix text to add + if (HasText) { - if (!_Results.ToString().EndsWith(_Prefix)) + if (!_Results.ToString().EndsWith(_Prefix)) //existing transition text does not end with Prefix text, OK to append _Results.Append(Prefix); _Prefix = null; } else if (_TranType == 4 && _ToItem.MoreThanOneStepSection()) { - if (!HasText && Prefix != null && Prefix.ToUpper().StartsWith(", STEP") - && _FromItem.ActiveFormat.Name.StartsWith("WEP")) - { - Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name); - _Prefix = null; - return; - } + // WEP (Point Beach) is no longer a customer - commented out + //if (!HasText && Prefix.ToUpper().StartsWith(", STEP") + // && _FromItem.ActiveFormat.Name.StartsWith("WEP")) + //{ + // Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name); + // _Prefix = null; + // return; + //} _Results.Append(Prefix); _Prefix = null; } - else if (_TranType == 5 && Prefix != null) - { - if (!HasText && Prefix.StartsWith(", ")) - _Results.Append(Prefix.TrimStart(", ".ToCharArray())); - else - _Results.Append(Prefix); - _Prefix = null; - } // If the prefix contains an open paren, we want to add the open paren regardless // of whether there already is text in the resulting string. - else if (!HasText && Prefix != null && Prefix.Contains("(")) + else if (!HasText && Prefix.Contains("(")) { _Results.Append(Prefix.TrimStart(" ".ToCharArray())); // since no text in result, trim starting space. + _Prefix = null; + } + else if (!HasText && Prefix.StartsWith(", ")) + { + _Results.Append(Prefix.TrimStart(", ".ToCharArray()));// no preceeding text, remove comma and space + _Prefix = null; + } + else if (!HasText && Prefix.StartsWith(",")) + { + _Results.Append(Prefix.TrimStart(",".ToCharArray())); // no preceeding text, remove comma + _Prefix = null; + } + else + { + _Results.Append(Prefix); // append prefix as is + _Prefix = null; } } public string OverridePrefix diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 61c3d0a9..c586773b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -6407,7 +6407,7 @@ public StepData Equation // equation has a parent of embedded object. } public TransData(XmlNode xmlNode) : base(xmlNode) { } - // a character that is placed before and after the title that's in the transition text + // a character that is placed before and after the procedure title that's in the transition text private LazyLoad _DelimiterForTransitionTitle; public string DelimiterForTransitionTitle { @@ -6684,7 +6684,9 @@ public StepData Equation // equation has a parent of embedded object. } } - // holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers + // Holdover from 16bit, used to define whether transitions are range (types 2 & 3). + // This is used in the logic for transitions with page numbers. This gets defined as "Type" in the code for the transition class. + // NOTE: the TransType you see in the code is actually the index into the list of transition definitions for given format. private LazyLoad _Type; public int? Type { From b826fa6a2076f4621553cab6c711e79c3b437588 Mon Sep 17 00:00:00 2001 From: mschill Date: Tue, 5 Nov 2024 10:48:52 -0500 Subject: [PATCH 2/9] B2024-080 Add Image Thumbnails to Find Submenu items to be consistent with elsewhere in the application --- .../FindReplace.Designer.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/FindReplace.Designer.cs b/PROMS/Volian.Controls.Library/FindReplace.Designer.cs index 57fcdad4..f564744f 100644 --- a/PROMS/Volian.Controls.Library/FindReplace.Designer.cs +++ b/PROMS/Volian.Controls.Library/FindReplace.Designer.cs @@ -279,18 +279,24 @@ namespace Volian.Controls.Library // // btnCmCut // + this.btnCmCut.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnCmCut.Image = global::Volian.Controls.Library.Properties.Resources.Cut_Image; this.btnCmCut.Name = "btnCmCut"; this.btnCmCut.Text = "Cut"; this.btnCmCut.Click += new System.EventHandler(this.btnCmCut_Click); // // btnCmCopy // + this.btnCmCopy.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnCmCopy.Image = global::Volian.Controls.Library.Properties.Resources.Copy_Image; this.btnCmCopy.Name = "btnCmCopy"; this.btnCmCopy.Text = "Copy"; this.btnCmCopy.Click += new System.EventHandler(this.btnCmCopy_Click); // // btnCmPaste // + this.btnCmPaste.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnCmPaste.Image = global::Volian.Controls.Library.Properties.Resources.PasteSmall_Image; this.btnCmPaste.Name = "btnCmPaste"; this.btnCmPaste.Text = "Paste"; this.btnCmPaste.Click += new System.EventHandler(this.btnCmPaste_Click); @@ -305,12 +311,16 @@ namespace Volian.Controls.Library // // btnCmHardSp // + this.btnCmHardSp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnCmHardSp.Image = global::Volian.Controls.Library.Properties.Resources.HardSpace_Image; this.btnCmHardSp.Name = "btnCmHardSp"; this.btnCmHardSp.Text = "Hard Space"; this.btnCmHardSp.Click += new System.EventHandler(this.btnCmHardSp_Click); // // btnCmSymbol // + this.btnCmSymbol.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btnCmSymbol.Image = global::Volian.Controls.Library.Properties.Resources.Symbol_Image; this.btnCmSymbol.Name = "btnCmSymbol"; this.btnCmSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.galSymbols}); @@ -566,9 +576,9 @@ namespace Volian.Controls.Library } - #endregion + #endregion - private DevComponents.DotNetBar.ButtonX btnReplace; + private DevComponents.DotNetBar.ButtonX btnReplace; private DevComponents.DotNetBar.ButtonX btnFndRplDone; private DevComponents.DotNetBar.ButtonX btnFindNext; private DevComponents.DotNetBar.Controls.ComboBoxEx cmboReplaceText; From e9ec884eb975dbc35163d5318bc86e56043d9ed5 Mon Sep 17 00:00:00 2001 From: mschill Date: Tue, 5 Nov 2024 10:59:01 -0500 Subject: [PATCH 3/9] C2024-026 Add feature to the transitions panel to allow user to hold currently selected procedure/set in the panel. --- .../DisplayTransition.Designer.cs | 976 +++++++++--------- .../DisplayTransition.cs | 106 +- .../DisplayTransition.resx | 13 +- 3 files changed, 601 insertions(+), 494 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs b/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs index bc3607b2..27cfde3d 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs @@ -28,488 +28,507 @@ namespace Volian.Controls.Library /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition)); - this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.btnTranCancel = new DevComponents.DotNetBar.ButtonX(); - this.btnTranSave = new DevComponents.DotNetBar.ButtonX(); - this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.listBoxTranFmt = new System.Windows.Forms.ListBox(); - this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbTranProcs = new System.Windows.Forms.ComboBox(); - this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.cbTranSects = new System.Windows.Forms.ComboBox(); - this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.pnlTranStepBtns = new System.Windows.Forms.Panel(); - this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX(); - this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX(); - this.btnUp1 = new DevComponents.DotNetBar.ButtonX(); - this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip(); - this.tvTran = new Volian.Controls.Library.vlnTreeView3(); - this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo(); - this.groupPanelBtns.SuspendLayout(); - this.groupPanelTranFmt.SuspendLayout(); - this.groupPanelTransitionSets.SuspendLayout(); - this.groupPanelTransitionProcs.SuspendLayout(); - this.groupPanelTransitionSect.SuspendLayout(); - this.groupPanelTranstionSteps.SuspendLayout(); - this.pnlTranStepBtns.SuspendLayout(); - this.SuspendLayout(); - // - // groupPanelBtns - // - this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.groupPanelBtns.Controls.Add(this.cbPageNum); - this.groupPanelBtns.Controls.Add(this.btnTranCancel); - this.groupPanelBtns.Controls.Add(this.btnTranSave); - this.groupPanelBtns.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelBtns.Location = new System.Drawing.Point(0, 0); - this.groupPanelBtns.Name = "groupPanelBtns"; - this.groupPanelBtns.Size = new System.Drawing.Size(376, 58); - // - // - // - this.groupPanelBtns.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanelBtns.Style.BackColorGradientAngle = 90; - this.groupPanelBtns.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanelBtns.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelBtns.Style.BorderBottomWidth = 1; - this.groupPanelBtns.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanelBtns.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelBtns.Style.BorderLeftWidth = 1; - this.groupPanelBtns.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelBtns.Style.BorderRightWidth = 1; - this.groupPanelBtns.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelBtns.Style.BorderTopWidth = 1; - this.groupPanelBtns.Style.CornerDiameter = 4; - this.groupPanelBtns.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanelBtns.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanelBtns.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanelBtns.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.groupPanelBtns.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.groupPanelBtns.TabIndex = 25; - // - // cbPageNum - // - this.cbPageNum.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbPageNum.Location = new System.Drawing.Point(0, 35); - this.cbPageNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.cbPageNum.Name = "cbPageNum"; - this.cbPageNum.Size = new System.Drawing.Size(126, 15); - this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cbPageNum.TabIndex = 26; - this.cbPageNum.Text = "Include Page Number"; - this.cbPageNum.CheckedChanged += new System.EventHandler(this.cbPageNum_CheckedChanged); - // - // btnTranCancel - // - this.btnTranCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnTranCancel.AutoSize = true; - this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right; - this.btnTranCancel.Location = new System.Drawing.Point(282, 0); - this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.btnTranCancel.Name = "btnTranCancel"; - this.btnTranCancel.Size = new System.Drawing.Size(88, 36); - this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" + + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition)); + this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbHoldProcSet = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.btnTranCancel = new DevComponents.DotNetBar.ButtonX(); + this.btnTranSave = new DevComponents.DotNetBar.ButtonX(); + this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.listBoxTranFmt = new System.Windows.Forms.ListBox(); + this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo(); + this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbTranProcs = new System.Windows.Forms.ComboBox(); + this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbTranSects = new System.Windows.Forms.ComboBox(); + this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.tvTran = new Volian.Controls.Library.vlnTreeView3(); + this.pnlTranStepBtns = new System.Windows.Forms.Panel(); + this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX(); + this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX(); + this.btnUp1 = new DevComponents.DotNetBar.ButtonX(); + this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip(); + this.groupPanelBtns.SuspendLayout(); + this.groupPanelTranFmt.SuspendLayout(); + this.groupPanelTransitionSets.SuspendLayout(); + this.groupPanelTransitionProcs.SuspendLayout(); + this.groupPanelTransitionSect.SuspendLayout(); + this.groupPanelTranstionSteps.SuspendLayout(); + this.pnlTranStepBtns.SuspendLayout(); + this.SuspendLayout(); + // + // groupPanelBtns + // + this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelBtns.Controls.Add(this.cbHoldProcSet); + this.groupPanelBtns.Controls.Add(this.cbPageNum); + this.groupPanelBtns.Controls.Add(this.btnTranCancel); + this.groupPanelBtns.Controls.Add(this.btnTranSave); + this.groupPanelBtns.DisabledBackColor = System.Drawing.Color.Empty; + this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top; + this.groupPanelBtns.Location = new System.Drawing.Point(0, 0); + this.groupPanelBtns.Name = "groupPanelBtns"; + this.groupPanelBtns.Size = new System.Drawing.Size(376, 82); + // + // + // + this.groupPanelBtns.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanelBtns.Style.BackColorGradientAngle = 90; + this.groupPanelBtns.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanelBtns.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelBtns.Style.BorderBottomWidth = 1; + this.groupPanelBtns.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanelBtns.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelBtns.Style.BorderLeftWidth = 1; + this.groupPanelBtns.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelBtns.Style.BorderRightWidth = 1; + this.groupPanelBtns.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelBtns.Style.BorderTopWidth = 1; + this.groupPanelBtns.Style.CornerDiameter = 4; + this.groupPanelBtns.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanelBtns.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanelBtns.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanelBtns.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.groupPanelBtns.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.groupPanelBtns.TabIndex = 25; + // + // cbHoldProcSet + // + this.cbHoldProcSet.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbHoldProcSet.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbHoldProcSet.Location = new System.Drawing.Point(0, 54); + this.cbHoldProcSet.Margin = new System.Windows.Forms.Padding(2); + this.cbHoldProcSet.Name = "cbHoldProcSet"; + this.cbHoldProcSet.Size = new System.Drawing.Size(214, 15); + this.cbHoldProcSet.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.superToolTipDispTran.SetSuperTooltip(this.cbHoldProcSet, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbHoldProcSet.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbHoldProcSet.TabIndex = 27; + this.cbHoldProcSet.Text = "Hold Procedure Set / Procedure"; + this.cbHoldProcSet.CheckedChanged += new System.EventHandler(this.cbHoldProcSet_CheckedChanged); + // + // cbPageNum + // + this.cbPageNum.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbPageNum.Location = new System.Drawing.Point(0, 35); + this.cbPageNum.Margin = new System.Windows.Forms.Padding(2); + this.cbPageNum.Name = "cbPageNum"; + this.cbPageNum.Size = new System.Drawing.Size(126, 15); + this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbPageNum.TabIndex = 26; + this.cbPageNum.Text = "Include Page Number"; + this.cbPageNum.CheckedChanged += new System.EventHandler(this.cbPageNum_CheckedChanged); + // + // btnTranCancel + // + this.btnTranCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnTranCancel.AutoSize = true; + this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right; + this.btnTranCancel.Location = new System.Drawing.Point(282, 0); + this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2); + this.btnTranCancel.Name = "btnTranCancel"; + this.btnTranCancel.Size = new System.Drawing.Size(88, 36); + this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" + "ted, or the original transition if one had been selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnTranCancel.TabIndex = 25; - this.btnTranCancel.Text = "Cancel"; - this.btnTranCancel.Click += new System.EventHandler(this.btnTranCancel_Click); - // - // btnTranSave - // - this.btnTranSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnTranSave.AutoSize = true; - this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left; - this.btnTranSave.Location = new System.Drawing.Point(0, 0); - this.btnTranSave.Name = "btnTranSave"; - this.btnTranSave.Size = new System.Drawing.Size(103, 36); - this.superToolTipDispTran.SetSuperTooltip(this.btnTranSave, new DevComponents.DotNetBar.SuperTooltipInfo("Save Transition", "", "- This will place the selected Transition at the cursor position.\r\n- This will re" + + this.btnTranCancel.TabIndex = 25; + this.btnTranCancel.Text = "Cancel"; + this.btnTranCancel.Click += new System.EventHandler(this.btnTranCancel_Click); + // + // btnTranSave + // + this.btnTranSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnTranSave.AutoSize = true; + this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left; + this.btnTranSave.Location = new System.Drawing.Point(0, 0); + this.btnTranSave.Name = "btnTranSave"; + this.btnTranSave.Size = new System.Drawing.Size(103, 36); + this.superToolTipDispTran.SetSuperTooltip(this.btnTranSave, new DevComponents.DotNetBar.SuperTooltipInfo("Save Transition", "", "- This will place the selected Transition at the cursor position.\r\n- This will re" + "place a Transition with the selected Transition.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnTranSave.TabIndex = 24; - this.btnTranSave.Text = "Save Transition"; - this.btnTranSave.Click += new System.EventHandler(this.btnTranSave_Click); - // - // groupPanelTranFmt - // - this.groupPanelTranFmt.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanelTranFmt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt); - this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 58); - this.groupPanelTranFmt.Name = "groupPanelTranFmt"; - this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141); - // - // - // - this.groupPanelTranFmt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanelTranFmt.Style.BackColorGradientAngle = 90; - this.groupPanelTranFmt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanelTranFmt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranFmt.Style.BorderBottomWidth = 1; - this.groupPanelTranFmt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanelTranFmt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranFmt.Style.BorderLeftWidth = 1; - this.groupPanelTranFmt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranFmt.Style.BorderRightWidth = 1; - this.groupPanelTranFmt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranFmt.Style.BorderTopWidth = 1; - this.groupPanelTranFmt.Style.CornerDiameter = 4; - this.groupPanelTranFmt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanelTranFmt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanelTranFmt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanelTranFmt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.groupPanelTranFmt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.groupPanelTranFmt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.groupPanelTranFmt.TabIndex = 27; - this.groupPanelTranFmt.Text = "Select Format"; - // - // listBoxTranFmt - // - this.listBoxTranFmt.Dock = System.Windows.Forms.DockStyle.Fill; - this.listBoxTranFmt.FormattingEnabled = true; - this.listBoxTranFmt.HorizontalScrollbar = true; - this.listBoxTranFmt.Location = new System.Drawing.Point(0, 0); - this.listBoxTranFmt.Name = "listBoxTranFmt"; - this.listBoxTranFmt.Size = new System.Drawing.Size(370, 120); - this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This is where transition types are selected. This also defines how the transitio" + + this.btnTranSave.TabIndex = 24; + this.btnTranSave.Text = "Save Transition"; + this.btnTranSave.Click += new System.EventHandler(this.btnTranSave_Click); + // + // groupPanelTranFmt + // + this.groupPanelTranFmt.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanelTranFmt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt); + this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty; + this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top; + this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 82); + this.groupPanelTranFmt.Name = "groupPanelTranFmt"; + this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141); + // + // + // + this.groupPanelTranFmt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanelTranFmt.Style.BackColorGradientAngle = 90; + this.groupPanelTranFmt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanelTranFmt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranFmt.Style.BorderBottomWidth = 1; + this.groupPanelTranFmt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanelTranFmt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranFmt.Style.BorderLeftWidth = 1; + this.groupPanelTranFmt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranFmt.Style.BorderRightWidth = 1; + this.groupPanelTranFmt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranFmt.Style.BorderTopWidth = 1; + this.groupPanelTranFmt.Style.CornerDiameter = 4; + this.groupPanelTranFmt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanelTranFmt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanelTranFmt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanelTranFmt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.groupPanelTranFmt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.groupPanelTranFmt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.groupPanelTranFmt.TabIndex = 27; + this.groupPanelTranFmt.Text = "Select Format"; + // + // listBoxTranFmt + // + this.listBoxTranFmt.Dock = System.Windows.Forms.DockStyle.Fill; + this.listBoxTranFmt.FormattingEnabled = true; + this.listBoxTranFmt.HorizontalScrollbar = true; + this.listBoxTranFmt.Location = new System.Drawing.Point(0, 0); + this.listBoxTranFmt.Name = "listBoxTranFmt"; + this.listBoxTranFmt.Size = new System.Drawing.Size(370, 120); + this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This is where transition types are selected. This also defines how the transitio" + "n will look in the text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.listBoxTranFmt.TabIndex = 13; - this.listBoxTranFmt.SelectedIndexChanged += new System.EventHandler(this.listBoxTranFmt_Click); - // - // groupPanelTransitionSets - // - this.groupPanelTransitionSets.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanelTransitionSets.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets); - this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 199); - this.groupPanelTransitionSets.Name = "groupPanelTransitionSets"; - this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48); - // - // - // - this.groupPanelTransitionSets.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanelTransitionSets.Style.BackColorGradientAngle = 90; - this.groupPanelTransitionSets.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanelTransitionSets.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSets.Style.BorderBottomWidth = 1; - this.groupPanelTransitionSets.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanelTransitionSets.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSets.Style.BorderLeftWidth = 1; - this.groupPanelTransitionSets.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSets.Style.BorderRightWidth = 1; - this.groupPanelTransitionSets.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSets.Style.BorderTopWidth = 1; - this.groupPanelTransitionSets.Style.CornerDiameter = 4; - this.groupPanelTransitionSets.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanelTransitionSets.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanelTransitionSets.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanelTransitionSets.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.groupPanelTransitionSets.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.groupPanelTransitionSets.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.groupPanelTransitionSets.TabIndex = 31; - this.groupPanelTransitionSets.Text = "Select Procedure Set"; - // - // groupPanelTransitionProcs - // - this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanelTransitionProcs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs); - this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 247); - this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs"; - this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46); - // - // - // - this.groupPanelTransitionProcs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanelTransitionProcs.Style.BackColorGradientAngle = 90; - this.groupPanelTransitionProcs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanelTransitionProcs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionProcs.Style.BorderBottomWidth = 1; - this.groupPanelTransitionProcs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanelTransitionProcs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionProcs.Style.BorderLeftWidth = 1; - this.groupPanelTransitionProcs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionProcs.Style.BorderRightWidth = 1; - this.groupPanelTransitionProcs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionProcs.Style.BorderTopWidth = 1; - this.groupPanelTransitionProcs.Style.CornerDiameter = 4; - this.groupPanelTransitionProcs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanelTransitionProcs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanelTransitionProcs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanelTransitionProcs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.groupPanelTransitionProcs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.groupPanelTransitionProcs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.groupPanelTransitionProcs.TabIndex = 32; - this.groupPanelTransitionProcs.Text = "Select Procedure"; - // - // cbTranProcs - // - this.cbTranProcs.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbTranProcs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbTranProcs.FormattingEnabled = true; - this.cbTranProcs.Location = new System.Drawing.Point(0, 0); - this.cbTranProcs.Name = "cbTranProcs"; - this.cbTranProcs.Size = new System.Drawing.Size(370, 21); - this.superToolTipDispTran.SetSuperTooltip(this.cbTranProcs, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranProcs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cbTranProcs.TabIndex = 14; - this.cbTranProcs.SelectedIndexChanged += new System.EventHandler(this.cbTranProcs_SelectedIndexChanged); - // - // groupPanelTransitionSect - // - this.groupPanelTransitionSect.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanelTransitionSect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.groupPanelTransitionSect.Controls.Add(this.cbTranSects); - this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top; - this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 293); - this.groupPanelTransitionSect.Name = "groupPanelTransitionSect"; - this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49); - // - // - // - this.groupPanelTransitionSect.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanelTransitionSect.Style.BackColorGradientAngle = 90; - this.groupPanelTransitionSect.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanelTransitionSect.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSect.Style.BorderBottomWidth = 1; - this.groupPanelTransitionSect.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanelTransitionSect.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSect.Style.BorderLeftWidth = 1; - this.groupPanelTransitionSect.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSect.Style.BorderRightWidth = 1; - this.groupPanelTransitionSect.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTransitionSect.Style.BorderTopWidth = 1; - this.groupPanelTransitionSect.Style.CornerDiameter = 4; - this.groupPanelTransitionSect.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanelTransitionSect.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanelTransitionSect.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanelTransitionSect.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.groupPanelTransitionSect.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.groupPanelTransitionSect.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.groupPanelTransitionSect.TabIndex = 33; - this.groupPanelTransitionSect.Text = "Select Section"; - // - // cbTranSects - // - this.cbTranSects.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbTranSects.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbTranSects.FormattingEnabled = true; - this.cbTranSects.Location = new System.Drawing.Point(0, 0); - this.cbTranSects.Name = "cbTranSects"; - this.cbTranSects.Size = new System.Drawing.Size(370, 21); - this.superToolTipDispTran.SetSuperTooltip(this.cbTranSects, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranSects.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cbTranSects.TabIndex = 20; - this.cbTranSects.SelectedIndexChanged += new System.EventHandler(this.cbTranSects_SelectedIndexChanged); - this.cbTranSects.Click += new System.EventHandler(this.cbTranSects_SelectedIndexChanged); - // - // groupPanelTranstionSteps - // - this.groupPanelTranstionSteps.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanelTranstionSteps.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.groupPanelTranstionSteps.Controls.Add(this.tvTran); - this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns); - this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 342); - this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps"; - this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 334); - // - // - // - this.groupPanelTranstionSteps.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanelTranstionSteps.Style.BackColorGradientAngle = 90; - this.groupPanelTranstionSteps.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanelTranstionSteps.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranstionSteps.Style.BorderBottomWidth = 1; - this.groupPanelTranstionSteps.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanelTranstionSteps.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranstionSteps.Style.BorderLeftWidth = 1; - this.groupPanelTranstionSteps.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranstionSteps.Style.BorderRightWidth = 1; - this.groupPanelTranstionSteps.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanelTranstionSteps.Style.BorderTopWidth = 1; - this.groupPanelTranstionSteps.Style.CornerDiameter = 4; - this.groupPanelTranstionSteps.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanelTranstionSteps.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanelTranstionSteps.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanelTranstionSteps.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.groupPanelTranstionSteps.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.groupPanelTranstionSteps.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.groupPanelTranstionSteps.TabIndex = 34; - this.groupPanelTranstionSteps.Text = "Select Step"; - // - // pnlTranStepBtns - // - this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum); - this.pnlTranStepBtns.Controls.Add(this.lblxTranRangeTip); - this.pnlTranStepBtns.Controls.Add(this.btnTranRangeClear); - this.pnlTranStepBtns.Controls.Add(this.btnUp1); - this.pnlTranStepBtns.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlTranStepBtns.Location = new System.Drawing.Point(0, 0); - this.pnlTranStepBtns.Name = "pnlTranStepBtns"; - this.pnlTranStepBtns.Size = new System.Drawing.Size(370, 46); - this.pnlTranStepBtns.TabIndex = 30; - // - // cbIncStepNum - // - // - // - // - this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbIncStepNum.Location = new System.Drawing.Point(8, 12); - this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.cbIncStepNum.Name = "cbIncStepNum"; - this.cbIncStepNum.Size = new System.Drawing.Size(126, 19); - this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.cbIncStepNum.TabIndex = 0; - this.cbIncStepNum.Text = "Include Step Number"; - this.cbIncStepNum.CheckedChanged += new System.EventHandler(this.cbIncStepNum_CheckedChanged); - // - // lblxTranRangeTip - // - // - // - // - this.lblxTranRangeTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblxTranRangeTip.Dock = System.Windows.Forms.DockStyle.Right; - this.lblxTranRangeTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblxTranRangeTip.Location = new System.Drawing.Point(265, 0); - this.lblxTranRangeTip.Name = "lblxTranRangeTip"; - this.lblxTranRangeTip.Size = new System.Drawing.Size(105, 46); - this.superToolTipDispTran.SetSuperTooltip(this.lblxTranRangeTip, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "For range transitions, shows which selection, first or second, that the next sele" + + this.listBoxTranFmt.TabIndex = 13; + this.listBoxTranFmt.SelectedIndexChanged += new System.EventHandler(this.listBoxTranFmt_Click); + // + // groupPanelTransitionSets + // + this.groupPanelTransitionSets.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanelTransitionSets.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets); + this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty; + this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top; + this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 223); + this.groupPanelTransitionSets.Name = "groupPanelTransitionSets"; + this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48); + // + // + // + this.groupPanelTransitionSets.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanelTransitionSets.Style.BackColorGradientAngle = 90; + this.groupPanelTransitionSets.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanelTransitionSets.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSets.Style.BorderBottomWidth = 1; + this.groupPanelTransitionSets.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanelTransitionSets.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSets.Style.BorderLeftWidth = 1; + this.groupPanelTransitionSets.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSets.Style.BorderRightWidth = 1; + this.groupPanelTransitionSets.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSets.Style.BorderTopWidth = 1; + this.groupPanelTransitionSets.Style.CornerDiameter = 4; + this.groupPanelTransitionSets.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanelTransitionSets.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanelTransitionSets.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanelTransitionSets.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.groupPanelTransitionSets.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.groupPanelTransitionSets.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.groupPanelTransitionSets.TabIndex = 31; + this.groupPanelTransitionSets.Text = "Select Procedure Set"; + // + // vlnTreeComboSets + // + this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill; + this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0); + this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4); + this.vlnTreeComboSets.Name = "vlnTreeComboSets"; + this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21); + this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.vlnTreeComboSets.TabIndex = 33; + this.vlnTreeComboSets.Value = null; + this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing); + // + // groupPanelTransitionProcs + // + this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanelTransitionProcs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs); + this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty; + this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top; + this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 271); + this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs"; + this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46); + // + // + // + this.groupPanelTransitionProcs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanelTransitionProcs.Style.BackColorGradientAngle = 90; + this.groupPanelTransitionProcs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanelTransitionProcs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionProcs.Style.BorderBottomWidth = 1; + this.groupPanelTransitionProcs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanelTransitionProcs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionProcs.Style.BorderLeftWidth = 1; + this.groupPanelTransitionProcs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionProcs.Style.BorderRightWidth = 1; + this.groupPanelTransitionProcs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionProcs.Style.BorderTopWidth = 1; + this.groupPanelTransitionProcs.Style.CornerDiameter = 4; + this.groupPanelTransitionProcs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanelTransitionProcs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanelTransitionProcs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanelTransitionProcs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.groupPanelTransitionProcs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.groupPanelTransitionProcs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.groupPanelTransitionProcs.TabIndex = 32; + this.groupPanelTransitionProcs.Text = "Select Procedure"; + // + // cbTranProcs + // + this.cbTranProcs.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbTranProcs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbTranProcs.FormattingEnabled = true; + this.cbTranProcs.Location = new System.Drawing.Point(0, 0); + this.cbTranProcs.Name = "cbTranProcs"; + this.cbTranProcs.Size = new System.Drawing.Size(370, 21); + this.superToolTipDispTran.SetSuperTooltip(this.cbTranProcs, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranProcs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbTranProcs.TabIndex = 14; + this.cbTranProcs.SelectedIndexChanged += new System.EventHandler(this.cbTranProcs_SelectedIndexChanged); + // + // groupPanelTransitionSect + // + this.groupPanelTransitionSect.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanelTransitionSect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelTransitionSect.Controls.Add(this.cbTranSects); + this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty; + this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top; + this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 317); + this.groupPanelTransitionSect.Name = "groupPanelTransitionSect"; + this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49); + // + // + // + this.groupPanelTransitionSect.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanelTransitionSect.Style.BackColorGradientAngle = 90; + this.groupPanelTransitionSect.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanelTransitionSect.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSect.Style.BorderBottomWidth = 1; + this.groupPanelTransitionSect.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanelTransitionSect.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSect.Style.BorderLeftWidth = 1; + this.groupPanelTransitionSect.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSect.Style.BorderRightWidth = 1; + this.groupPanelTransitionSect.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTransitionSect.Style.BorderTopWidth = 1; + this.groupPanelTransitionSect.Style.CornerDiameter = 4; + this.groupPanelTransitionSect.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanelTransitionSect.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanelTransitionSect.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanelTransitionSect.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.groupPanelTransitionSect.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.groupPanelTransitionSect.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.groupPanelTransitionSect.TabIndex = 33; + this.groupPanelTransitionSect.Text = "Select Section"; + // + // cbTranSects + // + this.cbTranSects.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbTranSects.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbTranSects.FormattingEnabled = true; + this.cbTranSects.Location = new System.Drawing.Point(0, 0); + this.cbTranSects.Name = "cbTranSects"; + this.cbTranSects.Size = new System.Drawing.Size(370, 21); + this.superToolTipDispTran.SetSuperTooltip(this.cbTranSects, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranSects.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbTranSects.TabIndex = 20; + this.cbTranSects.SelectedIndexChanged += new System.EventHandler(this.cbTranSects_SelectedIndexChanged); + this.cbTranSects.Click += new System.EventHandler(this.cbTranSects_SelectedIndexChanged); + // + // groupPanelTranstionSteps + // + this.groupPanelTranstionSteps.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanelTranstionSteps.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanelTranstionSteps.Controls.Add(this.tvTran); + this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns); + this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty; + this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 366); + this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps"; + this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 310); + // + // + // + this.groupPanelTranstionSteps.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanelTranstionSteps.Style.BackColorGradientAngle = 90; + this.groupPanelTranstionSteps.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanelTranstionSteps.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranstionSteps.Style.BorderBottomWidth = 1; + this.groupPanelTranstionSteps.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanelTranstionSteps.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranstionSteps.Style.BorderLeftWidth = 1; + this.groupPanelTranstionSteps.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranstionSteps.Style.BorderRightWidth = 1; + this.groupPanelTranstionSteps.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanelTranstionSteps.Style.BorderTopWidth = 1; + this.groupPanelTranstionSteps.Style.CornerDiameter = 4; + this.groupPanelTranstionSteps.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanelTranstionSteps.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanelTranstionSteps.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanelTranstionSteps.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.groupPanelTranstionSteps.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.groupPanelTranstionSteps.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.groupPanelTranstionSteps.TabIndex = 34; + this.groupPanelTranstionSteps.Text = "Select Step"; + // + // tvTran + // + this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill; + this.tvTran.HideSelection = false; + this.tvTran.Location = new System.Drawing.Point(0, 46); + this.tvTran.Name = "tvTran"; + this.tvTran.Size = new System.Drawing.Size(370, 243); + this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.tvTran.TabIndex = 31; + this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect); + // + // pnlTranStepBtns + // + this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum); + this.pnlTranStepBtns.Controls.Add(this.lblxTranRangeTip); + this.pnlTranStepBtns.Controls.Add(this.btnTranRangeClear); + this.pnlTranStepBtns.Controls.Add(this.btnUp1); + this.pnlTranStepBtns.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlTranStepBtns.Location = new System.Drawing.Point(0, 0); + this.pnlTranStepBtns.Name = "pnlTranStepBtns"; + this.pnlTranStepBtns.Size = new System.Drawing.Size(370, 46); + this.pnlTranStepBtns.TabIndex = 30; + // + // cbIncStepNum + // + // + // + // + this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbIncStepNum.Location = new System.Drawing.Point(8, 12); + this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2); + this.cbIncStepNum.Name = "cbIncStepNum"; + this.cbIncStepNum.Size = new System.Drawing.Size(126, 19); + this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cbIncStepNum.TabIndex = 0; + this.cbIncStepNum.Text = "Include Step Number"; + this.cbIncStepNum.CheckedChanged += new System.EventHandler(this.cbIncStepNum_CheckedChanged); + // + // lblxTranRangeTip + // + // + // + // + this.lblxTranRangeTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblxTranRangeTip.Dock = System.Windows.Forms.DockStyle.Right; + this.lblxTranRangeTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblxTranRangeTip.Location = new System.Drawing.Point(265, 0); + this.lblxTranRangeTip.Name = "lblxTranRangeTip"; + this.lblxTranRangeTip.Size = new System.Drawing.Size(105, 46); + this.superToolTipDispTran.SetSuperTooltip(this.lblxTranRangeTip, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "For range transitions, shows which selection, first or second, that the next sele" + "ction will be.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.lblxTranRangeTip.TabIndex = 33; - this.lblxTranRangeTip.Text = "Select First \r\nTransition\r\nfor Range"; - // - // btnTranRangeClear - // - this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left; - this.btnTranRangeClear.Location = new System.Drawing.Point(0, 0); - this.btnTranRangeClear.Name = "btnTranRangeClear"; - this.btnTranRangeClear.Size = new System.Drawing.Size(58, 46); - this.superToolTipDispTran.SetSuperTooltip(this.btnTranRangeClear, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This clears the Range selection in the tree view", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnTranRangeClear.TabIndex = 31; - this.btnTranRangeClear.Text = "Clear Range Selection"; - this.btnTranRangeClear.Click += new System.EventHandler(this.btnTranRangeClear_Click); - // - // btnUp1 - // - this.btnUp1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnUp1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS; - this.btnUp1.Location = new System.Drawing.Point(210, 0); - this.btnUp1.Name = "btnUp1"; - this.btnUp1.Size = new System.Drawing.Size(43, 46); - this.superToolTipDispTran.SetSuperTooltip(this.btnUp1, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This will display the tree for selecting the transition one level higher than cur" + + this.lblxTranRangeTip.TabIndex = 33; + this.lblxTranRangeTip.Text = "Select First \r\nTransition\r\nfor Range"; + // + // btnTranRangeClear + // + this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left; + this.btnTranRangeClear.Location = new System.Drawing.Point(0, 0); + this.btnTranRangeClear.Name = "btnTranRangeClear"; + this.btnTranRangeClear.Size = new System.Drawing.Size(58, 46); + this.superToolTipDispTran.SetSuperTooltip(this.btnTranRangeClear, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This clears the Range selection in the tree view", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnTranRangeClear.TabIndex = 31; + this.btnTranRangeClear.Text = "Clear Range Selection"; + this.btnTranRangeClear.Click += new System.EventHandler(this.btnTranRangeClear_Click); + // + // btnUp1 + // + this.btnUp1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnUp1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS; + this.btnUp1.Location = new System.Drawing.Point(210, 0); + this.btnUp1.Name = "btnUp1"; + this.btnUp1.Size = new System.Drawing.Size(43, 46); + this.superToolTipDispTran.SetSuperTooltip(this.btnUp1, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This will display the tree for selecting the transition one level higher than cur" + "rently shown. If already showing High Level Steps, this button has no effect.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.btnUp1.TabIndex = 30; - this.btnUp1.Visible = false; - // - // superToolTipDispTran - // - this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); - this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - // - // tvTran - // - this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill; - this.tvTran.HideSelection = false; - this.tvTran.Location = new System.Drawing.Point(0, 46); - this.tvTran.Name = "tvTran"; - this.tvTran.Size = new System.Drawing.Size(370, 267); - this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.tvTran.TabIndex = 31; - this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect); - // - // vlnTreeComboSets - // - this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill; - this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0); - this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4); - this.vlnTreeComboSets.Name = "vlnTreeComboSets"; - this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21); - this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.vlnTreeComboSets.TabIndex = 33; - this.vlnTreeComboSets.Value = null; - this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing); - // - // DisplayTransition - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.groupPanelTranstionSteps); - this.Controls.Add(this.groupPanelTransitionSect); - this.Controls.Add(this.groupPanelTransitionProcs); - this.Controls.Add(this.groupPanelTransitionSets); - this.Controls.Add(this.groupPanelTranFmt); - this.Controls.Add(this.groupPanelBtns); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.Name = "DisplayTransition"; - this.Size = new System.Drawing.Size(376, 676); - this.groupPanelBtns.ResumeLayout(false); - this.groupPanelBtns.PerformLayout(); - this.groupPanelTranFmt.ResumeLayout(false); - this.groupPanelTransitionSets.ResumeLayout(false); - this.groupPanelTransitionProcs.ResumeLayout(false); - this.groupPanelTransitionSect.ResumeLayout(false); - this.groupPanelTranstionSteps.ResumeLayout(false); - this.pnlTranStepBtns.ResumeLayout(false); - this.ResumeLayout(false); + this.btnUp1.TabIndex = 30; + this.btnUp1.Visible = false; + // + // superToolTipDispTran + // + this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); + this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; + // + // DisplayTransition + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.groupPanelTranstionSteps); + this.Controls.Add(this.groupPanelTransitionSect); + this.Controls.Add(this.groupPanelTransitionProcs); + this.Controls.Add(this.groupPanelTransitionSets); + this.Controls.Add(this.groupPanelTranFmt); + this.Controls.Add(this.groupPanelBtns); + this.Margin = new System.Windows.Forms.Padding(2); + this.Name = "DisplayTransition"; + this.Size = new System.Drawing.Size(376, 676); + this.groupPanelBtns.ResumeLayout(false); + this.groupPanelBtns.PerformLayout(); + this.groupPanelTranFmt.ResumeLayout(false); + this.groupPanelTransitionSets.ResumeLayout(false); + this.groupPanelTransitionProcs.ResumeLayout(false); + this.groupPanelTransitionSect.ResumeLayout(false); + this.groupPanelTranstionSteps.ResumeLayout(false); + this.pnlTranStepBtns.ResumeLayout(false); + this.ResumeLayout(false); } @@ -535,5 +554,6 @@ namespace Volian.Controls.Library private DevComponents.DotNetBar.SuperTooltip superToolTipDispTran; private DevComponents.DotNetBar.Controls.CheckBoxX cbIncStepNum; private DevComponents.DotNetBar.Controls.CheckBoxX cbPageNum; - } + private DevComponents.DotNetBar.Controls.CheckBoxX cbHoldProcSet; + } } diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index 163cabb0..375b3d80 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -27,7 +27,31 @@ namespace Volian.Controls.Library set { if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface - if (value == null) // Insert a transition + //CSM-C2024-026 Evaluate the transitions panel + //Create a way to keep it from reverting the transition display panel to the currently selected item/transition. + //HeldLinkText will store if a transition was manually selected + //to override defaulting the listboxes to the current step / selected transition + if (HeldLinkText != "" && value != null) + { + //handle case where is held text and click on an already existing transition so cannot save one on top of the other. + _CurTrans = value; + btnTranSave.Enabled = false; + btnTranCancel.Enabled = true; + return; + } + else if (HeldLinkText != "" && MyRTB.MyItemInfo.ActiveFormat.Name == HeldLink_CurItemFrom.ActiveFormat.Name) + { + //this else if will handle case of defaulting to held transition instead of what has been clicked on + //Note that if format is not the same, it will ignore the held item + //This is because if different format, then options / selections may be different so will need to refresh the lists + if (_CurTrans == value && _CurItemFrom == HeldLink_CurItemFrom) return; + _CurItemFrom = HeldLink_CurItemFrom; + _TranFmtIndx = HeldLink_TranFmtIndx; + bool isenh = MyRTB != null && HeldLink_CurItemFrom != null && HeldLink_CurItemFrom.IsEnhancedStep; + btnTranSave.Enabled = !isenh && UserInfo.CanEdit(MyUserInfo, Mydvi) && (value == null); //Can Insert Transitions + btnTranCancel.Enabled = true; + } + else if (value == null) // Insert a transition { if (MyRTB == null) return; if (_CurTrans == value && _CurItemFrom == MyRTB.MyItemInfo) return; @@ -115,19 +139,13 @@ namespace Volian.Controls.Library _MyRTB.LinkChanged += new StepRTBLinkEvent(_MyRTB_LinkChanged); if (_MyRTB.MyLinkText == null) { - CurTrans = null; + CurTrans = null; } - } + } } void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args) { - //if (_MyRTB.MyLinkText == null) - // CurTrans = null; - //else - //{ - // StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e); - CurTrans = args.MyLinkText.MyTransitionInfo; - //} + CurTrans = args.MyLinkText.MyTransitionInfo; } private ItemInfo _CurrentItemProcedure; // the selected item's procedure private ItemInfo _CurrentToProcedure; // the 'to' location's procedure (may be same as _CurrentItemProcedure) @@ -138,6 +156,12 @@ namespace Volian.Controls.Library private Color _OrigGroupPanelProcs; private Color _OrigGroupPanelSects; private Color _OrigGroupPanelSteps; + //CSM-C2024-026 Evaluate the transitions panel + //Create a way to keep it from reverting the transition display panel to the currently selected item/transition. + public string HeldLinkText { get; protected set; } = ""; //will hold link text to stay on + public int HeldLink_TranFmtIndx { get; protected set; } = 0; //this will hold transition format that was selected on held item + public ItemInfo HeldLink_CurItemFrom { get; protected set; } //this will hold item that transitioning from + #endregion #region Constructors public DisplayTransition() @@ -237,7 +261,7 @@ namespace Volian.Controls.Library if (selitm != null && selitm.MyContent.Type >= 20000) { - if (_DoingRange) + if (_DoingRange && CurTrans != null) { tvInitHiliteRange(); //rangeSameLevel, stpitm, rngitm, (i1 < i2) ? i2 : i1); } @@ -938,6 +962,17 @@ namespace Volian.Controls.Library } _InitializingTrans = false; SaveCancelEnabling(); + + //CSM-C2024-026 Evaluate the transitions panel + //Create a way to keep it from reverting the transition display panel to the currently selected item/transition. + //If checkbox is checked to enable holding an item, + //then store the first step in the currently selected item + if (cbHoldProcSet.Checked && secitm.Steps != null && secitm.Steps.Count > 0) + { + HeldLinkText = string.Format("#Link:Transition:{0} {1}", listBoxTranFmt.SelectedIndex, secitm.Steps[0].ItemID); + HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex; + HeldLink_CurItemFrom = secitm.Steps[0]; + } } } // B2024-016 Hide the step tree when the transition definition does not include a step number {First Step} @@ -1089,6 +1124,18 @@ namespace Volian.Controls.Library return; } SaveCancelEnabling(); + + //CSM-C2024-026 Evaluate the transitions panel + //Create a way to keep it from reverting the transition display panel to the currently selected item/transition. + //If checkbox is checked to enable holding an item, + //then store the currently selected item + if (cbHoldProcSet.Checked) + { + HeldLinkText = string.Format("#Link:Transition:{0} {1}", listBoxTranFmt.SelectedIndex, selii.ItemID); + HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex; + HeldLink_CurItemFrom = selii; + } + if (_DoingRange) { if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null)) @@ -1370,6 +1417,13 @@ namespace Volian.Controls.Library _MyLog.InfoFormat("ItemID {0}, LinkText '{1}'", MyRTB.MyItemInfo.ItemID, linkText); int sel = MyRTB.SelectionStart + MyRTB.SelectionLength; MyRTB.Select(sel, 0);// Move cursor to end of LINK + + //CSM-C2024-026 Evaluate the transitions panel + //Create a way to keep it from reverting the transition display panel to the currently selected item/transition. + //After save a transition, set the Linktext / tab to go back to the held transition + //if none then this will refresh it to the currently selected item as it did before this csm + MyRTB.MyLinkText = HeldLinkText; + MyRTB.Focus(); } #endregion @@ -1489,8 +1543,34 @@ namespace Volian.Controls.Library btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons } } - } - public class TransItem + + //CSM-C2024-026 Evaluate the transitions panel + //Create a way to keep it from reverting the transition display panel to the currently selected item/transition. + //If checkbox is checked to enable holding an item, + //then store the currently selected item + //if checkbox becomes unchecked then clear item. + private void cbHoldProcSet_CheckedChanged(object sender, EventArgs e) + { + if (cbHoldProcSet.Checked) + { + VETreeNode vt = tvTran.SelectedNode as VETreeNode; + ItemInfo selii = vt.VEObject as ItemInfo; + if (selii != null) + { + HeldLinkText = string.Format("#Link:Transition:{0} {1}", listBoxTranFmt.SelectedIndex, selii.ItemID); + HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex; + HeldLink_CurItemFrom = selii; + } + } + else + { + HeldLinkText = ""; + HeldLink_CurItemFrom = null; + HeldLink_TranFmtIndx = 0; + } + } + } + public class TransItem { private string _ItemDescription; diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.resx b/PROMS/Volian.Controls.Library/DisplayTransition.resx index c766cbd0..354eec95 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.resx +++ b/PROMS/Volian.Controls.Library/DisplayTransition.resx @@ -112,14 +112,21 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 + + By default, PROMS will load the Procedure Set/Procedure in this window for the step (or transition link within a step) that is selected with the mouse. + +Selecting this checkbox temporarily disables that behavior so that clicking on various steps within the procedure will not move away from the Procedure Set/Procedure that has currently been selected in these windows. + +Note: One exception to this is if you navigate to a Procedure set that has a different format. In that case, it will refresh these options based on that new format. + This allows you to select the procedure set that the transition points to, if the selected transition format allows for the transition to point to another set. If the format does NOT allow for pointing to another set, a selection will not be available. From b972e40a28fa30326d478faf0cd79e52cc87bf57 Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 7 Nov 2024 08:26:26 -0500 Subject: [PATCH 4/9] C2024-025 Remove the tall box characters from the search results. --- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 36 ++++++++++++++++++- .../Volian.Controls.Library/DisplaySearch.cs | 10 +++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index f5ea88f6..e14ea891 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2752,6 +2752,29 @@ namespace VEPROMS.CSLA.Library } #endregion UnlinkEnhanced #region Search + + //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree + //Create cleaned version of variable for use in DisplaySearch + //This is the Function that does the cleaning + public string CleanSearchString(string value) + { + // \u000C = PageBreak + // \u0009 = Tab + // \u160? = Hard Space + // \u0007 = Bell (Separates Parent Path and Child Path) + // \u0011 - Separates DisplayNumber & DisplayText of Step + + if (value == null) + return null; + + string tmp = value.Replace("\a", "\\").Replace("\u0007", "\\"); + tmp = tmp.Replace("\u000C", " ").Replace("\u0009", " ").Replace(@"\u160?", " ").Replace("\u0011", " "); + + if (tmp.StartsWith("\\")) + tmp = tmp.Substring(1); + return tmp; + } + internal string _SearchDVPath; public string SearchDVPath { @@ -2767,7 +2790,11 @@ namespace VEPROMS.CSLA.Library return _SearchDVPath; } } - internal string _SearchPath; + //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree + //Create cleaned version of variable for use in DisplaySearch + public string SearchDVPath_clean => CleanSearchString(SearchDVPath); + + internal string _SearchPath; public string SearchPath { get @@ -2790,6 +2817,10 @@ namespace VEPROMS.CSLA.Library return _SearchPath; } } + //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree + //Create cleaned version of variable for use in DisplaySearch + public string SearchPath_clean => CleanSearchString(SearchPath); + public string ShortSearchPath { get @@ -2800,6 +2831,9 @@ namespace VEPROMS.CSLA.Library return dtext; } } + //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree + //Create cleaned version of variable for use in DisplaySearch + public string ShortSearchPath_clean => CleanSearchString(ShortSearchPath); // B2021-076: Proms search results are not presented in order when printed to PDF internal string _SearchDefaultSort; diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index e222959a..cbe23ae4 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -66,7 +66,7 @@ namespace Volian.Controls.Library private Color saveGrpPanSearchResults; private ItemInfoList _SearchResults; - private string _DisplayMember = "SearchPath"; + private string _DisplayMember = "SearchPath_clean"; private bool _OpenDocFromSearch; private ROFSTLookup _MyROFSTLookup; private bool _LoadingList = false; @@ -1745,7 +1745,7 @@ namespace Volian.Controls.Library } // B2021-076: Proms search results are not presented in order when printed to PDF - if (_DisplayMember == "SearchPath" || _DisplayMember == "ShortSearchPath") + if (_DisplayMember == "SearchPath_clean" || _DisplayMember == "ShortSearchPath_clean") { cbSorted.Checked = false; cbSorted.Enabled = false; @@ -1880,10 +1880,10 @@ namespace Volian.Controls.Library switch (cmbResultsStyle.Text) { case "Document Path": - _DisplayMember = "SearchDVPath"; + _DisplayMember = "SearchDVPath_clean"; break; case "Step Path": - _DisplayMember = "ShortSearchPath"; + _DisplayMember = "ShortSearchPath_clean"; break; case "Annotation Text": _DisplayMember = "SearchAnnotationText"; @@ -1892,7 +1892,7 @@ namespace Volian.Controls.Library _DisplayMember = "DisplayText"; break; default: - _DisplayMember = "SearchPath"; + _DisplayMember = "SearchPath_clean"; break; } DisplayResults(); From 1da2b8e87c29cfed356f02dfcfd9aab19f702c8c Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 7 Nov 2024 09:13:40 -0500 Subject: [PATCH 5/9] B2024-064 Improve user experience by providing more descriptive wording when cannot change the Applicability of a Step/Section. --- PROMS/Volian.Controls.Library/DisplayApplicability.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/DisplayApplicability.cs b/PROMS/Volian.Controls.Library/DisplayApplicability.cs index 56e270b2..51947f06 100644 --- a/PROMS/Volian.Controls.Library/DisplayApplicability.cs +++ b/PROMS/Volian.Controls.Library/DisplayApplicability.cs @@ -236,7 +236,11 @@ namespace Volian.Controls.Library else { StringBuilder sb = new StringBuilder(); - sb.AppendLine("Changing the applicability for this step will invalidate a transition in the following steps..."); + string tmpwrd = MyItemInfo.IsSection ? "section" : "step"; + sb.AppendLine($"The applicability for this {tmpwrd} cannot be changed due to transition links."); + sb.AppendLine("Applicability settings will return to original settings when OK is selected."); + sb.AppendLine($"Changing the applicability for this {tmpwrd} will invalidate a transition in the following steps..."); + sb.AppendLine(); // B2021-149: if step, put out line for every invalidTrans, if procedure only put out those that are external // determine this by looking strings for source and target (to), if procedure level and internal the target starts From 934d3977d888cd8404610fe23ab288f50189d40e Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 7 Nov 2024 10:08:26 -0500 Subject: [PATCH 6/9] C2024-021 Update the tool tip on the Time Critical Action Summary option (Step Properties panel) to reflect the Time Critical Action Summary text rather than the Continuous Action Summary text. --- PROMS/Volian.Controls.Library/DisplayTags.Designer.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs index ce365066..e950887a 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.Designer.cs @@ -501,8 +501,7 @@ namespace Volian.Controls.Library this.cbTCAS.Margin = new System.Windows.Forms.Padding(2); this.cbTCAS.Name = "cbTCAS"; this.cbTCAS.Size = new System.Drawing.Size(167, 15); - this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section\r\n\r\nkeyboard command: ", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Time Critical Action Summary", "", "Include this in the Time Critical Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbTCAS.TabIndex = 3; this.cbTCAS.Text = "Time Critical Action Summary"; this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged); From 1507cf31ce189c29aa7ec9005da8765b1402f2a2 Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 7 Nov 2024 15:06:38 -0500 Subject: [PATCH 7/9] C2024-022 Add option to select by unit when generating a Time Critical Action Summary from the ribbon in a Parent document. --- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 7a041db1..83c309fd 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1985,6 +1985,9 @@ namespace Volian.Controls.Library case "Cont. Act\r\nSummary": btnCASCreate_Click(sender, e); break; + case "Time Crit\r\nSummary": + btnTCASCreate_Click(sender, e); + break; } MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = 0; // unselect the unit (child) } @@ -1999,6 +2002,9 @@ namespace Volian.Controls.Library btnCASCreate.SubItems.Clear(); btnCASCreate.Tag = null; btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click); + btnTCASCreate.SubItems.Clear(); + btnTCASCreate.Tag = null; + btnTCASCreate.Click -= new System.EventHandler(btnTCASCreate_Click); btnReviewCreatePDF.SubItems.Clear(); btnReviewCreatePDF.Tag = null; btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click); @@ -2025,6 +2031,9 @@ namespace Volian.Controls.Library btnCASCreate.SubItems.Add(btn); btn = MakeSubMenuButton(s, k, miMultiUnit_Click); btn.Enabled = procAppl; + btnTCASCreate.SubItems.Add(btn); + btn = MakeSubMenuButton(s, k, miMultiUnit_Click); + btn.Enabled = procAppl; btnReviewPdfQuickCreate.SubItems.Add(btn); } btnPdfCreate.AutoExpandOnClick = true; @@ -2032,6 +2041,7 @@ namespace Volian.Controls.Library btnReviewCreatePDF.AutoExpandOnClick = true; btnReviewPdfQuickCreate.AutoExpandOnClick = true; btnCASCreate.AutoExpandOnClick = true; + btnTCASCreate.AutoExpandOnClick = true; } private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler) { From c7d2140e1640bd353c97884211826c390c61ac42 Mon Sep 17 00:00:00 2001 From: mschill Date: Fri, 8 Nov 2024 15:37:49 -0500 Subject: [PATCH 8/9] B2024-090 If multiple tabs are left open, and Find is clicked before clicking on a tab, PROMS would crash. --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 378769a5..fb8e90dd 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -2385,6 +2385,16 @@ namespace VEPROMS OpenItem(_Procedure); // SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work. SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel; + + //CSM B2024-090 - if last displaytab item, + //select the steptab panel for it + //and set the EditItem for Find/Replace + //otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus + if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1)) + { + SelectedStepTabPanel.Select(); + dlgFindReplace.MyEditItem = tc.MyEditItem; + } } } } From 4bc73f847ccba72fbb610e8c117442c9f2fcd393 Mon Sep 17 00:00:00 2001 From: mschill Date: Mon, 11 Nov 2024 07:15:02 -0500 Subject: [PATCH 9/9] B2024-092 Add Initial Line/Ability to Disable to UI for South Texas --- PROMS/Formats/fmtall/hlpfsgall.xml | Bin 107312 -> 107312 bytes .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 18 ++++++++++-------- PROMS/Volian.Controls.Library/DisplayTags.cs | 2 +- PROMS/Volian.Print.Library/vlnParagraph.cs | 7 ++++++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/PROMS/Formats/fmtall/hlpfsgall.xml b/PROMS/Formats/fmtall/hlpfsgall.xml index 9b2a83dcf467045e17f858ceedc0b2771ab3ec41..828c3fb1653e8e916b98d8fcd8df38e9fbb1d028 100644 GIT binary patch delta 30 kcmdmRjBNuD#fUH)G8jyb7cplxU@&W*DYAX02;=lV0HCf3-2eap delta 30 icmdmRjBNuD#fUH)F_=t_7cmFX%`-)|&lF*t-Uk4o4hiA_ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index e14ea891..bfdfa46d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4286,7 +4286,7 @@ namespace VEPROMS.CSLA.Library tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph _MyTab.Text = tstr; //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line - if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled) + if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled) { if (tstr.StartsWith(" ")) tstr = tstr.Substring(1); @@ -4384,7 +4384,7 @@ namespace VEPROMS.CSLA.Library { //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub; - if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_")) + if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_")) { if (tstr.StartsWith(" ")) tstr = tstr.Substring(1); @@ -4401,7 +4401,7 @@ namespace VEPROMS.CSLA.Library { //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub + " "; - if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_")) + if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_")) { if (tstr.StartsWith(" ")) tstr = tstr.Substring(1); @@ -4417,7 +4417,7 @@ namespace VEPROMS.CSLA.Library string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub; //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line tmprnotab = tmprnotab.TrimStart(); - if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_")) + if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_")) { if (tmprnotab.StartsWith(" ")) tmprnotab = tmprnotab.Substring(1); @@ -4435,7 +4435,7 @@ namespace VEPROMS.CSLA.Library _MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText; _MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text; //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line - if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_")) + if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_")) { if (_MyTab.CleanText.StartsWith(" ")) _MyTab.CleanText = _MyTab.CleanText.Substring(1); @@ -4783,7 +4783,7 @@ namespace VEPROMS.CSLA.Library // Note could have modified logic for clock macro (above) but older logic uses the IdentEdit setting // for CAS (Continuous Action Summary steps) that have a circle printed around the step number // this is the least impact of current code/formats - if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag)) + if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag)) { int eidx = tbformat.IndexOf("}", macroindx); if (eidx > -1) @@ -4806,12 +4806,14 @@ namespace VEPROMS.CSLA.Library } } //CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line - else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled) + else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled) { if (cltext == null) cltext = tbformat; if (cltext.StartsWith(" ")) cltext = cltext.Substring(1); + if (tbformat.StartsWith(" ")) + tbformat = tbformat.Substring(1); cltext = FormatStepData.TabData.MacroEditTag + cltext; } } @@ -5620,7 +5622,7 @@ namespace VEPROMS.CSLA.Library } //CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro - if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled) + if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled) addToList = false; if (addToList) tmp.Add(macro); diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index e1dcb28f..0a86be21 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -559,7 +559,7 @@ namespace Volian.Controls.Library //CSM F2024 - 080: For South Texas (HLP formats), enable the initial line checkbox if it is in the formats //Also, they want disable being selected to impact substeps - so do not show toggle if selected on a parent step cbInitialLine.Visible = cbInitialLine.Enabled = false; - if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData.TabData.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO)) + if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData?.TabData?.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO)) { cbInitialLine.Visible = cbInitialLine.Enabled = true; cbInitialLine.Checked = sc.Step_DisableInitialLine; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 5148bd3e..9c91303f 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -3781,7 +3781,12 @@ namespace Volian.Print.Library else if (itemInfo.MyTab.AltPrintTab != null) mytab = new vlnTab(cb, this, itemInfo.MyTab.AltPrintTab, itemInfo.MyTab.AltPrintTab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); else - mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, itemInfo.MyTab.CleanText, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); + { + string clntxt = itemInfo.MyTab.CleanText; + if (!string.IsNullOrEmpty(itemInfo.FormatStepData?.TabData?.MacroEditTag) && itemInfo.FormatStepData.TabData.MacroEditTag == "_" && clntxt.StartsWith("_")) + clntxt = clntxt.Substring(1); + mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, clntxt, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); + } PartsLeft.Add(mytab); if (mytab.MyMacro != null) PartsLeft.Add(mytab.MyMacro); }