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

CSM B2024-087 Fix RO Editor Inconsistencies #443

Merged
jjenko merged 1 commits from B2024-087 into Development 2024-10-25 14:39:25 -04:00
Conversation 2 Commits 1 Files Changed 5 +7 -1
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs
View File

@ -377,6 +377,7 @@ namespace ROEditor
this.btnOK.TabIndex = 3; this.btnOK.TabIndex = 3;
this.btnOK.Text = "OK"; this.btnOK.Text = "OK";
this.btnOK.Click += new System.EventHandler(this.btnOK_Click); this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
// //
// btnCancel // btnCancel
// //
@ -553,6 +554,7 @@ namespace ROEditor
// update the local/internal copy of the schema. // update the local/internal copy of the schema.
if (success != true) if (success != true)
{ {
this.DialogResult = DialogResult.Cancel;
return; // DO YET process an error. return; // DO YET process an error.
} }
else else

2
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs
View File

@ -266,6 +266,7 @@ namespace ROEditor
if (success != true) if (success != true)
{ {
this.DialogResult = DialogResult.Cancel;
return; // DO YET process an error. return; // DO YET process an error.
} }
else else
@ -367,6 +368,7 @@ namespace ROEditor
// //
// btnOK // btnOK
// //
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOK.Location = new System.Drawing.Point(216, 72); this.btnOK.Location = new System.Drawing.Point(216, 72);
this.btnOK.Name = "btnOK"; this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(88, 24); this.btnOK.Size = new System.Drawing.Size(88, 24);

1
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs
View File

@ -248,6 +248,7 @@ namespace ROEditor
if (success != true) if (success != true)
{ {
this.DialogResult = DialogResult.Cancel;
return; // DO YET process an error. return; // DO YET process an error.
} }
return; return;

1
PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs
View File

@ -433,6 +433,7 @@ namespace ROEditor
// //
// btnOK // btnOK
// //
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOK.Location = new System.Drawing.Point(24, 248); this.btnOK.Location = new System.Drawing.Point(24, 248);
this.btnOK.Name = "btnOK"; this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(144, 24); this.btnOK.Size = new System.Drawing.Size(144, 24);

2
PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs
View File

@ -2796,7 +2796,7 @@ namespace RODBInterface
nodetocheck = (VlnXmlElement) nodetocheck.ParentNode; nodetocheck = (VlnXmlElement) nodetocheck.ParentNode;
} }
return nodetocheck.GetAttribute("MenuTitle"); return nodetocheck.FirstChild.InnerText;
} }
public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem) public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem)