Compare commits
	
		
			8 Commits
		
	
	
		
			C2025-021
			...
			B2025-034-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 66deede936 | |||
| 0df5511bf7 | |||
| 2e68218cfe | |||
| 80f3568dbd | |||
| 5fd0ff9e71 | |||
| 4dcfa05157 | |||
| 42648f31a5 | |||
| e0b628dce9 | 
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -6097,9 +6097,10 @@ namespace VEPROMS.CSLA.Library
 | 
			
		||||
		}
 | 
			
		||||
		private bool IsLowestLevelStep
 | 
			
		||||
		{
 | 
			
		||||
			//F2025-015 added check for IsInCautionOrNote for sub-step inside Notes and Cautions
 | 
			
		||||
			get
 | 
			
		||||
			{
 | 
			
		||||
				return (!(IsCaution || IsNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote));
 | 
			
		||||
				return (!(IsCaution || IsNote || IsInCautionOrNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote));
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		private bool RNOsHighHasCheckOff()
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,7 @@ using Volian.Controls.Library;
 | 
			
		||||
using DevComponents.DotNetBar;
 | 
			
		||||
using JR.Utils.GUI.Forms;
 | 
			
		||||
using Volian.Base.Library;
 | 
			
		||||
using Microsoft.Win32;
 | 
			
		||||
 | 
			
		||||
namespace Volian.Controls.Library
 | 
			
		||||
{
 | 
			
		||||
@@ -658,11 +659,35 @@ namespace Volian.Controls.Library
 | 
			
		||||
			}
 | 
			
		||||
			else // Otherwise open it in the Word editor
 | 
			
		||||
			{
 | 
			
		||||
				Document.ConvertWordSectionToDOCX(myItemInfo); // B2023-093 Convert a Word section to the DOCX Word format if needed before opening it for edit
 | 
			
		||||
				return OpenDSOTabPage(myItemInfo);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
				// B2025-034 Check to make sure that EDWord is installed in PROMS.  If not return NULL.
 | 
			
		||||
				object EDOfficeViewerX = GetValue<object>(@"HKEY_CLASSES_ROOT\EDOfficeViewerX.Connect\CLSID\", @"", null);
 | 
			
		||||
 | 
			
		||||
				object EDWordCtrl = GetValue<object>(@"HKEY_CLASSES_ROOT\EDWORD.EDWordCtrl.1\CLSID\", @"", null);
 | 
			
		||||
 | 
			
		||||
				if (EDOfficeViewerX == null || EDWordCtrl == null)
 | 
			
		||||
				{
 | 
			
		||||
 | 
			
		||||
					MessageBox.Show("Edraw needs to be installed or reinstalled on this device. " + Environment.NewLine + "" + Environment.NewLine +
 | 
			
		||||
						"Please contact your IT Administrator to install and register Edraw that was provided with the PROMS Installation media.  If additional support is needed, please contact Volian.", "Error in Word section",
 | 
			
		||||
						MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 | 
			
		||||
					return null;
 | 
			
		||||
				}
 | 
			
		||||
				else
 | 
			
		||||
					{
 | 
			
		||||
					Document.ConvertWordSectionToDOCX(myItemInfo); // B2023-093 Convert a Word section to the DOCX Word format if needed before opening it for edit
 | 
			
		||||
					return OpenDSOTabPage(myItemInfo);
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
		}
 | 
			
		||||
		public T GetValue<T>(string registryKeyPath, string value, T defaultValue = default(T))
 | 
			
		||||
		{
 | 
			
		||||
			T retVal = default(T);
 | 
			
		||||
 | 
			
		||||
			retVal = (T)Registry.GetValue(registryKeyPath, value, defaultValue);
 | 
			
		||||
 | 
			
		||||
			return retVal;
 | 
			
		||||
		}
 | 
			
		||||
		public bool PasteRTBItem(ItemInfo myItemInfo, int copyStartID, ItemInfo.EAddpingPart pasteType, int type)
 | 
			
		||||
		{
 | 
			
		||||
			CleanUpClosedItems();
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -69,7 +69,7 @@ namespace Volian.Print.Library
 | 
			
		||||
		private string symblsStr = "\u25CF\u0394"; // string of possible symbol character in a tab
 | 
			
		||||
											 // add symbol characters as needed
 | 
			
		||||
											 // "\u25CF" - solid bullet
 | 
			
		||||
											 // \x0394 - delta
 | 
			
		||||
											 // \u0394 - delta
 | 
			
		||||
 | 
			
		||||
		private System.Drawing.FontStyle GetSysFontStyle(VE_Font f)
 | 
			
		||||
		{
 | 
			
		||||
@@ -267,7 +267,8 @@ namespace Volian.Print.Library
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			Rtf = GetRtf(origTab, vFont);
 | 
			
		||||
			Rtf = Rtf.Replace("\u0394", @"\f1\u916?\f0 ");		// delta 0x0394
 | 
			
		||||
			Rtf = Rtf.Replace("\u0394", @"\f1\u916?\f0 ");      // delta 0x0394
 | 
			
		||||
			Rtf = Rtf.Replace("\u03BF", @"\f1\u959?\f0 "); // F2025-015 lowercase omicron check with hex value replace with RTF string
 | 
			
		||||
			if (ScriptCaution)
 | 
			
		||||
			{
 | 
			
		||||
				Rtf = GetRtf("\u25CFCaution  ", vFont);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user