Merge pull request 'Development' (#338) from Development into master

Merging C2019-047 from development into master after successful testing.

PROMS/Formats/Formats.csproj

@@ -126,6 +126,7 @@
     <Content Include="fmtall\BVPSAOPall.xml" />
     <Content Include="fmtall\BVPSAtchall.xml" />
     <Content Include="fmtall\BVPSBCKall.xml" />
+    <Content Include="fmtall\BVPSAOPDEVall.xml" />
     <Content Include="fmtall\BVPSFlexDEVall.xml" />
     <Content Include="fmtall\BVPSDEVall.xml" />
     <Content Include="fmtall\BVPSNIBCKall.xml" />
@@ -406,6 +407,7 @@
     <Content Include="genmacall\BVPSAOP.svg" />
     <Content Include="genmacall\BVPSAtch.svg" />
     <Content Include="genmacall\BVPSbck.svg" />
+    <Content Include="genmacall\BVPSAOPdev.svg" />
     <Content Include="genmacall\BVPSFlexdev.svg" />
     <Content Include="genmacall\BVPSdev.svg" />
     <Content Include="genmacall\BVPSNIBCK.svg" />

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;

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));
@@ -3126,24 +3125,46 @@ namespace VEPROMS
 							if (dvi != null)
 							{
 								DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true);
-								if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1;
+								if (dvi.MultiUnitCount == 0)
+								{
+									prnDlg.SelectedSlave = -1;
+								}
+								else if (dvi.MultiUnitCount > 0)
+								{
+									string[] arguments = Environment.GetCommandLineArgs();
+									for (int i = 0; i < arguments.Length; i++)
+									{
+										if (arguments[i].Contains("/C="))
+										{
+											Console.WriteLine("In arguments loop");
+											//int num;
+											string[] childarg = arguments[i].Split('=');
+											if (int.TryParse(childarg[1], out int num))
+											{
+												prnDlg.SelectedSlave = num;
+											}
+										}
+									}
+
+								}
 								prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties)
 								prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window
 														 //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed);
 														 //while (!_RunNext) Application.DoEvents();
-							}
+
 							}
 							
+						}
 						ranAuto = true;
 					}
-				}
-			}
 
 					if (ranAuto)
 					{
 						this.Close();
 					}
 				}
+			}
+		}
 
 		private FontFamily GetFamily(string name)
 		{
@@ -4092,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
@@ -4350,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)
@@ -4842,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)
 		{

PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs

@@ -254,7 +254,7 @@ namespace VEPROMS
 			// 
 			this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.ppBtnCancel.Location = new System.Drawing.Point(742, 342);
+			this.ppBtnCancel.Location = new System.Drawing.Point(742, 338);
 			this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnCancel.Name = "ppBtnCancel";
 			this.ppBtnCancel.Size = new System.Drawing.Size(56, 21);
@@ -266,7 +266,7 @@ namespace VEPROMS
 			// ppBtnOK
 			// 
 			this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ppBtnOK.Location = new System.Drawing.Point(669, 342);
+			this.ppBtnOK.Location = new System.Drawing.Point(669, 338);
 			this.ppBtnOK.Margin = new System.Windows.Forms.Padding(2);
 			this.ppBtnOK.Name = "ppBtnOK";
 			this.ppBtnOK.Size = new System.Drawing.Size(56, 21);

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -29,6 +29,7 @@ namespace VEPROMS
 		private List<MiniConfig> _DeletedApples;
 		private List<EnhancedMiniConfig> _Enhanced;
 		private DocVersionConfig _DocVersionConfig;
+		private string _OrgPDFPath; // B2024-030 used to save last PDF path
 		
 		// Default values
 		private string _DefaultFormatName = null;
@@ -97,6 +98,7 @@ namespace VEPROMS
 
 			_Initializing = true;
 			InitializeComponent();
+			_OrgPDFPath = _DocVersionConfig.Print_PDFLocation; // B2024-030 save last PDF path
 			btnGeneral.PerformClick(); // always start with General tab or button
 			_Initializing = false;
 
@@ -323,8 +325,6 @@ namespace VEPROMS
 				tiApplicability.Visible = false;
 			}
 
