diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 6a3c5585..c8963e36 100644 Binary files a/PROMS/Formats/fmtall/BVPS1all.xml and b/PROMS/Formats/fmtall/BVPS1all.xml differ diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index ca2e8c7f..009956d3 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -45,7 +45,6 @@ namespace VEPROMS this.itemContainer3 = new DevComponents.DotNetBar.ItemContainer(); this.btnNew = new DevComponents.DotNetBar.ButtonItem(); this.btnOpen = new DevComponents.DotNetBar.ButtonItem(); - this.btnPrint = new DevComponents.DotNetBar.ButtonItem(); this.btnPrepare = new DevComponents.DotNetBar.ButtonItem(); this.btnAdmin = new DevComponents.DotNetBar.ButtonItem(); this.btnUpdateFormats = new DevComponents.DotNetBar.ButtonItem(); @@ -339,7 +338,6 @@ namespace VEPROMS this.itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnNew, this.btnOpen, - this.btnPrint, this.btnPrepare, this.btnAdmin}); // @@ -365,16 +363,7 @@ namespace VEPROMS this.btnOpen.SubItemsExpandWidth = 24; this.btnOpen.Text = "&Open..."; this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click); - // - // btnPrint - // - this.btnPrint.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btnPrint.Enabled = false; - this.btnPrint.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.Image"))); - this.btnPrint.Name = "btnPrint"; - this.btnPrint.SubItemsExpandWidth = 24; - this.btnPrint.Text = "Create &PDF"; - this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click); + // // btnPrepare // @@ -1646,7 +1635,6 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonItem btnNew; private DevComponents.DotNetBar.ButtonItem btnOpen; private DevComponents.DotNetBar.ButtonItem btnPrepare; - private DevComponents.DotNetBar.ButtonItem btnPrint; private DevComponents.DotNetBar.ItemContainer icRecentDocs; private DevComponents.DotNetBar.LabelItem labelItem8; private DevComponents.DotNetBar.ItemContainer itemContainer5; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 5a053a74..3290cd6c 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -2098,7 +2098,6 @@ namespace VEPROMS btnAdministrativeTools.Click += new EventHandler(btnAdministrativeTools_Click); btnAdmin.SubItems.Add(btnAdministrativeTools); - this.superTooltip1.SetSuperTooltip(btnPrint, new SuperTooltipInfo("Create PDF", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnExit, new SuperTooltipInfo("Exit", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnOptions, new SuperTooltipInfo("Options", null, null, null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", null, null, null, null, eTooltipColor.Gray)); @@ -4114,10 +4113,6 @@ namespace VEPROMS lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole; - if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1) - btnPrint.Visible = false; - else - btnPrint.Visible = true; // Reset the ribbon buttons B2016-148 (ex. a copystep done in a different procedure tab my require the paste step options to be active if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyStepTabPanel != null) // MyStepTabPanel will be null if the active tab is a Word Attachment @@ -4372,7 +4367,6 @@ namespace VEPROMS ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened. } - btnPrint.Enabled = (_CurrentItem != null); } void _LastStepRTB_EditModeChanged(object sender, EventArgs args) @@ -4864,12 +4858,7 @@ namespace VEPROMS StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily; } - private void btnPrint_Click(object sender, EventArgs e) - { - DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure); - prnDlg.MySessionInfo = MySessionInfo; - prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window - } + private void lblResolution_Click(object sender, EventArgs e) {