Compare commits
1 Commits
B2025-024-
...
F2025-015_
Author | SHA1 | Date | |
---|---|---|---|
5fd0ff9e71 |
Binary file not shown.
Binary file not shown.
@@ -6097,9 +6097,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
}
|
}
|
||||||
private bool IsLowestLevelStep
|
private bool IsLowestLevelStep
|
||||||
{
|
{
|
||||||
|
//F2025-015 added check for IsInCautionOrNote for sub-step inside Notes and Cautions
|
||||||
get
|
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()
|
private bool RNOsHighHasCheckOff()
|
||||||
|
@@ -1081,39 +1081,12 @@ namespace Volian.Controls.Library
|
|||||||
// require clearing of all enhanced config data or mapping it to existing data (quite complicated)
|
// require clearing of all enhanced config data or mapping it to existing data (quite complicated)
|
||||||
if ((ui.IsAdministrator() || ui.IsSetAdministrator(i.MyProcedure.MyDocVersion) || ui.IsWriter(i.MyProcedure.MyDocVersion)) && (!i.IsEnhancedStep && !i.IsEnhancedProcedure && !i.IsEnhancedSection && !i.IsRtfRaw && !i.IsFigure))
|
if ((ui.IsAdministrator() || ui.IsSetAdministrator(i.MyProcedure.MyDocVersion) || ui.IsWriter(i.MyProcedure.MyDocVersion)) && (!i.IsEnhancedStep && !i.IsEnhancedProcedure && !i.IsEnhancedSection && !i.IsRtfRaw && !i.IsFigure))
|
||||||
cm.MenuItems.Add("Copy", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Copy", new EventHandler(mi_Click));
|
||||||
//if (i.HasWordContent)
|
|
||||||
//{
|
|
||||||
// cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
|
||||||
// cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
|
||||||
//}
|
|
||||||
if (i.HasWordContent)
|
if (i.HasWordContent)
|
||||||
{
|
|
||||||
if (i.MyDocVersion.MultiUnitCount > 1)
|
|
||||||
{
|
|
||||||
if (!i.IsSubsection)
|
|
||||||
{
|
|
||||||
MenuItem mps = new MenuItem("Print Section");
|
|
||||||
MenuItem mqps = new MenuItem("Quick Print Section");
|
|
||||||
int k = 0;
|
|
||||||
foreach (string s in i.MyDocVersion.UnitNames)
|
|
||||||
{
|
|
||||||
k++;
|
|
||||||
MenuItem mp = mps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
|
||||||
mp.Tag = k;
|
|
||||||
MenuItem mqp = mqps.MenuItems.Add(s, new EventHandler(miMultiUnit_Click));
|
|
||||||
mqp.Tag = k;
|
|
||||||
}
|
|
||||||
cm.MenuItems.Add(mps);
|
|
||||||
cm.MenuItems.Add(mqps);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Print Section", new EventHandler(mi_Click));
|
||||||
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
cm.MenuItems.Add("Quick Print Section", new EventHandler(mi_Click));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
#endregion
|
#endregion
|
||||||
//_MyLog.WarnFormat("Context Menu 4 - {0}", GC.GetTotalMemory(true));
|
//_MyLog.WarnFormat("Context Menu 4 - {0}", GC.GetTotalMemory(true));
|
||||||
|
|
||||||
@@ -2883,8 +2856,7 @@ namespace Volian.Controls.Library
|
|||||||
//since before/after folder is at same level as current folder
|
//since before/after folder is at same level as current folder
|
||||||
//so need to use the parents order to determine where to place it
|
//so need to use the parents order to determine where to place it
|
||||||
using (FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.MyParent.FolderID))
|
using (FolderInfo parfolderinfo = FolderInfo.Get(parentfolder.MyParent.FolderID))
|
||||||
{
|
{ double? myorder = parfolderinfo.NewManualOrder(myindex);
|
||||||
double? myorder = parfolderinfo.NewManualOrder(myindex);
|
|
||||||
using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
|
using (Folder folder = Folder.MakeFolder(parentfolder.MyParent, parentfolder.MyConnection, uniquename, string.Empty, "Short Name", null, myorder, string.Empty, DateTime.Now, VlnSettings.UserID))
|
||||||
{
|
{
|
||||||
ShowBrokenRules(folder.BrokenRulesCollection);
|
ShowBrokenRules(folder.BrokenRulesCollection);
|
||||||
|
@@ -69,7 +69,7 @@ namespace Volian.Print.Library
|
|||||||
private string symblsStr = "\u25CF\u0394"; // string of possible symbol character in a tab
|
private string symblsStr = "\u25CF\u0394"; // string of possible symbol character in a tab
|
||||||
// add symbol characters as needed
|
// add symbol characters as needed
|
||||||
// "\u25CF" - solid bullet
|
// "\u25CF" - solid bullet
|
||||||
// \x0394 - delta
|
// \u0394 - delta
|
||||||
|
|
||||||
private System.Drawing.FontStyle GetSysFontStyle(VE_Font f)
|
private System.Drawing.FontStyle GetSysFontStyle(VE_Font f)
|
||||||
{
|
{
|
||||||
@@ -268,6 +268,7 @@ namespace Volian.Print.Library
|
|||||||
}
|
}
|
||||||
Rtf = GetRtf(origTab, vFont);
|
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)
|
if (ScriptCaution)
|
||||||
{
|
{
|
||||||
Rtf = GetRtf("\u25CFCaution ", vFont);
|
Rtf = GetRtf("\u25CFCaution ", vFont);
|
||||||
|
Reference in New Issue
Block a user