-			ppTxtBxPDFLoc.TextChanged += new EventHandler(ppTxtBxPDFLoc_TextChanged);
-
 			//end add new applicability stuff
 			lblProcSetRev.Visible = ppRTxtProcSetRev.Visible = _DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.MyStepSectionPrintData.UseXtraRevNumber;
 
@@ -538,11 +538,32 @@ namespace VEPROMS
 			}
 		}
 
-		// The following code was added to fix Bug B2013-117
+		//B2024-030 Check the PDF Location path and prompt to create the folders if needed
-		private void ppTxtBxPDFLoc_TextChanged(object sender, EventArgs e)
+		private void CheckPDFLocationPath()
 		{
-			if (_Initializing == false)
+			string pdfloc = ppTxtBxPDFLoc.Text;
-				_DocVersionConfig.Print_PDFLocation = ppTxtBxPDFLoc.Text;
+			if (pdfloc == string.Empty) return;
+			if (!Directory.Exists(ppTxtBxPDFLoc.Text))
+			{
+				string msg = string.Format(" The Folder: '{0}' does not exist. \n\nCreate it?", ppTxtBxPDFLoc.Text);
+				DialogResult dr = MessageBox.Show(msg, "PDF Location Folder Not Found", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+				if (dr == DialogResult.Yes)
+				{
+					try
+					{
+						Directory.CreateDirectory(ppTxtBxPDFLoc.Text);
+					}
+					catch (Exception ex)
+					{
+						MessageBox.Show(ex.Message, "Error trying to create folder", MessageBoxButtons.OK, MessageBoxIcon.Error);
+						_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
+					}
+				}
+				else
+				{
+					_DocVersionConfig.Print_PDFLocation = _OrgPDFPath; // reset to the path we started with
+				}
+			}
 		}
 
 		private string AddSlaveNode(MiniConfig mc)
@@ -588,6 +609,9 @@ namespace VEPROMS
 
 		private void btnVersionsPropOK_Click(object sender, EventArgs e)
 		{
+			//B2024-030 Check the PDF Location path and prompt to create the folders if needed
+			CheckPDFLocationPath();
+
 			docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick  B2015-157
 
 			// if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
@@ -773,7 +797,6 @@ namespace VEPROMS
 
 			// B2019-132 update the association count for this working draft
 			_DocVersionConfig.MyDocVersion.MyDocVersionInfo.RefreshDocVersionAssociations();
-
 			this.Close();
 		}
 

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -56,6 +56,9 @@ namespace Volian.Controls.Library
 
 		private ROFSTLookup.rochild selectedChld;
 
+		private DisplayTags displayTags;
+
+
 		#endregion
 
 		#region Properties
@@ -268,6 +271,10 @@ namespace Volian.Controls.Library
 				_searchTimer.Stop();
 			}
 
+
+			// Initialize the DisplayTags object
+			displayTags = new DisplayTags();
+
 			_progressBar = null;
 		}
 
@@ -968,6 +975,9 @@ namespace Volian.Controls.Library
 						errormsg = (replacingRO) ? "a graphics RO with a non-graphcis RO." : "a Graphics RO in an non-Figure or a non-Accessory Page type.";
 						//TODO: Prompt user to insert a new substep type that handles x/y Plots and place this RO into it
 						goodToGo = false;
+
+						
+
 	}
 					break;
 			}

PROMS/Volian.Controls.Library/DisplayTags.Designer.cs

@@ -640,7 +640,7 @@ namespace Volian.Controls.Library
 			this.btnFSrestore.Location = new System.Drawing.Point(112, 27);
 			this.btnFSrestore.Margin = new System.Windows.Forms.Padding(2);
 			this.btnFSrestore.Name = "btnFSrestore";
-			this.btnFSrestore.Size = new System.Drawing.Size(54, 26);
+			this.btnFSrestore.Size = new System.Drawing.Size(54, 20);
 			this.btnFSrestore.TabIndex = 6;
 			this.btnFSrestore.Text = "Restore";
 			this.btnFSrestore.UseVisualStyleBackColor = true;

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -96,6 +96,22 @@ namespace Volian.Controls.Library
 			get { return Visible; }
 			set { if (Visible != value) Visible = value; }
 		}
