diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index d258a8c6..7bca80db 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -340,7 +340,7 @@ namespace VEPROMS.CSLA.Library get { if (IsStep) - return FormatStepData.Type; + return FormatStepData.StepEditData.TypeMenu.MenuItem; //FormatStepData.Type; else if (IsSection) return MyDocStyle.Name; return "Procedure Title"; diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs index 7276eecd..694c9fe3 100644 --- a/PROMS/Volian.Controls.Library/GridItem.cs +++ b/PROMS/Volian.Controls.Library/GridItem.cs @@ -328,7 +328,8 @@ namespace Volian.Controls.Library DevComponents.DotNetBar.SuperTooltipInfo tpi = new DevComponents.DotNetBar.SuperTooltipInfo("", "", tip, null, null, DevComponents.DotNetBar.eTooltipColor.Lemon); _MyToolTip.MinimumTooltipSize = new Size(0, 24); _MyToolTip.TooltipDuration = 3; - _MyToolTip.SetSuperTooltip(MyStepRTB, tpi); + //_MyToolTip.SetSuperTooltip(MyStepRTB, tpi); + _MyToolTip.SetSuperTooltip(MyFlexGrid, tpi); } public override void RefreshContent() { diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index dc4ca2b9..96f2bdd2 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1273,8 +1273,19 @@ namespace Volian.Controls.Library } if (!surpressMessageBox) { - string msgs = stpi.HasChildren ? "Are you sure you want to delete this step and its substeps?" : "Are you sure you want to delete this step?"; + string typeDescription = MyEditItem.MyStepData.StepEditData.TypeMenu.MenuItem; + string msgs = ""; + if (MyFlexGrid != null) MyEditItem.IdentifyMe(true); + MyEditItem.IdentifyChildren(true); + if (stpi.HasChildren) + msgs = string.Format("Are you sure you want to delete this {0} and its substeps?", typeDescription); + else + msgs = string.Format("Are you sure you want to delete this {0}?", typeDescription); + //string msgs = stpi.HasChildren ? "Are you sure you want to delete this step and its substeps?" : "Are you sure you want to delete this step?"; DialogResult results = MessageBox.Show(msgs, "Verify Delete", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (MyFlexGrid != null) + MyFlexGrid.Styles.Fixed.BackColor = MyFlexGrid.DefaultFixedBackgroundColor; + MyEditItem.IdentifyChildren(false); if (results == DialogResult.Yes) MyEditItem.RemoveItem(); }