implemented basic validation for newname, fixed UI behavior

retailcoder · Mar 26, 2015 · 9a87b50 · 9a87b50
1 parent b924209
commit 9a87b50
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 24 deletions.
diff --git a/RetailCoder.VBE/UI/Refactorings/Rename/RenameDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/Rename/RenameDialog.Designer.cs
diff --git a/RetailCoder.VBE/UI/Refactorings/Rename/RenameDialog.cs b/RetailCoder.VBE/UI/Refactorings/Rename/RenameDialog.cs
@@ -10,6 +10,13 @@ public RenameDialog()
         {
             InitializeComponent();
             OkButton.Click += OkButtonClick;
+            Activated += RenameDialog_Activated;
+        }
+
+        private void RenameDialog_Activated(object sender, EventArgs e)
+        {
+            NewNameBox.SelectAll();
+            NewNameBox.Focus();
         }
 
         private void OkButtonClick(object sender, EventArgs e)
@@ -55,7 +62,20 @@ public Declaration Target
         public string NewName
         {
             get { return NewNameBox.Text; }
-            set { NewNameBox.Text = value; }
+            set
+            {
+                NewNameBox.Text = value;
+                ValidateNewName();
+            }
+        }
+
+        private void ValidateNewName()
+        {
+            OkButton.Enabled = (NewName != Target.IdentifierName) 
+                && !string.IsNullOrWhiteSpace(NewName)
+                && !NewName.StartsWith("_"); // also invalid if it starts with a number...
+
+            InvalidNameValidationIcon.Visible = !OkButton.Enabled;
         }
     }
 }