+
+		/// <summary>
+		/// Expose text properties for height and widht to handle selecting RO Image Types.
+		/// </summary>
+		public string TbFSwd
+		{
+			get	{return tbFSWd.Text;}
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); trBarFS.Value = Convert.ToInt32(value); }
+		}
+
+		public string TbFSht
+		{
+			get { return tbFSHt.Text; }
+			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
+		}
+	
 		#endregion
 		#region Constructor
 		public DisplayTags()
@@ -383,6 +399,8 @@ namespace Volian.Controls.Library
 				cmbCheckoff.Enabled = false;
 			}
 
+			
+
 			// show the part of panel for resizing a figure (if figure already exists: MyImage is set for non-RO existing images & content.text has a link in it)
 			if (MyEditItem.MyItemInfo.IsFigure && (MyEditItem.MyItemInfo.MyContent.MyImage != null || MyEditItem.MyItemInfo.MyContent.Text.ToUpper().Contains("#LINK")))
 			{
@@ -393,17 +411,38 @@ namespace Volian.Controls.Library
 				float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
 				float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
 				float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
-				trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
+
-				if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
+				SetFigure(wd1, wd2);
-				trBarFS.Minimum = Math.Min(wd, 72);
+
-				trBarFS.Value = (int)wd;
+				tbFSWd.Text = wd.ToString();
-				ImageItem ii = MyEditItem as ImageItem;
+				tbFSHt.Text = ht.ToString();
-				_origFigureSizeWidth = ii.MyPictureBox.Width;
+
-				tbFSWd.Text = ii.MyPictureBox.Width.ToString();
+				//trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
-				tbFSHt.Text = ii.MyPictureBox.Height.ToString();
+				//if (wd > trBarFS.Maximum) trBarFS.Maximum = wd + 1;
+				//trBarFS.Minimum = Math.Min(wd, 72);
+				//trBarFS.Value = (int)wd;
+				//ImageItem ii = MyEditItem as ImageItem;
+				//_origFigureSizeWidth = ii.MyPictureBox.Width;
+				//tbFSWd.Text = ii.MyPictureBox.Width.ToString();
+				//tbFSHt.Text = ii.MyPictureBox.Height.ToString();
 			}
 			else
 			{
+				if (MyEditItem.MyItemInfo.IsFigure)
+				{
+					//No Current image, but still show groupPanelFigSize, will adjust when file is selected, but let's give it a default
+					//size on using the picturebox.
+					groupPanelFigSize.Visible = true;
+					int ht = (MyEditItem as ImageItem).MyPictureBox.Height;
+					int wd = (MyEditItem as ImageItem).MyPictureBox.Width;
+					_origFigureSizeRatio = (float)ht / (float)wd;   // use this to keep width/height ratio while changing size.
+					float wd1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageWidth - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.LeftMargin;
+					float ht1 = (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.PageLength - (float)MyEditItem.MyItemInfo.MyDocStyle.Layout.TopMargin - 36;  // 36 is to allow for end message 
+					float wd2 = Math.Min(wd1, ht1 / _origFigureSizeRatio);      // keep original ratio
+
+					SetFigure(wd1, wd2);
+				}
+				else
 					groupPanelFigSize.Visible = false;
 			}
 
@@ -516,6 +555,22 @@ namespace Volian.Controls.Library
 			}
 			_Initalizing = false;
 		}
+		public void SetFigure(double wd, double wd2)
+		{
+			// Check MyEditItem type and cast if needed
+			ImageItem ii = MyEditItem as ImageItem;
+			if (ii == null) return;
+
+			// Set the values as needed
+			trBarFS.Maximum = Math.Max((int)wd2, trBarFS.Maximum);
+			if (wd > trBarFS.Maximum) trBarFS.Maximum = (int)wd + 1;
+			trBarFS.Minimum = Math.Min((int)wd, 72);
+			trBarFS.Value = (int)wd;
+			_origFigureSizeWidth = ii.MyPictureBox.Width;
+			//tbFSWd.Text = ii.MyPictureBox.Width.ToString();
+			//tbFSHt.Text = ii.MyPictureBox.Height.ToString();
+		}
+
 		private int DoListStepTypes(FormatData fmtdata, StepData topType, string curType)
 		{
 			int cursel=-1;
@@ -857,7 +912,7 @@ namespace Volian.Controls.Library
 			}
 		}
 		private float _origFigureSizeRatio = 0;		// keep original ratio & width in case of 'restore'
