Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Development #612

Merged
djankowski merged 37 commits from Development into master 2025-09-11 12:13:23 -04:00
Conversation 0 Commits 37 Files Changed 74 +3 -20
4 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 61853fb71f - Show all commits

1
PROMS/VEPROMS User Interface/dlgExportImport.cs
View File

@@ -720,7 +720,6 @@ namespace VEPROMS
ImportProcedureNew(xd);
isImported = true;
}
//if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
return true;// Import Suceeded
}

4
PROMS/VEPROMS User Interface/frmFolderProperties.cs
View File

@@ -128,7 +128,7 @@ namespace VEPROMS
private LocalAnnotationTypeInfoList myLocalAnnotationTypeInfoList = null;
private StageInfoList myStageInfoList = null;
private LocalStageInfoList myLocalStageInfoList = null;
private int? _cmbxformatOriginal = null;
private void frmFolderProperties_Load(object sender, EventArgs e)
{
_Initializing = true;
@@ -149,7 +149,7 @@ namespace VEPROMS
ppCmbxFormat.DisplayMember = "FullName";
ppCmbxFormat.ValueMember = "FullName";
ppCmbxFormat.DataSource = FormatUtility.GetFilteredFormatList(FormatInfoList.SortedFormatInfoList);
if (_FolderConfig != null && _FolderConfig.MyFolder != null) _cmbxformatOriginal = _FolderConfig.MyFolder.FormatID;
if (_FolderConfig.FormatSelection != null)
{
ppCmbxFormat.SelectedValue = _FolderConfig.FormatSelection;

17
PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
View File

@@ -213,14 +213,7 @@ namespace VEPROMS.CSLA.Library
[TypeConverter(typeof(ExpandableObjectConverter))]
public class Flags
{
//private bool? _CheckOffUCF;
//[DisplayName("UCF CheckOffs")]
//[Description("Additional UCF Check Offs and Sign Offs")]
//public bool? CheckOffUCF
//{
// get { return _CheckOffUCF; }
// set { _CheckOffUCF = value; }
//}
private bool? _PartialStepCompression;
[DisplayName("Partial Step Compression")]
[Description("Automatically compress last sub-steps to fit on page")]
@@ -286,14 +279,6 @@ namespace VEPROMS.CSLA.Library
set { _State = value; }
}
//[Editor(typeof(FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
//[XmlAttribute("Flag")]
//[DisplayName("Flags (Use In)")] // Note that [Description] is not used in collection items (that use collection editor)
//public E_ReplaceFlags Flag
//{
// get { return (E_ReplaceFlags)_Flag; }
// set { _Flag = value; }
//}
private string _ReplaceWord;
[XmlAttribute("ReplaceWord")]
[DisplayName("Replace Word")]

1
PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
View File

@@ -2195,7 +2195,6 @@ namespace VEPROMS.CSLA.Library
//int profileDepth = ProfileTimer.Push(">>>> DoReplaceWords2.ForLoop");
foreach (ReplaceStr rs in rsl)
{
//bool dopartial = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.Partials; // save it may need to be changed back to this code.
bool dopartial = (rs.Flag & E_ReplaceFlags.Partials) == E_ReplaceFlags.Partials; // from pre-UCF
if (!dopartial) // F2021-093: Partials moved into their own method and done first
{