From 07e215a9ca719a8e1f1835bd70858c70f746e38b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 22 May 2020 13:51:15 +0000 Subject: [PATCH] C2020-013 Add submenu to ribbon buttons to print child procedures --- PROMS/Volian.Controls.Library/DisplayTabControl.cs | 1 + PROMS/Volian.Controls.Library/DisplayTabItem.cs | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 06df8506..e380f647 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -753,6 +753,7 @@ namespace Volian.Controls.Library public void CloseTabItem(DisplayTabItem myTabItem) { + if (myTabItem.ContainerControl == null) return; Bar b = myTabItem.ContainerControl as Bar; if (b != null) { diff --git a/PROMS/Volian.Controls.Library/DisplayTabItem.cs b/PROMS/Volian.Controls.Library/DisplayTabItem.cs index bbaa9a0e..f82986cc 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabItem.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabItem.cs @@ -263,20 +263,8 @@ namespace Volian.Controls.Library if (dvi == null) return; if (dvi.VersionType > 127) MyStepTabPanel.MyStepPanel.VwMode = E_ViewMode.View; - //added by jcb 20130718 to support disabling create pdf button when multiunit until user selects a unit if (dvi.MultiUnitCount > 1) - { - this.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = false; - this.MyStepTabPanel.MyStepTabRibbon.btnCASCreate.Enabled = false; - this.MyStepTabPanel.MyStepTabRibbon.btnReviewCreatePDF.Enabled = false; - } - else - { - this.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = true; - this.MyStepTabPanel.MyStepTabRibbon.btnCASCreate.Enabled = true; - this.MyStepTabPanel.MyStepTabRibbon.btnReviewCreatePDF.Enabled = true; - } - //end added by jcb 20130718 + this.MyStepTabPanel.MyStepTabRibbon.SetParentChildCreatePDFButton(dvi.UnitNames); //C2020-013 add parent/child sub menu items for printing specific children (units) } void _MyItemInfo_Changed(object sender) {