-		private int _origFigureSizeWidth = 0;
+		public int _origFigureSizeWidth = 0;
 		// support user changing size using slider.  This saves change back to ImageItem and sets 
 		// width/height text boxes to slider values.
 		private void trBarFS_Scroll(object sender, EventArgs e)
@@ -870,6 +925,8 @@ namespace Volian.Controls.Library
 		}
 		// restore the orignal image size
 		private void btnFSrestore_Click(object sender, EventArgs e)
+		{
+			if (_origFigureSizeWidth != 0)
 			{
 				tbFSWd.Text = _origFigureSizeWidth.ToString();
 				int ht = (int)(_origFigureSizeRatio * _origFigureSizeWidth);
@@ -877,6 +934,7 @@ namespace Volian.Controls.Library
 				(MyEditItem as ImageItem).SizeImage(_origFigureSizeWidth, ht);
 				trBarFS.Value = _origFigureSizeWidth;
 			}
+		}
 		// user entered width in text box, this event gets called on leave of text box.
 		private void tbFSWd_Leave(object sender, EventArgs e)
 		{

PROMS/Volian.Controls.Library/EditItem.cs

@@ -1209,7 +1209,7 @@ namespace Volian.Controls.Library
 		{
 			EditItem child = null;
 			if (MyItemInfo.IsFigure)
-				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem, FigInsType);
+				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem, FigInsType, _MyStepPropertiesPanel);
 			else if (MyItemInfo.IsRtfRaw)
 				child = new RtfRawItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem);
 			else if (MyItemInfo.MyContent.MyGrid != null)
@@ -1222,7 +1222,7 @@ namespace Volian.Controls.Library
 		{
 			EditItem child = null;
 			if (MyItemInfo.IsFigure)
-				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem, FigInsType);
+				child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem, FigInsType, _MyStepPropertiesPanel);
 			else if (MyItemInfo.IsRtfRaw)
 				child = new RtfRawItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem);
 			if (MyItemInfo.MyContent.MyGrid != null)

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -256,6 +256,8 @@ 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;
+
 		#endregion
 		#region Constructors
 		public ImageItem()
@@ -266,6 +268,7 @@ namespace Volian.Controls.Library
 		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand)
 		{
 			InitializeComponent();
+			
 			MyItemInfo = itemInfo;
 			SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, null, false);
 			if (MyItemInfo.MyContent.MyImage != null && MyItemInfo.MyContent.MyImage.Data != null)  // this is figure/image (not RO)
@@ -307,6 +310,7 @@ namespace Volian.Controls.Library
 			this.Height = MyPictureBox.Height + 10;
 			_newSizeWd = wd / (MyStepPanel.DPI / 72);
 			_newSizeHt = ht / (MyStepPanel.DPI / 72);
+
 			if (!MyItemInfo.FormatStepData.StepEditData.TypeMenu.MenuItem.ToUpper().Contains("AER")) ItemLocation = TableLocation(MyStepSectionLayoutData, ItemWidth);
 			_IsDirty = true;
 		}
@@ -330,13 +334,23 @@ namespace Volian.Controls.Library
 			MyPictureBox.SizeMode = PictureBoxSizeMode.Zoom;		// as resize matches width/height.
 			this.Width = MyPictureBox.Width + ImageMargin;
 			this.Height = MyPictureBox.Height + 10;
+			if (_displayTags != null)
+			{
+				_displayTags._origFigureSizeWidth = wd;
+				_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)
+		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem, ImageItem.E_ImageSource insType, DisplayTags displayTags)
 		{
 			InitializeComponent();
 			MyItemInfo = itemInfo;
+			_displayTags = displayTags;
+			
 			if (MyItemInfo.MyContent.MyImage != null && MyItemInfo.MyContent.MyImage.Data != null)  // this is figure/image (not RO)
 			{
 				SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, nextEditItem, false);
@@ -368,8 +382,8 @@ namespace Volian.Controls.Library
 				FileName = null;
 				//InitializeComponent();
 				SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, nextEditItem, false);
-				MyPictureBox.Width = 100;
+				//MyPictureBox.Width = 100;
-				MyPictureBox.Height = 100;
+				//MyPictureBox.Height = 100;
 				this.Width = 100 + ImageMargin;
 				this.Height = 100;
 				if (insType == ImageItem.E_ImageSource.File)
