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

C2025-024 #590

Merged
jjenko merged 18 commits from C2025-024 into Development 2025-08-08 10:19:00 -04:00
Conversation 2 Commits 18 Files Changed 12 +2149 -4106
52 changed files with 2149 additions and 4106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c4f4d52d2 - Show all commits

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

@@ -1209,14 +1209,10 @@ namespace VEPROMS
// See if there is an existing format file that was created as a copy. If so, check if the passed in format's // See if there is an existing format file that was created as a copy. If so, check if the passed in format's
// config is the same as an existing 'Copy of' format - if so, use rather than importing the same format as // config is the same as an existing 'Copy of' format - if so, use rather than importing the same format as
// defined by config. // defined by config.
foreach (var existname in existingFormat.Where(existname => existname.Key.Contains(name))) foreach (string cpy in existingFormat.Select(existname => existname.Key).Where(existname => existname.Contains(name) && existname.StartsWith("Copy") && existname.Contains("of " + name)))
{ {
string cpy = existname.Key; FormatInfo exFI = FormatInfo.Get(existingFormat[cpy]);
if (cpy.StartsWith("Copy") && cpy.Contains("of " + name)) if (exFI.Config == config) return cpy;
{
FormatInfo exFI = FormatInfo.Get(existingFormat[cpy]);
if (exFI.Config == config) return cpy;
}
} }
return null; return null;
} }
@@ -3110,7 +3106,7 @@ namespace VEPROMS
bool hasNewROID = (content.MyGrid.Data.Contains(glookFor)); bool hasNewROID = (content.MyGrid.Data.Contains(glookFor));
if (hasNewROID) if (hasNewROID)
content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith); content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF")) else if (glookFor.Contains("0041") && glookFor.Contains("FFFF"))
{ {
string newGlookFor = glookFor; string newGlookFor = glookFor;
newGlookFor = newGlookFor.Replace("0041", "0000"); newGlookFor = newGlookFor.Replace("0041", "0000");

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

@@ -313,6 +313,7 @@ namespace VEPROMS
return xroid; return xroid;
} }
//overridden - used to set the RO location for RO Images that are not in annotations
protected override void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti) protected override void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
{ {
string imgfile = GetROImageFileLocation(roc, rodb, isMulti); string imgfile = GetROImageFileLocation(roc, rodb, isMulti);