diff --git a/RetailCoder.VBE/Ducky.ico b/RetailCoder.VBE/Ducky.ico
index 236f4c74c3..3c1251f05b 100644
Binary files a/RetailCoder.VBE/Ducky.ico and b/RetailCoder.VBE/Ducky.ico differ
diff --git a/RetailCoder.VBE/UI/About/AboutDialog.resx b/RetailCoder.VBE/UI/About/AboutDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/About/AboutDialog.resx
+++ b/RetailCoder.VBE/UI/About/AboutDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/FindSymbol/FindSymbolDialog.resx b/RetailCoder.VBE/UI/FindSymbol/FindSymbolDialog.resx
index adccbf543f..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/FindSymbol/FindSymbolDialog.resx
+++ b/RetailCoder.VBE/UI/FindSymbol/FindSymbolDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
-
+
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.Designer.cs
index 9d6687461d..e5cb2af33b 100644
--- a/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.Designer.cs
@@ -53,31 +53,28 @@ private void InitializeComponent()
this.panel1.Controls.Add(this.InstructionsLabel);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(773, 99);
+ this.panel1.Size = new System.Drawing.Size(515, 64);
this.panel1.TabIndex = 14;
//
// TitleLabel
//
this.TitleLabel.AutoSize = true;
this.TitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TitleLabel.Location = new System.Drawing.Point(18, 14);
- this.TitleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.TitleLabel.Location = new System.Drawing.Point(12, 9);
this.TitleLabel.Name = "TitleLabel";
- this.TitleLabel.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.TitleLabel.Size = new System.Drawing.Size(273, 26);
+ this.TitleLabel.Padding = new System.Windows.Forms.Padding(2, 1, 2, 1);
+ this.TitleLabel.Size = new System.Drawing.Size(195, 17);
this.TitleLabel.TabIndex = 4;
this.TitleLabel.Text = "Specify Local Variable Name";
//
// InstructionsLabel
//
this.InstructionsLabel.AutoSize = true;
- this.InstructionsLabel.Location = new System.Drawing.Point(14, 46);
- this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.InstructionsLabel.Location = new System.Drawing.Point(9, 30);
this.InstructionsLabel.Name = "InstructionsLabel";
- this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(6);
- this.InstructionsLabel.Size = new System.Drawing.Size(255, 32);
+ this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.InstructionsLabel.Size = new System.Drawing.Size(174, 21);
this.InstructionsLabel.TabIndex = 5;
this.InstructionsLabel.Text = "Please specify new name for \'{0}\'.";
//
@@ -86,10 +83,9 @@ private void InitializeComponent()
this.panel2.BackColor = System.Drawing.SystemColors.ControlDark;
this.panel2.Controls.Add(this.flowLayoutPanel2);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(0, 243);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panel2.Location = new System.Drawing.Point(0, 158);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(773, 65);
+ this.panel2.Size = new System.Drawing.Size(515, 42);
this.panel2.TabIndex = 16;
//
// flowLayoutPanel2
@@ -100,20 +96,18 @@ private void InitializeComponent()
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
this.flowLayoutPanel2.Location = new System.Drawing.Point(0, -1);
- this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(12, 12, 0, 12);
- this.flowLayoutPanel2.Size = new System.Drawing.Size(773, 66);
+ this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(8, 8, 0, 8);
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(515, 43);
this.flowLayoutPanel2.TabIndex = 2;
//
// CancelDialogButton
//
this.CancelDialogButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.CancelDialogButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelDialogButton.Location = new System.Drawing.Point(645, 17);
- this.CancelDialogButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.CancelDialogButton.Location = new System.Drawing.Point(429, 11);
this.CancelDialogButton.Name = "CancelDialogButton";
- this.CancelDialogButton.Size = new System.Drawing.Size(112, 35);
+ this.CancelDialogButton.Size = new System.Drawing.Size(75, 23);
this.CancelDialogButton.TabIndex = 2;
this.CancelDialogButton.Text = "Cancel";
this.CancelDialogButton.UseVisualStyleBackColor = false;
@@ -122,10 +116,9 @@ private void InitializeComponent()
//
this.OkButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.OkButton.Location = new System.Drawing.Point(525, 17);
- this.OkButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.OkButton.Location = new System.Drawing.Point(348, 11);
this.OkButton.Name = "OkButton";
- this.OkButton.Size = new System.Drawing.Size(112, 35);
+ this.OkButton.Size = new System.Drawing.Size(75, 23);
this.OkButton.TabIndex = 1;
this.OkButton.Text = "Ok";
this.OkButton.UseVisualStyleBackColor = false;
@@ -133,8 +126,7 @@ private void InitializeComponent()
// InvalidNameValidationIcon
//
this.InvalidNameValidationIcon.Image = global::Rubberduck.Properties.Resources.cross_circle;
- this.InvalidNameValidationIcon.Location = new System.Drawing.Point(739, 108);
- this.InvalidNameValidationIcon.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.InvalidNameValidationIcon.Location = new System.Drawing.Point(493, 70);
this.InvalidNameValidationIcon.Name = "InvalidNameValidationIcon";
this.InvalidNameValidationIcon.Size = new System.Drawing.Size(16, 16);
this.InvalidNameValidationIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -143,10 +135,9 @@ private void InitializeComponent()
//
// NewNameBox
//
- this.NewNameBox.Location = new System.Drawing.Point(86, 121);
- this.NewNameBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.NewNameBox.Location = new System.Drawing.Point(57, 79);
this.NewNameBox.Name = "NewNameBox";
- this.NewNameBox.Size = new System.Drawing.Size(666, 26);
+ this.NewNameBox.Size = new System.Drawing.Size(445, 20);
this.NewNameBox.TabIndex = 15;
this.NewNameBox.WordWrap = false;
this.NewNameBox.TextChanged += new System.EventHandler(this.NewNameBox_TextChanged);
@@ -154,26 +145,26 @@ private void InitializeComponent()
// NameLabel
//
this.NameLabel.AutoSize = true;
- this.NameLabel.Location = new System.Drawing.Point(14, 126);
- this.NameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.NameLabel.Location = new System.Drawing.Point(9, 82);
this.NameLabel.Name = "NameLabel";
- this.NameLabel.Size = new System.Drawing.Size(55, 20);
+ this.NameLabel.Size = new System.Drawing.Size(38, 13);
this.NameLabel.TabIndex = 17;
this.NameLabel.Text = "Name:";
//
// FeedbackLabel
//
- this.FeedbackLabel.Location = new System.Drawing.Point(86, 160);
+ this.FeedbackLabel.Location = new System.Drawing.Point(57, 104);
+ this.FeedbackLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.FeedbackLabel.Name = "FeedbackLabel";
- this.FeedbackLabel.Size = new System.Drawing.Size(666, 61);
+ this.FeedbackLabel.Size = new System.Drawing.Size(444, 40);
this.FeedbackLabel.TabIndex = 19;
this.FeedbackLabel.Text = "THis has text";
//
// AssignedByValParameterQuickFixDialog
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(773, 308);
+ this.ClientSize = new System.Drawing.Size(515, 200);
this.Controls.Add(this.FeedbackLabel);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
@@ -182,6 +173,7 @@ private void InitializeComponent()
this.Controls.Add(this.NameLabel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AssignedByValParameterQuickFixDialog";
diff --git a/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.resx b/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.resx
+++ b/RetailCoder.VBE/UI/Refactorings/AssignedByValParameterQuickFixDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.Designer.cs
index 1026be03e9..7945409468 100644
--- a/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.Designer.cs
@@ -60,37 +60,35 @@ private void InitializeComponent()
this.DescriptionPanel.Controls.Add(this.InstructionsLabel);
this.DescriptionPanel.Dock = System.Windows.Forms.DockStyle.Top;
this.DescriptionPanel.Location = new System.Drawing.Point(0, 0);
- this.DescriptionPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.DescriptionPanel.Name = "DescriptionPanel";
- this.DescriptionPanel.Size = new System.Drawing.Size(667, 84);
+ this.DescriptionPanel.Size = new System.Drawing.Size(500, 68);
this.DescriptionPanel.TabIndex = 14;
//
// TitleLabel
//
this.TitleLabel.AutoSize = true;
this.TitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TitleLabel.Location = new System.Drawing.Point(20, 11);
- this.TitleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.TitleLabel.Location = new System.Drawing.Point(15, 9);
this.TitleLabel.Name = "TitleLabel";
- this.TitleLabel.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.TitleLabel.Size = new System.Drawing.Size(147, 22);
+ this.TitleLabel.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.TitleLabel.Size = new System.Drawing.Size(126, 19);
this.TitleLabel.TabIndex = 2;
this.TitleLabel.Text = "Encapsulate Field";
//
// InstructionsLabel
//
- this.InstructionsLabel.Location = new System.Drawing.Point(20, 30);
+ this.InstructionsLabel.Location = new System.Drawing.Point(15, 24);
+ this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.InstructionsLabel.Name = "InstructionsLabel";
- this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.InstructionsLabel.Size = new System.Drawing.Size(549, 34);
+ this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.InstructionsLabel.Size = new System.Drawing.Size(412, 28);
this.InstructionsLabel.TabIndex = 3;
this.InstructionsLabel.Text = "Please specify property name, parameter accessibility, and setter type.";
//
// InvalidPropertyNameIcon
//
this.InvalidPropertyNameIcon.Image = global::Rubberduck.Properties.Resources.cross_circle;
- this.InvalidPropertyNameIcon.Location = new System.Drawing.Point(473, 102);
- this.InvalidPropertyNameIcon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.InvalidPropertyNameIcon.Location = new System.Drawing.Point(355, 83);
this.InvalidPropertyNameIcon.Name = "InvalidPropertyNameIcon";
this.InvalidPropertyNameIcon.Size = new System.Drawing.Size(16, 16);
this.InvalidPropertyNameIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -101,13 +99,12 @@ private void InitializeComponent()
//
this.PreviewBox.BackColor = System.Drawing.Color.White;
this.PreviewBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.PreviewBox.Location = new System.Drawing.Point(21, 222);
- this.PreviewBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.PreviewBox.Location = new System.Drawing.Point(16, 180);
this.PreviewBox.Multiline = true;
this.PreviewBox.Name = "PreviewBox";
this.PreviewBox.ReadOnly = true;
this.PreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.PreviewBox.Size = new System.Drawing.Size(621, 217);
+ this.PreviewBox.Size = new System.Drawing.Size(467, 177);
this.PreviewBox.TabIndex = 23;
this.PreviewBox.TabStop = false;
this.PreviewBox.WordWrap = false;
@@ -115,28 +112,25 @@ private void InitializeComponent()
// PreviewLabel
//
this.PreviewLabel.AutoSize = true;
- this.PreviewLabel.Location = new System.Drawing.Point(20, 199);
- this.PreviewLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.PreviewLabel.Location = new System.Drawing.Point(15, 162);
this.PreviewLabel.Name = "PreviewLabel";
- this.PreviewLabel.Size = new System.Drawing.Size(61, 17);
+ this.PreviewLabel.Size = new System.Drawing.Size(48, 13);
this.PreviewLabel.TabIndex = 22;
this.PreviewLabel.Text = "Preview:";
//
// PropertyNameTextBox
//
- this.PropertyNameTextBox.Location = new System.Drawing.Point(23, 113);
- this.PropertyNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.PropertyNameTextBox.Location = new System.Drawing.Point(17, 92);
this.PropertyNameTextBox.Name = "PropertyNameTextBox";
- this.PropertyNameTextBox.Size = new System.Drawing.Size(457, 22);
+ this.PropertyNameTextBox.Size = new System.Drawing.Size(344, 20);
this.PropertyNameTextBox.TabIndex = 0;
//
// PropertyNameLabel
//
this.PropertyNameLabel.AutoSize = true;
- this.PropertyNameLabel.Location = new System.Drawing.Point(19, 92);
- this.PropertyNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.PropertyNameLabel.Location = new System.Drawing.Point(14, 75);
this.PropertyNameLabel.Name = "PropertyNameLabel";
- this.PropertyNameLabel.Size = new System.Drawing.Size(107, 17);
+ this.PropertyNameLabel.Size = new System.Drawing.Size(80, 13);
this.PropertyNameLabel.TabIndex = 15;
this.PropertyNameLabel.Text = "&Property Name:";
//
@@ -147,21 +141,19 @@ private void InitializeComponent()
this.flowLayoutPanel2.Controls.Add(this.OkButton);
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 445);
- this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 362);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(11, 10, 0, 10);
- this.flowLayoutPanel2.Size = new System.Drawing.Size(667, 53);
+ this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(8, 8, 0, 8);
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(500, 43);
this.flowLayoutPanel2.TabIndex = 27;
//
// CancelDialogButton
//
this.CancelDialogButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.CancelDialogButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelDialogButton.Location = new System.Drawing.Point(552, 14);
- this.CancelDialogButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.CancelDialogButton.Location = new System.Drawing.Point(414, 11);
this.CancelDialogButton.Name = "CancelDialogButton";
- this.CancelDialogButton.Size = new System.Drawing.Size(100, 28);
+ this.CancelDialogButton.Size = new System.Drawing.Size(75, 23);
this.CancelDialogButton.TabIndex = 5;
this.CancelDialogButton.Text = "&Cancel";
this.CancelDialogButton.UseVisualStyleBackColor = false;
@@ -170,10 +162,9 @@ private void InitializeComponent()
//
this.OkButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.OkButton.Location = new System.Drawing.Point(444, 14);
- this.OkButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.OkButton.Location = new System.Drawing.Point(333, 11);
this.OkButton.Name = "OkButton";
- this.OkButton.Size = new System.Drawing.Size(100, 28);
+ this.OkButton.Size = new System.Drawing.Size(75, 23);
this.OkButton.TabIndex = 4;
this.OkButton.Text = "&Ok";
this.OkButton.UseVisualStyleBackColor = false;
@@ -181,8 +172,7 @@ private void InitializeComponent()
// InvalidVariableNameIcon
//
this.InvalidVariableNameIcon.Image = global::Rubberduck.Properties.Resources.cross_circle;
- this.InvalidVariableNameIcon.Location = new System.Drawing.Point(473, 156);
- this.InvalidVariableNameIcon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.InvalidVariableNameIcon.Location = new System.Drawing.Point(355, 127);
this.InvalidVariableNameIcon.Name = "InvalidVariableNameIcon";
this.InvalidVariableNameIcon.Size = new System.Drawing.Size(16, 16);
this.InvalidVariableNameIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -192,20 +182,18 @@ private void InitializeComponent()
//
// ParameterNameTextBox
//
- this.ParameterNameTextBox.Location = new System.Drawing.Point(23, 166);
- this.ParameterNameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.ParameterNameTextBox.Location = new System.Drawing.Point(17, 135);
this.ParameterNameTextBox.Name = "ParameterNameTextBox";
- this.ParameterNameTextBox.Size = new System.Drawing.Size(457, 22);
+ this.ParameterNameTextBox.Size = new System.Drawing.Size(344, 20);
this.ParameterNameTextBox.TabIndex = 1;
this.ParameterNameTextBox.Text = "value";
//
// VariableNameLabel
//
this.VariableNameLabel.AutoSize = true;
- this.VariableNameLabel.Location = new System.Drawing.Point(19, 143);
- this.VariableNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.VariableNameLabel.Location = new System.Drawing.Point(14, 116);
this.VariableNameLabel.Name = "VariableNameLabel";
- this.VariableNameLabel.Size = new System.Drawing.Size(119, 17);
+ this.VariableNameLabel.Size = new System.Drawing.Size(89, 13);
this.VariableNameLabel.TabIndex = 28;
this.VariableNameLabel.Text = "Parameter &Name:";
//
@@ -213,11 +201,11 @@ private void InitializeComponent()
//
this.SetterTypeGroupBox.Controls.Add(this.SetSetterTypeCheckBox);
this.SetterTypeGroupBox.Controls.Add(this.LetSetterTypeCheckBox);
- this.SetterTypeGroupBox.Location = new System.Drawing.Point(501, 103);
- this.SetterTypeGroupBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.SetterTypeGroupBox.Location = new System.Drawing.Point(376, 84);
+ this.SetterTypeGroupBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.SetterTypeGroupBox.Name = "SetterTypeGroupBox";
- this.SetterTypeGroupBox.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.SetterTypeGroupBox.Size = new System.Drawing.Size(141, 86);
+ this.SetterTypeGroupBox.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.SetterTypeGroupBox.Size = new System.Drawing.Size(106, 70);
this.SetterTypeGroupBox.TabIndex = 2;
this.SetterTypeGroupBox.TabStop = false;
this.SetterTypeGroupBox.Text = "Assignment:";
@@ -225,10 +213,10 @@ private void InitializeComponent()
// SetSetterTypeCheckBox
//
this.SetSetterTypeCheckBox.AutoSize = true;
- this.SetSetterTypeCheckBox.Location = new System.Drawing.Point(13, 48);
- this.SetSetterTypeCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.SetSetterTypeCheckBox.Location = new System.Drawing.Point(10, 39);
+ this.SetSetterTypeCheckBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.SetSetterTypeCheckBox.Name = "SetSetterTypeCheckBox";
- this.SetSetterTypeCheckBox.Size = new System.Drawing.Size(51, 21);
+ this.SetSetterTypeCheckBox.Size = new System.Drawing.Size(42, 17);
this.SetSetterTypeCheckBox.TabIndex = 3;
this.SetSetterTypeCheckBox.Text = "&Set";
this.SetSetterTypeCheckBox.UseVisualStyleBackColor = true;
@@ -236,10 +224,10 @@ private void InitializeComponent()
// LetSetterTypeCheckBox
//
this.LetSetterTypeCheckBox.AutoSize = true;
- this.LetSetterTypeCheckBox.Location = new System.Drawing.Point(13, 21);
- this.LetSetterTypeCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.LetSetterTypeCheckBox.Location = new System.Drawing.Point(10, 17);
+ this.LetSetterTypeCheckBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.LetSetterTypeCheckBox.Name = "LetSetterTypeCheckBox";
- this.LetSetterTypeCheckBox.Size = new System.Drawing.Size(50, 21);
+ this.LetSetterTypeCheckBox.Size = new System.Drawing.Size(41, 17);
this.LetSetterTypeCheckBox.TabIndex = 2;
this.LetSetterTypeCheckBox.Text = "&Let";
this.LetSetterTypeCheckBox.UseVisualStyleBackColor = true;
@@ -247,10 +235,10 @@ private void InitializeComponent()
// EncapsulateFieldDialog
//
this.AcceptButton = this.OkButton;
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelDialogButton;
- this.ClientSize = new System.Drawing.Size(667, 498);
+ this.ClientSize = new System.Drawing.Size(500, 405);
this.Controls.Add(this.SetterTypeGroupBox);
this.Controls.Add(this.InvalidVariableNameIcon);
this.Controls.Add(this.ParameterNameTextBox);
@@ -264,7 +252,7 @@ private void InitializeComponent()
this.Controls.Add(this.DescriptionPanel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "EncapsulateFieldDialog";
diff --git a/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.resx b/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.resx
+++ b/RetailCoder.VBE/UI/Refactorings/EncapsulateFieldDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.Designer.cs
index 7c294dd60f..d3b4e7b2b1 100644
--- a/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.Designer.cs
@@ -116,7 +116,7 @@ private void InitializeComponent()
this.TitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold);
this.TitleLabel.Location = new System.Drawing.Point(15, 9);
this.TitleLabel.Name = "TitleLabel";
- this.TitleLabel.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.TitleLabel.Padding = new System.Windows.Forms.Padding(2);
this.TitleLabel.Size = new System.Drawing.Size(115, 19);
this.TitleLabel.TabIndex = 2;
this.TitleLabel.Text = "Extract Interface";
@@ -126,7 +126,7 @@ private void InitializeComponent()
this.InstructionsLabel.Location = new System.Drawing.Point(15, 24);
this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.InstructionsLabel.Name = "InstructionsLabel";
- this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(3);
this.InstructionsLabel.Size = new System.Drawing.Size(412, 28);
this.InstructionsLabel.TabIndex = 3;
this.InstructionsLabel.Text = "Please specify interface name and members.";
@@ -151,9 +151,9 @@ private void InitializeComponent()
this.MembersGroupBox.Controls.Add(this.DeselectAllButton);
this.MembersGroupBox.Controls.Add(this.SelectAllButton);
this.MembersGroupBox.Location = new System.Drawing.Point(12, 115);
- this.MembersGroupBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.MembersGroupBox.Margin = new System.Windows.Forms.Padding(2);
this.MembersGroupBox.Name = "MembersGroupBox";
- this.MembersGroupBox.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.MembersGroupBox.Padding = new System.Windows.Forms.Padding(2);
this.MembersGroupBox.Size = new System.Drawing.Size(436, 174);
this.MembersGroupBox.TabIndex = 1;
this.MembersGroupBox.TabStop = false;
@@ -169,7 +169,7 @@ private void InitializeComponent()
this.InterfaceMembersGridView.ColumnHeadersVisible = false;
this.InterfaceMembersGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
this.InterfaceMembersGridView.Location = new System.Drawing.Point(5, 21);
- this.InterfaceMembersGridView.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.InterfaceMembersGridView.Margin = new System.Windows.Forms.Padding(2);
this.InterfaceMembersGridView.MultiSelect = false;
this.InterfaceMembersGridView.Name = "InterfaceMembersGridView";
this.InterfaceMembersGridView.RowHeadersVisible = false;
@@ -183,7 +183,7 @@ private void InitializeComponent()
// DeselectAllButton
//
this.DeselectAllButton.Location = new System.Drawing.Point(331, 52);
- this.DeselectAllButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.DeselectAllButton.Margin = new System.Windows.Forms.Padding(2);
this.DeselectAllButton.Name = "DeselectAllButton";
this.DeselectAllButton.Size = new System.Drawing.Size(100, 26);
this.DeselectAllButton.TabIndex = 3;
@@ -193,7 +193,7 @@ private void InitializeComponent()
// SelectAllButton
//
this.SelectAllButton.Location = new System.Drawing.Point(331, 21);
- this.SelectAllButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.SelectAllButton.Margin = new System.Windows.Forms.Padding(2);
this.SelectAllButton.Name = "SelectAllButton";
this.SelectAllButton.Size = new System.Drawing.Size(100, 26);
this.SelectAllButton.TabIndex = 2;
@@ -215,7 +215,7 @@ private void InitializeComponent()
this.Controls.Add(this.flowLayoutPanel2);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.Margin = new System.Windows.Forms.Padding(2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ExtractInterfaceDialog";
diff --git a/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.resx b/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.resx
+++ b/RetailCoder.VBE/UI/Refactorings/ExtractInterfaceDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.Designer.cs
index 409633a9ab..a882325525 100644
--- a/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.Designer.cs
@@ -62,21 +62,19 @@ private void InitializeComponent()
this.flowLayoutPanel2.Controls.Add(this.OkButton);
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 539);
- this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 438);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(11, 10, 0, 10);
- this.flowLayoutPanel2.Size = new System.Drawing.Size(800, 53);
+ this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(8, 8, 0, 8);
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(600, 43);
this.flowLayoutPanel2.TabIndex = 1;
//
// CancelDialogButton
//
this.CancelDialogButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.CancelDialogButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelDialogButton.Location = new System.Drawing.Point(685, 14);
- this.CancelDialogButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.CancelDialogButton.Location = new System.Drawing.Point(514, 11);
this.CancelDialogButton.Name = "CancelDialogButton";
- this.CancelDialogButton.Size = new System.Drawing.Size(100, 28);
+ this.CancelDialogButton.Size = new System.Drawing.Size(75, 23);
this.CancelDialogButton.TabIndex = 4;
this.CancelDialogButton.Text = "Cancel";
this.CancelDialogButton.UseVisualStyleBackColor = false;
@@ -85,10 +83,9 @@ private void InitializeComponent()
//
this.OkButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.OkButton.Location = new System.Drawing.Point(577, 14);
- this.OkButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.OkButton.Location = new System.Drawing.Point(433, 11);
this.OkButton.Name = "OkButton";
- this.OkButton.Size = new System.Drawing.Size(100, 28);
+ this.OkButton.Size = new System.Drawing.Size(75, 23);
this.OkButton.TabIndex = 3;
this.OkButton.Text = "Ok";
this.OkButton.UseVisualStyleBackColor = false;
@@ -100,29 +97,28 @@ private void InitializeComponent()
this.panel2.Controls.Add(this.InstructionsLabel);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(800, 84);
+ this.panel2.Size = new System.Drawing.Size(600, 68);
this.panel2.TabIndex = 13;
//
// TitleLabel
//
this.TitleLabel.AutoSize = true;
this.TitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TitleLabel.Location = new System.Drawing.Point(20, 11);
- this.TitleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.TitleLabel.Location = new System.Drawing.Point(15, 9);
this.TitleLabel.Name = "TitleLabel";
- this.TitleLabel.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.TitleLabel.Size = new System.Drawing.Size(128, 22);
+ this.TitleLabel.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.TitleLabel.Size = new System.Drawing.Size(107, 19);
this.TitleLabel.TabIndex = 2;
this.TitleLabel.Text = "Extract Method";
//
// InstructionsLabel
//
- this.InstructionsLabel.Location = new System.Drawing.Point(20, 30);
+ this.InstructionsLabel.Location = new System.Drawing.Point(15, 24);
+ this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.InstructionsLabel.Name = "InstructionsLabel";
- this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.InstructionsLabel.Size = new System.Drawing.Size(549, 34);
+ this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.InstructionsLabel.Size = new System.Drawing.Size(412, 28);
this.InstructionsLabel.TabIndex = 3;
this.InstructionsLabel.Text = "Please specify method name, return type and/or parameters (if applicable), and ot" +
"her options.";
@@ -138,17 +134,15 @@ private void InitializeComponent()
this.panel1.Controls.Add(this.AccessibilityLabel);
this.panel1.Controls.Add(this.MethodNameBox);
this.panel1.Controls.Add(this.NameLabel);
- this.panel1.Location = new System.Drawing.Point(0, 87);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Location = new System.Drawing.Point(0, 71);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(800, 458);
+ this.panel1.Size = new System.Drawing.Size(600, 372);
this.panel1.TabIndex = 14;
//
// InvalidNameValidationIcon
//
this.InvalidNameValidationIcon.Image = global::Rubberduck.Properties.Resources.cross_circle;
- this.InvalidNameValidationIcon.Location = new System.Drawing.Point(769, 1);
- this.InvalidNameValidationIcon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.InvalidNameValidationIcon.Location = new System.Drawing.Point(577, 1);
this.InvalidNameValidationIcon.Name = "InvalidNameValidationIcon";
this.InvalidNameValidationIcon.Size = new System.Drawing.Size(16, 16);
this.InvalidNameValidationIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -161,13 +155,12 @@ private void InitializeComponent()
| System.Windows.Forms.AnchorStyles.Right)));
this.PreviewBox.BackColor = System.Drawing.Color.White;
this.PreviewBox.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.PreviewBox.Location = new System.Drawing.Point(24, 254);
- this.PreviewBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.PreviewBox.Location = new System.Drawing.Point(18, 206);
this.PreviewBox.Multiline = true;
this.PreviewBox.Name = "PreviewBox";
this.PreviewBox.ReadOnly = true;
this.PreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.PreviewBox.Size = new System.Drawing.Size(759, 181);
+ this.PreviewBox.Size = new System.Drawing.Size(570, 148);
this.PreviewBox.TabIndex = 9;
this.PreviewBox.TabStop = false;
this.PreviewBox.WordWrap = false;
@@ -175,10 +168,9 @@ private void InitializeComponent()
// PreviewLabel
//
this.PreviewLabel.AutoSize = true;
- this.PreviewLabel.Location = new System.Drawing.Point(20, 234);
- this.PreviewLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.PreviewLabel.Location = new System.Drawing.Point(15, 190);
this.PreviewLabel.Name = "PreviewLabel";
- this.PreviewLabel.Size = new System.Drawing.Size(61, 17);
+ this.PreviewLabel.Size = new System.Drawing.Size(48, 13);
this.PreviewLabel.TabIndex = 8;
this.PreviewLabel.Text = "Preview:";
//
@@ -188,72 +180,66 @@ private void InitializeComponent()
this.MethodParametersGrid.AllowUserToDeleteRows = false;
this.MethodParametersGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.MethodParametersGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.MethodParametersGrid.Location = new System.Drawing.Point(24, 101);
- this.MethodParametersGrid.Margin = new System.Windows.Forms.Padding(11, 4, 11, 4);
+ this.MethodParametersGrid.Location = new System.Drawing.Point(18, 82);
+ this.MethodParametersGrid.Margin = new System.Windows.Forms.Padding(8, 3, 8, 3);
this.MethodParametersGrid.Name = "MethodParametersGrid";
- this.MethodParametersGrid.Size = new System.Drawing.Size(760, 119);
+ this.MethodParametersGrid.Size = new System.Drawing.Size(570, 97);
this.MethodParametersGrid.TabIndex = 2;
//
// ParametersLabel
//
this.ParametersLabel.AutoSize = true;
- this.ParametersLabel.Location = new System.Drawing.Point(20, 81);
- this.ParametersLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.ParametersLabel.Location = new System.Drawing.Point(15, 66);
this.ParametersLabel.Name = "ParametersLabel";
- this.ParametersLabel.Size = new System.Drawing.Size(85, 17);
+ this.ParametersLabel.Size = new System.Drawing.Size(63, 13);
this.ParametersLabel.TabIndex = 6;
this.ParametersLabel.Text = "Parameters:";
//
// MethodAccessibilityCombo
//
this.MethodAccessibilityCombo.FormattingEnabled = true;
- this.MethodAccessibilityCombo.Location = new System.Drawing.Point(573, 42);
- this.MethodAccessibilityCombo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.MethodAccessibilityCombo.Location = new System.Drawing.Point(430, 34);
this.MethodAccessibilityCombo.Name = "MethodAccessibilityCombo";
- this.MethodAccessibilityCombo.Size = new System.Drawing.Size(205, 24);
+ this.MethodAccessibilityCombo.Size = new System.Drawing.Size(155, 21);
this.MethodAccessibilityCombo.TabIndex = 1;
//
// AccessibilityLabel
//
this.AccessibilityLabel.AutoSize = true;
- this.AccessibilityLabel.Location = new System.Drawing.Point(475, 46);
- this.AccessibilityLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.AccessibilityLabel.Location = new System.Drawing.Point(356, 37);
this.AccessibilityLabel.Name = "AccessibilityLabel";
- this.AccessibilityLabel.Size = new System.Drawing.Size(88, 17);
+ this.AccessibilityLabel.Size = new System.Drawing.Size(67, 13);
this.AccessibilityLabel.TabIndex = 4;
this.AccessibilityLabel.Text = "Accessibility:";
//
// MethodNameBox
//
- this.MethodNameBox.Location = new System.Drawing.Point(111, 9);
- this.MethodNameBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.MethodNameBox.Location = new System.Drawing.Point(83, 7);
this.MethodNameBox.Name = "MethodNameBox";
- this.MethodNameBox.Size = new System.Drawing.Size(667, 22);
+ this.MethodNameBox.Size = new System.Drawing.Size(501, 20);
this.MethodNameBox.TabIndex = 0;
//
// NameLabel
//
this.NameLabel.AutoSize = true;
- this.NameLabel.Location = new System.Drawing.Point(20, 12);
- this.NameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.NameLabel.Location = new System.Drawing.Point(15, 10);
this.NameLabel.Name = "NameLabel";
- this.NameLabel.Size = new System.Drawing.Size(49, 17);
+ this.NameLabel.Size = new System.Drawing.Size(38, 13);
this.NameLabel.TabIndex = 0;
this.NameLabel.Text = "Name:";
//
// ExtractMethodDialog
//
this.AcceptButton = this.OkButton;
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelDialogButton;
- this.ClientSize = new System.Drawing.Size(800, 592);
+ this.ClientSize = new System.Drawing.Size(600, 481);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.flowLayoutPanel2);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ExtractMethodDialog";
diff --git a/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.resx b/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.resx
+++ b/RetailCoder.VBE/UI/Refactorings/ExtractMethodDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.Designer.cs
index 2f3d83ddc5..d34f98c4a0 100644
--- a/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.Designer.cs
@@ -53,21 +53,19 @@ private void InitializeComponent()
this.flowLayoutPanel2.Controls.Add(this.OkButton);
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 285);
- this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 232);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(11, 10, 0, 10);
- this.flowLayoutPanel2.Size = new System.Drawing.Size(536, 53);
+ this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(8, 8, 0, 8);
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(402, 43);
this.flowLayoutPanel2.TabIndex = 11;
//
// CancelDialogButton
//
this.CancelDialogButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.CancelDialogButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelDialogButton.Location = new System.Drawing.Point(421, 14);
- this.CancelDialogButton.Margin = new System.Windows.Forms.Padding(4);
+ this.CancelDialogButton.Location = new System.Drawing.Point(316, 11);
this.CancelDialogButton.Name = "CancelDialogButton";
- this.CancelDialogButton.Size = new System.Drawing.Size(100, 28);
+ this.CancelDialogButton.Size = new System.Drawing.Size(75, 23);
this.CancelDialogButton.TabIndex = 4;
this.CancelDialogButton.Text = "Cancel";
this.CancelDialogButton.UseVisualStyleBackColor = false;
@@ -76,10 +74,9 @@ private void InitializeComponent()
//
this.OkButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.OkButton.Location = new System.Drawing.Point(313, 14);
- this.OkButton.Margin = new System.Windows.Forms.Padding(4);
+ this.OkButton.Location = new System.Drawing.Point(235, 11);
this.OkButton.Name = "OkButton";
- this.OkButton.Size = new System.Drawing.Size(100, 28);
+ this.OkButton.Size = new System.Drawing.Size(75, 23);
this.OkButton.TabIndex = 3;
this.OkButton.Text = "Ok";
this.OkButton.UseVisualStyleBackColor = false;
@@ -91,20 +88,18 @@ private void InitializeComponent()
this.panel1.Controls.Add(this.TitleLabel);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(536, 87);
+ this.panel1.Size = new System.Drawing.Size(402, 71);
this.panel1.TabIndex = 12;
//
// InstructionsLabel
//
this.InstructionsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.InstructionsLabel.Location = new System.Drawing.Point(12, 37);
- this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.InstructionsLabel.Location = new System.Drawing.Point(9, 30);
this.InstructionsLabel.Name = "InstructionsLabel";
- this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(5);
- this.InstructionsLabel.Size = new System.Drawing.Size(511, 42);
+ this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.InstructionsLabel.Size = new System.Drawing.Size(383, 34);
this.InstructionsLabel.TabIndex = 6;
this.InstructionsLabel.Text = "Select a parameter and double-click it or use buttons to remove or restore it.";
//
@@ -112,11 +107,10 @@ private void InitializeComponent()
//
this.TitleLabel.AutoSize = true;
this.TitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TitleLabel.Location = new System.Drawing.Point(16, 11);
- this.TitleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.TitleLabel.Location = new System.Drawing.Point(12, 9);
this.TitleLabel.Name = "TitleLabel";
- this.TitleLabel.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.TitleLabel.Size = new System.Drawing.Size(166, 22);
+ this.TitleLabel.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.TitleLabel.Size = new System.Drawing.Size(140, 19);
this.TitleLabel.TabIndex = 4;
this.TitleLabel.Text = "Remove parameters";
//
@@ -128,8 +122,8 @@ private void InitializeComponent()
| System.Windows.Forms.AnchorStyles.Right)));
this.MethodParametersGrid.BackgroundColor = System.Drawing.Color.White;
this.MethodParametersGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
- this.MethodParametersGrid.Location = new System.Drawing.Point(12, 95);
- this.MethodParametersGrid.Margin = new System.Windows.Forms.Padding(11, 4, 11, 4);
+ this.MethodParametersGrid.Location = new System.Drawing.Point(9, 77);
+ this.MethodParametersGrid.Margin = new System.Windows.Forms.Padding(8, 3, 8, 3);
this.MethodParametersGrid.MultiSelect = false;
this.MethodParametersGrid.Name = "MethodParametersGrid";
this.MethodParametersGrid.RowHeadersVisible = false;
@@ -139,7 +133,7 @@ private void InitializeComponent()
this.MethodParametersGrid.ShowCellToolTips = false;
this.MethodParametersGrid.ShowEditingIcon = false;
this.MethodParametersGrid.ShowRowErrors = false;
- this.MethodParametersGrid.Size = new System.Drawing.Size(401, 183);
+ this.MethodParametersGrid.Size = new System.Drawing.Size(301, 149);
this.MethodParametersGrid.TabIndex = 0;
//
// RemoveButton
@@ -147,10 +141,9 @@ private void InitializeComponent()
this.RemoveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.RemoveButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.RemoveButton.Image = global::Rubberduck.Properties.Resources.cross_script;
- this.RemoveButton.Location = new System.Drawing.Point(421, 95);
- this.RemoveButton.Margin = new System.Windows.Forms.Padding(4);
+ this.RemoveButton.Location = new System.Drawing.Point(316, 77);
this.RemoveButton.Name = "RemoveButton";
- this.RemoveButton.Size = new System.Drawing.Size(100, 89);
+ this.RemoveButton.Size = new System.Drawing.Size(75, 72);
this.RemoveButton.TabIndex = 1;
this.RemoveButton.Text = "Remove";
this.RemoveButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -164,10 +157,9 @@ private void InitializeComponent()
this.RestoreButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.RestoreButton.Image = global::Rubberduck.Properties.Resources.arrow_return_180_left;
this.RestoreButton.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
- this.RestoreButton.Location = new System.Drawing.Point(421, 190);
- this.RestoreButton.Margin = new System.Windows.Forms.Padding(4);
+ this.RestoreButton.Location = new System.Drawing.Point(316, 154);
this.RestoreButton.Name = "RestoreButton";
- this.RestoreButton.Size = new System.Drawing.Size(100, 89);
+ this.RestoreButton.Size = new System.Drawing.Size(75, 72);
this.RestoreButton.TabIndex = 2;
this.RestoreButton.Text = "Restore";
this.RestoreButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -178,10 +170,10 @@ private void InitializeComponent()
// RemoveParametersDialog
//
this.AcceptButton = this.OkButton;
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelDialogButton;
- this.ClientSize = new System.Drawing.Size(536, 338);
+ this.ClientSize = new System.Drawing.Size(402, 275);
this.Controls.Add(this.flowLayoutPanel2);
this.Controls.Add(this.RestoreButton);
this.Controls.Add(this.panel1);
@@ -189,7 +181,7 @@ private void InitializeComponent()
this.Controls.Add(this.RemoveButton);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "RemoveParametersDialog";
diff --git a/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.resx b/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.resx
+++ b/RetailCoder.VBE/UI/Refactorings/RemoveParametersDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Refactorings/RenameDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/RenameDialog.Designer.cs
index c1bb88de85..12c742a48d 100644
--- a/RetailCoder.VBE/UI/Refactorings/RenameDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/Refactorings/RenameDialog.Designer.cs
@@ -55,31 +55,28 @@ private void InitializeComponent()
this.panel1.Controls.Add(this.InstructionsLabel);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(684, 79);
+ this.panel1.Size = new System.Drawing.Size(513, 64);
this.panel1.TabIndex = 0;
//
// TitleLabel
//
this.TitleLabel.AutoSize = true;
this.TitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TitleLabel.Location = new System.Drawing.Point(16, 11);
- this.TitleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.TitleLabel.Location = new System.Drawing.Point(12, 9);
this.TitleLabel.Name = "TitleLabel";
- this.TitleLabel.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.TitleLabel.Size = new System.Drawing.Size(145, 22);
+ this.TitleLabel.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.TitleLabel.Size = new System.Drawing.Size(126, 19);
this.TitleLabel.TabIndex = 4;
this.TitleLabel.Text = "Rename identifier";
//
// InstructionsLabel
//
this.InstructionsLabel.AutoSize = true;
- this.InstructionsLabel.Location = new System.Drawing.Point(12, 37);
- this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.InstructionsLabel.Location = new System.Drawing.Point(9, 30);
this.InstructionsLabel.Name = "InstructionsLabel";
- this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(5);
- this.InstructionsLabel.Size = new System.Drawing.Size(230, 27);
+ this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.InstructionsLabel.Size = new System.Drawing.Size(174, 21);
this.InstructionsLabel.TabIndex = 5;
this.InstructionsLabel.Text = "Please specify new name for \'{0}\'.";
//
@@ -88,10 +85,9 @@ private void InitializeComponent()
this.panel2.BackColor = System.Drawing.SystemColors.ControlDark;
this.panel2.Controls.Add(this.flowLayoutPanel2);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(0, 157);
- this.panel2.Margin = new System.Windows.Forms.Padding(4);
+ this.panel2.Location = new System.Drawing.Point(0, 128);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(684, 52);
+ this.panel2.Size = new System.Drawing.Size(513, 42);
this.panel2.TabIndex = 1;
//
// flowLayoutPanel2
@@ -102,20 +98,18 @@ private void InitializeComponent()
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
this.flowLayoutPanel2.Location = new System.Drawing.Point(0, -1);
- this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(11, 10, 0, 10);
- this.flowLayoutPanel2.Size = new System.Drawing.Size(684, 53);
+ this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(8, 8, 0, 8);
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(513, 43);
this.flowLayoutPanel2.TabIndex = 2;
//
// CancelDialogButton
//
this.CancelDialogButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.CancelDialogButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelDialogButton.Location = new System.Drawing.Point(569, 14);
- this.CancelDialogButton.Margin = new System.Windows.Forms.Padding(4);
+ this.CancelDialogButton.Location = new System.Drawing.Point(427, 11);
this.CancelDialogButton.Name = "CancelDialogButton";
- this.CancelDialogButton.Size = new System.Drawing.Size(100, 28);
+ this.CancelDialogButton.Size = new System.Drawing.Size(75, 23);
this.CancelDialogButton.TabIndex = 2;
this.CancelDialogButton.Text = "Cancel";
this.CancelDialogButton.UseVisualStyleBackColor = false;
@@ -124,10 +118,9 @@ private void InitializeComponent()
//
this.OkButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.OkButton.Location = new System.Drawing.Point(461, 14);
- this.OkButton.Margin = new System.Windows.Forms.Padding(4);
+ this.OkButton.Location = new System.Drawing.Point(346, 11);
this.OkButton.Name = "OkButton";
- this.OkButton.Size = new System.Drawing.Size(100, 28);
+ this.OkButton.Size = new System.Drawing.Size(75, 23);
this.OkButton.TabIndex = 1;
this.OkButton.Text = "Ok";
this.OkButton.UseVisualStyleBackColor = false;
@@ -135,8 +128,7 @@ private void InitializeComponent()
// InvalidNameValidationIcon
//
this.InvalidNameValidationIcon.Image = global::Rubberduck.Properties.Resources.cross_circle;
- this.InvalidNameValidationIcon.Location = new System.Drawing.Point(657, 86);
- this.InvalidNameValidationIcon.Margin = new System.Windows.Forms.Padding(4);
+ this.InvalidNameValidationIcon.Location = new System.Drawing.Point(493, 70);
this.InvalidNameValidationIcon.Name = "InvalidNameValidationIcon";
this.InvalidNameValidationIcon.Size = new System.Drawing.Size(16, 16);
this.InvalidNameValidationIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -145,29 +137,27 @@ private void InitializeComponent()
//
// NewNameBox
//
- this.NewNameBox.Location = new System.Drawing.Point(76, 97);
- this.NewNameBox.Margin = new System.Windows.Forms.Padding(4);
+ this.NewNameBox.Location = new System.Drawing.Point(57, 79);
this.NewNameBox.Name = "NewNameBox";
- this.NewNameBox.Size = new System.Drawing.Size(592, 22);
+ this.NewNameBox.Size = new System.Drawing.Size(445, 20);
this.NewNameBox.TabIndex = 0;
//
// NameLabel
//
this.NameLabel.AutoSize = true;
- this.NameLabel.Location = new System.Drawing.Point(12, 101);
- this.NameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.NameLabel.Location = new System.Drawing.Point(9, 82);
this.NameLabel.Name = "NameLabel";
- this.NameLabel.Size = new System.Drawing.Size(49, 17);
+ this.NameLabel.Size = new System.Drawing.Size(38, 13);
this.NameLabel.TabIndex = 11;
this.NameLabel.Text = "Name:";
//
// RenameDialog
//
this.AcceptButton = this.OkButton;
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelDialogButton;
- this.ClientSize = new System.Drawing.Size(684, 209);
+ this.ClientSize = new System.Drawing.Size(513, 170);
this.Controls.Add(this.InvalidNameValidationIcon);
this.Controls.Add(this.NewNameBox);
this.Controls.Add(this.NameLabel);
@@ -175,7 +165,6 @@ private void InitializeComponent()
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "RenameDialog";
diff --git a/RetailCoder.VBE/UI/Refactorings/RenameDialog.resx b/RetailCoder.VBE/UI/Refactorings/RenameDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/Refactorings/RenameDialog.resx
+++ b/RetailCoder.VBE/UI/Refactorings/RenameDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.Designer.cs b/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.Designer.cs
index 8f7e5f215c..7cada55d5f 100644
--- a/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.Designer.cs
@@ -51,10 +51,9 @@ private void InitializeComponent()
this.MoveDownButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.MoveDownButton.Image = ((System.Drawing.Image)(resources.GetObject("MoveDownButton.Image")));
this.MoveDownButton.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
- this.MoveDownButton.Location = new System.Drawing.Point(421, 190);
- this.MoveDownButton.Margin = new System.Windows.Forms.Padding(4);
+ this.MoveDownButton.Location = new System.Drawing.Point(316, 154);
this.MoveDownButton.Name = "MoveDownButton";
- this.MoveDownButton.Size = new System.Drawing.Size(100, 89);
+ this.MoveDownButton.Size = new System.Drawing.Size(75, 72);
this.MoveDownButton.TabIndex = 2;
this.MoveDownButton.Text = "Move down";
this.MoveDownButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -69,21 +68,19 @@ private void InitializeComponent()
this.flowLayoutPanel2.Controls.Add(this.OkButton);
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 285);
- this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 232);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(11, 10, 0, 10);
- this.flowLayoutPanel2.Size = new System.Drawing.Size(536, 53);
+ this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(8, 8, 0, 8);
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(402, 43);
this.flowLayoutPanel2.TabIndex = 3;
//
// CancelDialogButton
//
this.CancelDialogButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.CancelDialogButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelDialogButton.Location = new System.Drawing.Point(421, 14);
- this.CancelDialogButton.Margin = new System.Windows.Forms.Padding(4);
+ this.CancelDialogButton.Location = new System.Drawing.Point(316, 11);
this.CancelDialogButton.Name = "CancelDialogButton";
- this.CancelDialogButton.Size = new System.Drawing.Size(100, 28);
+ this.CancelDialogButton.Size = new System.Drawing.Size(75, 23);
this.CancelDialogButton.TabIndex = 4;
this.CancelDialogButton.Text = "Cancel";
this.CancelDialogButton.UseVisualStyleBackColor = false;
@@ -92,10 +89,9 @@ private void InitializeComponent()
//
this.OkButton.BackColor = System.Drawing.SystemColors.ButtonFace;
this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.OkButton.Location = new System.Drawing.Point(313, 14);
- this.OkButton.Margin = new System.Windows.Forms.Padding(4);
+ this.OkButton.Location = new System.Drawing.Point(235, 11);
this.OkButton.Name = "OkButton";
- this.OkButton.Size = new System.Drawing.Size(100, 28);
+ this.OkButton.Size = new System.Drawing.Size(75, 23);
this.OkButton.TabIndex = 3;
this.OkButton.Text = "Ok";
this.OkButton.UseVisualStyleBackColor = false;
@@ -107,20 +103,18 @@ private void InitializeComponent()
this.panel1.Controls.Add(this.TitleLabel);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(536, 87);
+ this.panel1.Size = new System.Drawing.Size(402, 71);
this.panel1.TabIndex = 4;
//
// InstructionsLabel
//
this.InstructionsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.InstructionsLabel.Location = new System.Drawing.Point(12, 37);
- this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.InstructionsLabel.Location = new System.Drawing.Point(9, 30);
this.InstructionsLabel.Name = "InstructionsLabel";
- this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(5);
- this.InstructionsLabel.Size = new System.Drawing.Size(511, 42);
+ this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.InstructionsLabel.Size = new System.Drawing.Size(383, 34);
this.InstructionsLabel.TabIndex = 6;
this.InstructionsLabel.Text = "Select a parameter and drag it or use buttons to move it up or down.";
//
@@ -128,11 +122,10 @@ private void InitializeComponent()
//
this.TitleLabel.AutoSize = true;
this.TitleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TitleLabel.Location = new System.Drawing.Point(16, 11);
- this.TitleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.TitleLabel.Location = new System.Drawing.Point(12, 9);
this.TitleLabel.Name = "TitleLabel";
- this.TitleLabel.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.TitleLabel.Size = new System.Drawing.Size(165, 22);
+ this.TitleLabel.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.TitleLabel.Size = new System.Drawing.Size(140, 19);
this.TitleLabel.TabIndex = 4;
this.TitleLabel.Text = "Reorder parameters";
//
@@ -144,8 +137,8 @@ private void InitializeComponent()
| System.Windows.Forms.AnchorStyles.Right)));
this.MethodParametersGrid.BackgroundColor = System.Drawing.Color.White;
this.MethodParametersGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
- this.MethodParametersGrid.Location = new System.Drawing.Point(12, 95);
- this.MethodParametersGrid.Margin = new System.Windows.Forms.Padding(11, 4, 11, 4);
+ this.MethodParametersGrid.Location = new System.Drawing.Point(9, 77);
+ this.MethodParametersGrid.Margin = new System.Windows.Forms.Padding(8, 3, 8, 3);
this.MethodParametersGrid.MultiSelect = false;
this.MethodParametersGrid.Name = "MethodParametersGrid";
this.MethodParametersGrid.RowHeadersVisible = false;
@@ -155,17 +148,16 @@ private void InitializeComponent()
this.MethodParametersGrid.ShowCellToolTips = false;
this.MethodParametersGrid.ShowEditingIcon = false;
this.MethodParametersGrid.ShowRowErrors = false;
- this.MethodParametersGrid.Size = new System.Drawing.Size(401, 183);
+ this.MethodParametersGrid.Size = new System.Drawing.Size(301, 149);
this.MethodParametersGrid.TabIndex = 0;
//
// MoveUpButton
//
this.MoveUpButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.MoveUpButton.Image = ((System.Drawing.Image)(resources.GetObject("MoveUpButton.Image")));
- this.MoveUpButton.Location = new System.Drawing.Point(421, 95);
- this.MoveUpButton.Margin = new System.Windows.Forms.Padding(4);
+ this.MoveUpButton.Location = new System.Drawing.Point(316, 77);
this.MoveUpButton.Name = "MoveUpButton";
- this.MoveUpButton.Size = new System.Drawing.Size(100, 89);
+ this.MoveUpButton.Size = new System.Drawing.Size(75, 72);
this.MoveUpButton.TabIndex = 1;
this.MoveUpButton.Text = "Move up";
this.MoveUpButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -176,10 +168,10 @@ private void InitializeComponent()
// ReorderParametersDialog
//
this.AcceptButton = this.OkButton;
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelDialogButton;
- this.ClientSize = new System.Drawing.Size(536, 338);
+ this.ClientSize = new System.Drawing.Size(402, 275);
this.Controls.Add(this.MethodParametersGrid);
this.Controls.Add(this.panel1);
this.Controls.Add(this.flowLayoutPanel2);
@@ -187,7 +179,7 @@ private void InitializeComponent()
this.Controls.Add(this.MoveUpButton);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ReorderParametersDialog";
diff --git a/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.resx b/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.resx
index 885f8871f0..b81f9c2d9c 100644
--- a/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.resx
+++ b/RetailCoder.VBE/UI/Refactorings/ReorderParametersDialog.resx
@@ -148,23 +148,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.Designer.cs b/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.Designer.cs
index e1f92c6068..c77c8e2b21 100644
--- a/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.Designer.cs
+++ b/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.Designer.cs
@@ -90,7 +90,7 @@ private void InitializeComponent()
this.flowLayoutPanel2.Controls.Add(this.CloseButton);
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 398);
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 399);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(8, 8, 0, 8);
this.flowLayoutPanel2.Size = new System.Drawing.Size(464, 43);
@@ -102,7 +102,7 @@ private void InitializeComponent()
this.ElementHost.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.ElementHost.Location = new System.Drawing.Point(0, 64);
this.ElementHost.Name = "ElementHost";
- this.ElementHost.Size = new System.Drawing.Size(464, 334);
+ this.ElementHost.Size = new System.Drawing.Size(464, 335);
this.ElementHost.TabIndex = 4;
this.ElementHost.Child = this.RegexAssistant;
//
@@ -111,7 +111,7 @@ private void InitializeComponent()
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CloseButton;
- this.ClientSize = new System.Drawing.Size(464, 441);
+ this.ClientSize = new System.Drawing.Size(464, 442);
this.Controls.Add(this.ElementHost);
this.Controls.Add(this.flowLayoutPanel2);
this.Controls.Add(this.panel1);
diff --git a/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.resx b/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.resx
+++ b/RetailCoder.VBE/UI/RegexAssistant/RegexAssistantDialog.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Settings/SettingsForm.Designer.cs b/RetailCoder.VBE/UI/Settings/SettingsForm.Designer.cs
index 9dcb154532..84b8e5ce85 100644
--- a/RetailCoder.VBE/UI/Settings/SettingsForm.Designer.cs
+++ b/RetailCoder.VBE/UI/Settings/SettingsForm.Designer.cs
@@ -38,9 +38,9 @@ private void InitializeComponent()
this.ElementHost.Dock = System.Windows.Forms.DockStyle.Fill;
this.ElementHost.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.ElementHost.Location = new System.Drawing.Point(0, 0);
- this.ElementHost.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.ElementHost.Margin = new System.Windows.Forms.Padding(2);
this.ElementHost.Name = "ElementHost";
- this.ElementHost.Size = new System.Drawing.Size(624, 473);
+ this.ElementHost.Size = new System.Drawing.Size(904, 582);
this.ElementHost.TabIndex = 0;
this.ElementHost.Child = this.SettingsControl;
//
@@ -48,10 +48,10 @@ private void InitializeComponent()
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(624, 473);
+ this.ClientSize = new System.Drawing.Size(904, 582);
this.Controls.Add(this.ElementHost);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.Margin = new System.Windows.Forms.Padding(2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(920, 620);
diff --git a/RetailCoder.VBE/UI/Settings/SettingsForm.resx b/RetailCoder.VBE/UI/Settings/SettingsForm.resx
index d3a1a2980d..0a0a5023e2 100644
--- a/RetailCoder.VBE/UI/Settings/SettingsForm.resx
+++ b/RetailCoder.VBE/UI/Settings/SettingsForm.resx
@@ -120,23 +120,26 @@
- 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
+ AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAABwAAAAgAAAAGAAAABwAAAAgAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAABAwNEAAAA/zpkZP8uXmP/LGBl/y9hY/80ZGP/OWlo/0t2dP8AAAD/AAAAxwEC
+ AogAAAAAAAAAAAAAAAAAAQGTCicr/zTk+f9U3v//RtX//0rV//9P3f//Ve3//y/p//855/v/Qv3//1T/
+ //8MLS/+AAAA0QAAAAAAAQGRBBMW/zXn/f846v//SNz9/0jL/v8xvv//OMv//0DU//8/3v3/L+j//zTo
+ //8r4/z/Svr//0mAf/4BAgKIISko/ynQ5v8x6P//Men//y7Z7v9ApLn/LrH4/y+y9f84vfT/K57K/y/l
+ +v8x5///L+j//0v2//+M////AAAAihIsLf8w7f//MOr//zXq//8x6f//JK6+/yeIp/8gZoL/LYyq/ynF
+ 2f8w5/7/MOj//zTq//9K9P//g////wAAAJUAAADSROX//1LK//9E5f//OO7//zLr//8w4ff/L+X7/y/j
+ +v8x6P//N+z//zHo//8s5v//gv3//7j///4AAACcAAAAlD+Cof87c4z/RGNj/zRdY/8xoK7+LfX//xrm
+ //8c2v//IeD//zDx//9G+P//Vvr//9z///8kKir/AAAAAAAAAFYAAABtAAAAGgAAAAgAAAALAAAA2yTb
+ +v8Y0f//HNr//xzf//8z+///Yv///2y8vP4qMjL/BAUFMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3Cac
+ r/8t0/7/Icn//x7Y//8o+P7/Sv///wAAAP8AAACgAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEwwh
+ I/873P//JMj//xS8//8Wyv//Gpi2/wIADv8LCgC5AAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ ACUqYWT/Mtb//xy6//8Gt/7/Htr//xlhbP8fRvX/O1Hs/jlCctsAAAADAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAaSGpo/0vZ//4Zs///n+z//wAAAP9FVFz/E0Gh/z1G//9AS2j/AAAAAwAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAABAAAAKiS8/7MOr3//pLc/v/v////Pmxs/zBBPcIAAAD/ISEv/wAAAAQAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAABNAAAAtqXk8shM0v//Ppac/wAAAP8AAAA2AAAAAAAAAAcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAACfAAAAlAAAAIAAAAA3AAAAAQAAAAAAAAAAAAAAAAAA
+ AAAAAAAA//8AAOADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAD4AwAA8AcAAPAPAADwBwAA8AcAAPAH
+ AAD4PwAA/H8AAA==
\ No newline at end of file