@@ -546,6 +560,7 @@ namespace Volian.Controls.Library
 							imageText = val;
 					}
 					AddROImageToScreen(W, H, imageText);
+
 				}
 				catch (Exception ex)
 				{

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1612,7 +1612,13 @@ namespace Volian.Controls.Library
 						if (!docVersionIsEnhanced && !docVersionIsSource && !procIsSource) canPaste = true;
 						else if (docVersionIsSource && !procIsSource) canPaste = true;
 						else if (docVersionIsSource) canPaste = (!procIsSource || (iiClipboard.MyDocVersion.ItemID == dvi.ItemID));
-						else if (docVersionIsEnhanced) canPaste = !procIsSource;
+						else if (docVersionIsEnhanced)
+						{
+							// B2024-028 Do not allow paste of non-enhanced into enhanced set 
+							//	(consistent with paste before/after, i.e. don't allow)
+							canPaste = false;
+							cm.MenuItems.Add("CANNOT PASTE HERE,  Click for more information...", new EventHandler(mi_Click));
+						}
 						if (iiClipboard.IsRtfRaw) canPaste = false;   // never paste an equation.
 						if (canPaste) cm.MenuItems.Add("Paste Procedure", new EventHandler(mi_Click));
 					}
@@ -2103,8 +2109,9 @@ namespace Volian.Controls.Library
 				"It can only be pasted before or after another document, within the set, that is linked to an Enhanced Document.", "Cannot Paste Here");
 					break;
 				case "CANNOT PASTE HERE,  Click for more information...":
+					// B2024-028 clarify message
 					FlexibleMessageBox.Show("You have copied a document that is NOT linked to an Enhanced Document.\n\n" +
-				"It CANNOT be pasted before or after an Enhanced Document.", "Cannot Paste Here");
+						"You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here");
 					break;
 				//case "Check Out Procedure Set":
 				//  CheckOutDocVersion(SelectedNode as VETreeNode);
@@ -3058,6 +3065,15 @@ namespace Volian.Controls.Library
 						{
 							SaveEnhancedForSection(sourceSect, newenhSection, sed.Type);
 							RefreshRelatedNode(SectionInfo.Get(newenhSection.ItemID));
+							// B2024-023: when inserting a source section, the associated
+							//	enhanced section did not appear in tree view or in edit window (if it
+							//	was displayed in editor).  Add to tree view and close the enhanced
+							//	procedure edit window. Note that closing of edit window was done to
+							//	be consistent on what happens upon delete of source w/ and enhanced
+							//	section.
+							SectionInfo tmpsi = SectionInfo.Get(newenhSection.ItemID);
+							RefreshRelatedNode(ProcedureInfo.Get(tmpsi.MyParent.ItemID));
+							OnSectionShouldClose(this, new vlnTreeSectionInfoEventArgs(tmpsi, true));
 						}
 					}
 					return;

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -699,7 +699,7 @@ namespace Volian.Print.Library
 
 				try
 				{
-					if (File.Exists(outputFileName))
+					if (File.Exists(outputFileName) && !OverWrite && !outputFileName.Contains("PageNumberPass") && !outputFileName.Contains("Foldout"))
 					{
 						if (!BaselineTesting && !SaveLinks) // B2024-031 don't do if creating PDF hyperlinks
 						{
@@ -836,14 +836,6 @@ namespace Volian.Print.Library
 			OnStatusChanged("Print " + myProcedure.DisplayNumber, PromsPrinterStatusType.Start);
 			string outputFileName = pdfFolder + "\\" + Prefix + PDFFile; // RHM20150506 Multiline ItemID TextBox
 
-			if (!OverWrite && File.Exists(outputFileName))
-			{
-				if (MessageBox.Show(outputFileName + " exists.  Overwrite file?", "File Exists", MessageBoxButtons.YesNo) == DialogResult.No)
-				{
-					ProfileTimer.Pop(profileDepth);
-					return null;
-				}
-			}
 			string retval = PrintProcedureOrFoldout(myProcedure, null, outputFileName, makePlacekeeper, makeContinuousActionSummary, makeTimeCriticalAction);
 			ProfileTimer.Pop(profileDepth);
 			return retval;