B2025-007 RO Editor – RO Figure Default File extension

good for testing phase

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs

@@ -1154,7 +1154,10 @@ namespace ROEditor
 				tbtnCancel.Enabled = true;
 				tbtnSave.Enabled = true;
 				tbtnRestore.Enabled = true;
-				tbtnSaveAs.Enabled = true;
+				if (newone == null)
+					{ tbtnSaveAs.Enabled = true; }
+				else
+					{ tbtnSaveAs.Enabled = false; }
 			}
 			menuROSave.Enabled = tbtnSave.Enabled;
 		}
@@ -1170,7 +1173,10 @@ namespace ROEditor
 
 			tbtnSave.Enabled = true;
 			tbtnRestore.Enabled = true;
-			tbtnSaveAs.Enabled = true;
+			if (newone == null)
+				{ tbtnSaveAs.Enabled = true; }
+			else
+				{ tbtnSaveAs.Enabled = false; }
 			tbtnCancel.Enabled = true;
 			menuROSave.Enabled = tbtnSave.Enabled;
 			//B2021-080 set the mysavexml flag to true to ensure the text change will be saved
@@ -2392,20 +2398,26 @@ namespace ROEditor
 		 */
 		private void menuRODelete_Click(object sender, System.EventArgs e)
 		{
-			bool success=false;
+			string msgstr = "It is recommended that you may wish to create a backup zip of your RO folder prior to performing deletions.\n\nAre you sure you wish to delete the selected RO/RO Group?";
-			XmlNode nd = (XmlNode) roTreeView.SelectedNode.Tag;
+
-			if (nd.ParentNode.Name == "RO_Root")
+			DialogResult AnswerYN = MessageBox.Show(msgstr, "Deleting ROs/RO Group", MessageBoxButtons.YesNo);
-				success = myrodb.RODB_DeleteGroup(nd,null,null);
+			if (AnswerYN == DialogResult.Yes)
-			else
-				success = myrodb.RODB_DeleteRO(nd);
-			if (success == true)
 			{
-				// remove from xml tree & the tree control
+				bool success = false;
-				XmlNode parent = nd.ParentNode;
+				XmlNode nd = (XmlNode)roTreeView.SelectedNode.Tag;
-				parent.RemoveChild(nd);	
+				if (nd.ParentNode.Name == "RO_Root")
-				updateRoListView(roTreeView.SelectedNode.Parent);
+					success = myrodb.RODB_DeleteGroup(nd, null, null);
-				roTreeView.SelectedNode.Remove();
+				else
-				roTreeView.Refresh();	
+					success = myrodb.RODB_DeleteRO(nd);
+				if (success == true)
+				{
+					// remove from xml tree & the tree control
+					XmlNode parent = nd.ParentNode;
+					parent.RemoveChild(nd);
+					updateRoListView(roTreeView.SelectedNode.Parent);
+					roTreeView.SelectedNode.Remove();
+					roTreeView.Refresh();
+				}
 			}
 		}
 

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","");
+			DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extention");
-			if (DefaultGraphicFileExtension.Equals(""))
+			if (string.IsNullOrEmpty(DefaultGraphicFileExtension)) DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extension", ".TIF");
-			{
+			//			if (File.Exists(PromsINI))
-				string ApplPathUp = ApplicationPath.ToUpper();
+			//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("Graphics","defaultext",".TIF",5,PromsINI);
-				int idx = ApplPathUp.IndexOf("VE-PROMS.NET\\BIN");
+			//			if (File.Exists("ROAPP.INI"))
-				if (idx >= 0)
+			//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention",".TIF",5,"ROAPP.INI");
-				{
-					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");
 			if (!DefaultGraphicFileExtension.StartsWith("."))
 				DefaultGraphicFileExtension = "." + DefaultGraphicFileExtension;
 
@@ -1486,10 +1474,13 @@ namespace ctlXMLEditLib
 				FileInfo ifi = new FileInfo(fnamebox.Text);
 				if (ifi.Exists == false)
 				{
-					MessageBoxButtons buttons = MessageBoxButtons.OK;
+					FileInfo ifi2 = new FileInfo(fnamebox.Text + DefaultGraphicFileExtension);
-					MessageBox.Show( "File does not exist.", 
+					if (!ifi2.Exists)
-						"File Input Error", buttons);
+					{
-					return;
+						MessageBox.Show("File does not exist.",
+							"File Input Error", MessageBoxButtons.OK);
+						return;
+					}
 				}
 				bool ok = ValidGraphicsFile(fnamebox.Text);
 				if (ok != true)