From f3309e4a40f6d25e57bab5b22f451eed7e5aa54d Mon Sep 17 00:00:00 2001 From: mschill Date: Thu, 23 Jan 2025 11:02:15 -0500 Subject: [PATCH] =?UTF-8?q?B2025-007=20RO=20Editor=20=E2=80=93=20RO=20Figu?= =?UTF-8?q?re=20Default=20File=20extension?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LibSource/ctlXMLEditLib/ctlXMLEdit.cs | 41 ++++++++----------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs index c212c274..09bf5b29 100644 --- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs +++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs @@ -324,29 +324,17 @@ namespace ctlXMLEditLib string ROINI = Directory.GetCurrentDirectory()+ "\\ROAPP.INI"; // Get the default file extension for graphic files -// DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention","",5,"ROAPP.INI"); + // DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention","",5,"ROAPP.INI"); // Bug fix: B2006-025 // needed to pass the full path of ROAPP.INI + // B2025-007 only use the default file location (remove 16 bit PROMS location) IniReader in1 = new IniReader(ROINI); - DefaultGraphicFileExtension = in1.ReadString("ROApp","Extention",""); - if (DefaultGraphicFileExtension.Equals("")) - { - string ApplPathUp = ApplicationPath.ToUpper(); - int idx = ApplPathUp.IndexOf("VE-PROMS.NET\\BIN"); - if (idx >= 0) - { - string PromsINI = ApplicationPath.Substring(0, idx); - PromsINI += "VE-PROMS\\VEPROMS.INI"; - IniReader in2 = new IniReader(PromsINI); - DefaultGraphicFileExtension = in2.ReadString("Graphics", "defaultext", ".TIF"); - } - else - DefaultGraphicFileExtension = ".TIF"; - } -// if (File.Exists(PromsINI)) -// DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("Graphics","defaultext",".TIF",5,PromsINI); -// if (File.Exists("ROAPP.INI")) -// DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention",".TIF",5,"ROAPP.INI"); + DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extention"); + if (string.IsNullOrEmpty(DefaultGraphicFileExtension)) DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extension", ".TIF"); + // if (File.Exists(PromsINI)) + // DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("Graphics","defaultext",".TIF",5,PromsINI); + // if (File.Exists("ROAPP.INI")) + // DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention",".TIF",5,"ROAPP.INI"); if (!DefaultGraphicFileExtension.StartsWith(".")) DefaultGraphicFileExtension = "." + DefaultGraphicFileExtension; @@ -1484,12 +1472,15 @@ namespace ctlXMLEditLib if (fnamebox.Text != "" && fnamebox.Modified == true) { FileInfo ifi = new FileInfo(fnamebox.Text); - if (ifi.Exists == false) + if (ifi.Exists == false) { - MessageBoxButtons buttons = MessageBoxButtons.OK; - MessageBox.Show( "File does not exist.", - "File Input Error", buttons); - return; + FileInfo ifi2 = new FileInfo(fnamebox.Text + DefaultGraphicFileExtension); + if (!ifi2.Exists) + { + MessageBox.Show("File does not exist.", + "File Input Error", MessageBoxButtons.OK); + return; + } } bool ok = ValidGraphicsFile(fnamebox.Text); if (ok != true) -- 2.47.2