Clean up refactoring dialogs better

Author: Hosch250

RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.Designer.cs

@@ -31,7 +31,7 @@ private void Localize()
         {
             Text = RubberduckUI.ExtractMethod_Caption;
             OkButton.Text = RubberduckUI.OK;
-            CancelButton.Text = RubberduckUI.CancelButtonText;
+            CancelDialogButton.Text = RubberduckUI.CancelButtonText;
 
             TitleLabel.Text = RubberduckUI.ExtractMethod_TitleText;
             InstructionsLabel.Text = RubberduckUI.ExtractMethod_InstructionsText;
@@ -152,18 +152,6 @@ private void OnViewEvent(EventHandler target, EventArgs args = null)
             handler(this, args ?? EventArgs.Empty);
         }
 
-        public event EventHandler CancelButtonClicked;
-        public void OnCancelButtonClicked(object sender, EventArgs e)
-        {
-            OnViewEvent(CancelButtonClicked);
-        }
-
-        public event EventHandler OkButtonClicked;
-        public void OnOkButtonClicked(object sender, EventArgs e)
-        {
-            OnViewEvent(OkButtonClicked);
-        }
-
         private string _preview;
         public string Preview
         {

RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.cs

@@ -117,26 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAEA4AAAEAIADgAwAAFgAAACgAAAAQAAAAHAAAAAEAIAAAAAAAuAMAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAB4AAABxAAEBtQEYGOMCLCz3AzEx/AIhIewABwfFAAAAiQAAADYAAAABAAAAAAAA
-        AAAAAAAAAAAAAQAAAJIDODj5CJqa/wzh4f8O/f3/Dv///w7///8O////De/v/wq0tP8ES0v/AAAAewAA
-        AAAAAAAAAAAAAAAAAEcFWlr/Dv///w7///8O////Dv///w7///8O////Dv///w7///8O////Dvv7/wMw
-        MPkAAAAgAAAAAAAAAAAAAQGpC8zM/w7///8O////Dv///w7///8O////Dv///w7///8O////Dv///w7/
-        //8JoKD/AAAAfAAAAAAAAAAAARMT4g78/P8O////Dv///w7///8O////Dv///w7///8O////Dv///w7/
-        //8O////DNzc/wAAALAAAAAAAAAAAAImJvcO////Dv///w7///8O////Dv///w7///8O////Dv///w7/
-        //8O////Dv///w3o6P8AAAC8AAAAAAAAAAACHh7vDv///w7///8O////Dv///w7///8O////Dv///w7/
-        //8O////Dv///w7///8LxMT/AAAAngAAAAAAAAAAAAQExg3o6P8O////Dv///wmnp/8GZ2f/B3l5/wZ1
-        df8Kr6//Dv///w7///8O////Bmxs/wAAAFIAAAAAAAAAAAAAAGwHgoL/Dv///wq+vv8BDAzTAAAAOQAA
-        AE8BDQ3yDNLS/w7///8O////Dv///wZlZf8AABS4AAAPgQAAAA0AAAAIAQwM1AVjY/8ABwfEAAAAGAAA
-        AAAAAABNBnJy/w7///8O////Dv///w7///8N5ub/AAM+/wAA4P8AAC62AAAAAAAAACAAAABLAAAAAgAA
-        AAAAAAAAAAAAaAiUlP8O////Dv///wvKyv8Lvr7/Dvv7/wEQMf8AAP//AACF/wAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAADkFV1f/Dv///w7///8HdHT/Blxc/wvMzP8AAAXWAAAoogAAF58AAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAEBrwiQkP8O+/v/Dv///wzY2P8CLCz1AAAAMQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAACHARkZ4wIpKfQABga8AAAANgAAAAAAAAAAAAAAAMAH
-        AAAABwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAAAAAQAAACMAAAA/AAAAP4DAAD+BwAA
-</value>
-  </data>
 </root>

RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.resx

@@ -24,7 +24,7 @@ public RemoveParametersDialog()
         private void InitializeCaptions()
         {
             OkButton.Text = RubberduckUI.OK;
-            CancelButton.Text = RubberduckUI.CancelButtonText;
+            CancelDialogButton.Text = RubberduckUI.CancelButtonText;
             Text = RubberduckUI.RemoveParamsDialog_Caption;
             TitleLabel.Text = RubberduckUI.RemoveParamsDialog_TitleText;
             InstructionsLabel.Text = RubberduckUI.RemoveParamsDialog_InstructionsLabelText;
@@ -60,26 +60,6 @@ public void InitializeParameterGrid()
             MethodParametersGrid.Columns.Add(column);
         }
 
-        public event EventHandler CancelButtonClicked;
-        public void OnCancelButtonClicked(object sender, EventArgs e)
-        {
-            var handler = CancelButtonClicked;
-            if (handler != null)
-            {
-                handler(this, EventArgs.Empty);
-            }
-        }
-
-        public event EventHandler OkButtonClicked;
-        public void OnOkButtonClicked(object sender, EventArgs e)
-        {
-            var handler = OkButtonClicked;
-            if (handler != null)
-            {
-                handler(this, EventArgs.Empty);
-            }
-        }
-
         private void MarkAsRemovedParam()
         {
             if (_selectedItem != null)