PROMS/VEPROMS User Interface/frmPropGrid.cs

@@ -28,11 +28,13 @@ namespace VEPROMS
 
 		private void btnOK_Click(object sender, EventArgs e)
 		{
+			DialogResult = DialogResult.OK;
 			this.Close();
 		}
 
 		private void btnCancel_Click(object sender, EventArgs e)
 		{
+			DialogResult = DialogResult.Cancel;
 			this.Close();
 		}
 
@@ -41,6 +43,26 @@ namespace VEPROMS
 			Show();
 			pg.SelectedObject = _PGobject;
 		}
+
+		private void pg_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
+		{
+			// check if folder config & if so, check for name change
+			FolderConfig tstfoldercfg = this._PGobject as FolderConfig;
+			if (tstfoldercfg != null)
+			{
+				if ((string)e.OldValue != tstfoldercfg.Name)
+				{
+					bool isunique = tstfoldercfg.CheckUniqueName(tstfoldercfg.Name);
+					if (!isunique)
+					{
+						MessageBox.Show(string.Format("The Name '{0}' that was entered is not a unique folder name", tstfoldercfg.Name));
+						tstfoldercfg.Name = (string)e.OldValue;
+					}
+				}
+			}
+			this.Refresh();
+
+		}
 	}
 	//public partial class SystemConfig
 	//{