Compare commits
12 Commits
master
...
B2025-034-
Author | SHA1 | Date | |
---|---|---|---|
66deede936 | |||
0df5511bf7 | |||
2e68218cfe | |||
80f3568dbd | |||
5fd0ff9e71 | |||
4dcfa05157 | |||
42648f31a5 | |||
e0b628dce9 | |||
6e9c7e28e6 | |||
ac091a7d26 | |||
612e7955cf | |||
ce92031ff7 |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
@ -4390,7 +4390,8 @@ namespace Volian.Print.Library
|
||||
SectionConfig sch = MyItemInfo.MyConfig as SectionConfig;
|
||||
if (sch != null && sch.Section_PrintHdr != "Y") doprint = false;
|
||||
}
|
||||
if (doprint && !UseTemplateKeepOnCurLine(itemInfo))
|
||||
//C2025-021 Add logic to PROMS to support a special High Level Step type that is not printed.
|
||||
if (doprint && !UseTemplateKeepOnCurLine(itemInfo) && !itemInfo.IsType("InvisibleHigh"))
|
||||
{
|
||||
float tyoff = yoff;
|
||||
if (itemInfo.Steps != null)
|
||||
@ -5751,9 +5752,21 @@ namespace Volian.Print.Library
|
||||
private StringBuilder _RtfSB = null;
|
||||
public string GetRtf(ItemInfo itemInfo, string prefix, string suffix)
|
||||
{
|
||||
int profileDepth = ProfileTimer.Push(">>>> GetRtf");
|
||||
int profileDepth = ProfileTimer.Push(">>>> GetRtf");
|
||||
_RtfSB = new StringBuilder();
|
||||
DisplayText vlntxt = new DisplayText(itemInfo, E_EditPrintMode.Print, E_ViewMode.View, true, E_FieldToEdit.StepText, false, prefix, suffix, MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces != null);
|
||||
|
||||
//C2025-021 Add logic to PROMS to support a special High Level Step type that is not printed.
|
||||
if (itemInfo.IsType("InvisibleHigh"))
|
||||
{
|
||||
System.Drawing.Font myHighFont = vlntxt.TextFont.WindowsFont;
|
||||
_RtfSB.Append(AddFontTable(myHighFont));
|
||||
_RtfSB.Append("}");
|
||||
string rtfHigh = _RtfSB.ToString();
|
||||
ProfileTimer.Pop(profileDepth);
|
||||
return rtfHigh;
|
||||
}
|
||||
|
||||
// C2021-010: Remove trailing returns/spaces & manual page breaks & allow save.
|
||||
if (DisplayText.RemoveTrailingBlankID > 0 && !MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Contains(itemInfo.ItemID)) MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Add(DisplayText.RemoveTrailingBlankID);
|
||||
System.Drawing.Font myFont = vlntxt.TextFont.WindowsFont;
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user