B2024-062 printing a procedure that is empty displays the Empty Procedure message. WhenOK button is clicked, PROMS will exit the Print function..

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -231,6 +231,7 @@ namespace VEPROMS
 			cbxOpenAfterCreate2.Visible = oneProcedure;
 			cbxOpenAfterCreate2.Checked = false;
 			cbxOverwritePDF2.Visible = oneProcedure;
+			cbxOverwritePDF2.Checked = true;
 			gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode;
 			swtbtnGeneratePlacekeeper.Value = false;
 			cbxGenerateConActSum.Checked = false;
@@ -1205,23 +1206,18 @@ namespace VEPROMS
 		private bool validateDate(TextBox txtDate)
 		{
 			DateTime dDate;
-			if (!(txtDate.Text == ""))
+			if (DateTime.TryParse(txtDate.Text, out dDate))
 			{
-
+				return true;
-				if (DateTime.TryParse(txtDate.Text, out dDate))
+			}
-				{
+			else
-					return true;
+			{
-				}
+				string txtDate2 = txtDate.Text;
-				else
+				string message = String.Format("Date {0} in wrong format" + System.Environment.NewLine + "Correct the revision date.", txtDate2);
-				{
+				string txtTitle = "Invalid Format";
-					string txtDate2 = txtDate.Text;
+				MessageBox.Show(message, txtTitle);
-					string message = String.Format("Date {0} in wrong format" + System.Environment.NewLine + "Correct the revision date.", txtDate2);
+				return false;
-					string txtTitle = "Invalid Format";
-					MessageBox.Show(message, txtTitle);
-					return false;
-				}
 			}
-			return true;
 		}
 
 		private void txbRevDate_Enter(object sender, EventArgs e)

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -427,7 +427,7 @@ namespace VEPROMS
 			}
 			if (canceledPressed)
 			{
-				MessageBox.Show(string.Format("Cancelling the import of:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Cancelling Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				MessageBox.Show(string.Format("Canceling the import of:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				btnCloseImport.PerformClick();
 			}
 		}

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -511,7 +511,7 @@ namespace VEPROMS
 
 		private void btnPC_Click(object sender, EventArgs e)
 		{
-			if (MessageBox.Show(this, "Are you sure you want to add Applicability to this Working Draft?", "Add Applicability", MessageBoxButtons.YesNo, MessageBoxIcon.Stop) == DialogResult.Yes)
+			if (MessageBox.Show(this, "Are you sure you want to add Applicability to this Working Draft?", "Add Applicability", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Stop) == DialogResult.Yes)
 			{
 				btnApplicability.Visible = true;
 				tiApplicability.Visible = true;

PROMS/Volian.Controls.Library/AnnotationDetails.cs

@@ -674,15 +674,12 @@ namespace Volian.Controls.Library
 				{
 					using (Annotation annotation = CurrentAnnotation.Get())
 					{
-						if (annotation != null) // B2024-061 check for null reference
+						annotation.RtfText = rtxbComment.Rtf;
-						{
+						annotation.SearchText = rtxbComment.Text;
-							annotation.RtfText = rtxbComment.Rtf;
+						annotation.MyAnnotationType = annotationType;
-							annotation.SearchText = rtxbComment.Text;
+						annotation.DTS = DateTime.Now;
-							annotation.MyAnnotationType = annotationType;
+						annotation.UserID = Volian.Base.Library.VlnSettings.UserID;
-							annotation.DTS = DateTime.Now;
+						annotation.Save();
-							annotation.UserID = Volian.Base.Library.VlnSettings.UserID;
-							annotation.Save();
-						}
 					}
 				}
 			}

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -103,7 +103,7 @@ namespace Volian.Controls.Library
 		public string TbFSwd
 		{
 			get	{return tbFSWd.Text;}
-			set { tbFSWd.Text = value; tbFSWd.Refresh(); } //  trBarFS.Value = Convert.ToInt32(value);
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); trBarFS.Value = Convert.ToInt32(value); }
 		}
 
 		public string TbFSht
@@ -111,7 +111,7 @@ namespace Volian.Controls.Library
 			get { return tbFSHt.Text; }
 			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
 		}
-
+	
 		#endregion
 		#region Constructor
 		public DisplayTags()

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -256,8 +256,7 @@ namespace Volian.Controls.Library
 		private int _origCfgHt = 0;	// keep track if original size was stored in cfg
 		private int _origCfgWd = 0;
 		private bool _pastedNew = false;   // need this for flagging newly pasted image (may need to clear cfg)
-		private DisplayTags _displayTags = new DisplayTags();
+		private DisplayTags _displayTags;
-		//House myhouse = new House();
 
 		#endregion
 		#region Constructors
@@ -317,11 +316,8 @@ namespace Volian.Controls.Library
 		}
 		private void SetWidthsAndHeights(System.Drawing.Image img)
 		{
-
 			int wd = img.Width * MyStepPanel.DPI / 72; // converts from screen resolution's DPI to image's points (72/inch)
 			int ht = img.Height * MyStepPanel.DPI / 72;
-
-
 			if (MyItemInfo.MyContent.MyImage != null)   // image is null if creating new.
 			{
 				ImageConfig ic = new ImageConfig(MyItemInfo.MyContent.MyImage);
@@ -344,9 +340,9 @@ namespace Volian.Controls.Library
 				_displayTags.TbFSwd = wd.ToString();
 				_displayTags.TbFSht = ht.ToString();
 			}
+
+
 		}
-
-
 		// the following gets called for 'NEW' images
 		private E_ImageSource InsType = E_ImageSource.None;
 		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem, ImageItem.E_ImageSource insType, DisplayTags displayTags)