diff --git a/AssemblyRemapperGUI/Form1.Designer.cs b/AssemblyRemapperGUI/Form1.Designer.cs
index 611b6c0..ffe8fd4 100644
--- a/AssemblyRemapperGUI/Form1.Designer.cs
+++ b/AssemblyRemapperGUI/Form1.Designer.cs
@@ -35,7 +35,7 @@ partial class AssemblyToolGUI
Inclusions = new TabControl();
tabPage1 = new TabPage();
groupBox4 = new GroupBox();
- numericUpDown4 = new NumericUpDown();
+ MethodCountUpDown = new NumericUpDown();
label4 = new Label();
ExcludeMethodTextBox = new TextBox();
IncludeMethodTextBox = new TextBox();
@@ -72,7 +72,7 @@ partial class AssemblyToolGUI
tabPage4 = new TabPage();
groupBox6 = new GroupBox();
NestedTypeCountUpDown = new NumericUpDown();
- BaseClassExclueTextFiel = new TextBox();
+ BaseClassExcludeTextField = new TextBox();
NestedTypeParentName = new TextBox();
label2 = new Label();
BaseClassIncludeTextFIeld = new TextBox();
@@ -85,6 +85,7 @@ partial class AssemblyToolGUI
NestedTypesExcludeBox = new ListBox();
NestedTypesIncludeBox = new ListBox();
groupBox3 = new GroupBox();
+ IsSealed = new CheckBox();
IsInterface = new CheckBox();
IsAbstract = new CheckBox();
HasGenericParameters = new CheckBox();
@@ -94,7 +95,7 @@ partial class AssemblyToolGUI
IsNested = new CheckBox();
HasAttribute = new CheckBox();
groupBox2 = new GroupBox();
- checkBox1 = new CheckBox();
+ ForceRenameCheckbox = new CheckBox();
OriginalTypeName = new TextBox();
NewTypeName = new TextBox();
ScoreButton = new Button();
@@ -110,7 +111,7 @@ partial class AssemblyToolGUI
Inclusions.SuspendLayout();
tabPage1.SuspendLayout();
groupBox4.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)numericUpDown4).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)MethodCountUpDown).BeginInit();
tabPage2.SuspendLayout();
groupBox5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)FieldCountUpDown).BeginInit();
@@ -186,7 +187,7 @@ partial class AssemblyToolGUI
//
// groupBox4
//
- groupBox4.Controls.Add(numericUpDown4);
+ groupBox4.Controls.Add(MethodCountUpDown);
groupBox4.Controls.Add(label4);
groupBox4.Location = new Point(6, 329);
groupBox4.Name = "groupBox4";
@@ -195,12 +196,12 @@ partial class AssemblyToolGUI
groupBox4.TabStop = false;
groupBox4.Text = "Other";
//
- // numericUpDown4
+ // MethodCountUpDown
//
- numericUpDown4.Location = new Point(6, 30);
- numericUpDown4.Name = "numericUpDown4";
- numericUpDown4.Size = new Size(55, 31);
- numericUpDown4.TabIndex = 6;
+ MethodCountUpDown.Location = new Point(6, 30);
+ MethodCountUpDown.Name = "MethodCountUpDown";
+ MethodCountUpDown.Size = new Size(55, 31);
+ MethodCountUpDown.TabIndex = 6;
//
// label4
//
@@ -547,7 +548,7 @@ partial class AssemblyToolGUI
// groupBox6
//
groupBox6.Controls.Add(NestedTypeCountUpDown);
- groupBox6.Controls.Add(BaseClassExclueTextFiel);
+ groupBox6.Controls.Add(BaseClassExcludeTextField);
groupBox6.Controls.Add(NestedTypeParentName);
groupBox6.Controls.Add(label2);
groupBox6.Controls.Add(BaseClassIncludeTextFIeld);
@@ -565,13 +566,13 @@ partial class AssemblyToolGUI
NestedTypeCountUpDown.Size = new Size(55, 31);
NestedTypeCountUpDown.TabIndex = 4;
//
- // BaseClassExclueTextFiel
+ // BaseClassExcludeTextField
//
- BaseClassExclueTextFiel.Location = new Point(6, 141);
- BaseClassExclueTextFiel.Name = "BaseClassExclueTextFiel";
- BaseClassExclueTextFiel.PlaceholderText = "Exclude Base Class";
- BaseClassExclueTextFiel.Size = new Size(239, 31);
- BaseClassExclueTextFiel.TabIndex = 1;
+ BaseClassExcludeTextField.Location = new Point(6, 141);
+ BaseClassExcludeTextField.Name = "BaseClassExcludeTextField";
+ BaseClassExcludeTextField.PlaceholderText = "Exclude Base Class";
+ BaseClassExcludeTextField.Size = new Size(239, 31);
+ BaseClassExcludeTextField.TabIndex = 1;
//
// NestedTypeParentName
//
@@ -674,6 +675,7 @@ partial class AssemblyToolGUI
//
// groupBox3
//
+ groupBox3.Controls.Add(IsSealed);
groupBox3.Controls.Add(IsInterface);
groupBox3.Controls.Add(IsAbstract);
groupBox3.Controls.Add(HasGenericParameters);
@@ -689,6 +691,16 @@ partial class AssemblyToolGUI
groupBox3.TabStop = false;
groupBox3.Text = "True or False Checks";
//
+ // IsSealed
+ //
+ IsSealed.AutoSize = true;
+ IsSealed.Location = new Point(6, 121);
+ IsSealed.Name = "IsSealed";
+ IsSealed.Size = new Size(103, 29);
+ IsSealed.TabIndex = 12;
+ IsSealed.Text = "IsSealed";
+ IsSealed.UseVisualStyleBackColor = true;
+ //
// IsInterface
//
IsInterface.AutoSize = true;
@@ -702,7 +714,7 @@ partial class AssemblyToolGUI
// IsAbstract
//
IsAbstract.AutoSize = true;
- IsAbstract.Location = new Point(6, 120);
+ IsAbstract.Location = new Point(125, 30);
IsAbstract.Name = "IsAbstract";
IsAbstract.Size = new Size(117, 29);
IsAbstract.TabIndex = 5;
@@ -742,7 +754,7 @@ partial class AssemblyToolGUI
// IsEnum
//
IsEnum.AutoSize = true;
- IsEnum.Location = new Point(125, 31);
+ IsEnum.Location = new Point(269, 121);
IsEnum.Name = "IsEnum";
IsEnum.Size = new Size(96, 29);
IsEnum.TabIndex = 7;
@@ -771,7 +783,7 @@ partial class AssemblyToolGUI
//
// groupBox2
//
- groupBox2.Controls.Add(checkBox1);
+ groupBox2.Controls.Add(ForceRenameCheckbox);
groupBox2.Controls.Add(OriginalTypeName);
groupBox2.Controls.Add(NewTypeName);
groupBox2.Location = new Point(6, 30);
@@ -781,15 +793,15 @@ partial class AssemblyToolGUI
groupBox2.TabStop = false;
groupBox2.Text = "Main settings";
//
- // checkBox1
+ // ForceRenameCheckbox
//
- checkBox1.AutoSize = true;
- checkBox1.Location = new Point(568, 32);
- checkBox1.Name = "checkBox1";
- checkBox1.Size = new Size(183, 29);
- checkBox1.TabIndex = 2;
- checkBox1.Text = "Use Force Rename";
- checkBox1.UseVisualStyleBackColor = true;
+ ForceRenameCheckbox.AutoSize = true;
+ ForceRenameCheckbox.Location = new Point(568, 32);
+ ForceRenameCheckbox.Name = "ForceRenameCheckbox";
+ ForceRenameCheckbox.Size = new Size(183, 29);
+ ForceRenameCheckbox.TabIndex = 2;
+ ForceRenameCheckbox.Text = "Use Force Rename";
+ ForceRenameCheckbox.UseVisualStyleBackColor = true;
//
// OriginalTypeName
//
@@ -889,7 +901,7 @@ partial class AssemblyToolGUI
tabPage1.PerformLayout();
groupBox4.ResumeLayout(false);
groupBox4.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)numericUpDown4).EndInit();
+ ((System.ComponentModel.ISupportInitialize)MethodCountUpDown).EndInit();
tabPage2.ResumeLayout(false);
tabPage2.PerformLayout();
groupBox5.ResumeLayout(false);
@@ -923,7 +935,7 @@ partial class AssemblyToolGUI
private TabControl Inclusions;
private TabPage tabPage1;
private GroupBox groupBox4;
- private NumericUpDown numericUpDown4;
+ private NumericUpDown MethodCountUpDown;
private Label label4;
private TextBox ExcludeMethodTextBox;
private TextBox IncludeMethodTextBox;
@@ -960,7 +972,7 @@ partial class AssemblyToolGUI
private TabPage tabPage4;
private GroupBox groupBox6;
private NumericUpDown NestedTypeCountUpDown;
- private TextBox BaseClassExclueTextFiel;
+ private TextBox BaseClassExcludeTextField;
private TextBox NestedTypeParentName;
private Label label2;
private TextBox BaseClassIncludeTextFIeld;
@@ -982,7 +994,7 @@ partial class AssemblyToolGUI
private CheckBox IsNested;
private CheckBox HasAttribute;
private GroupBox groupBox2;
- private CheckBox checkBox1;
+ private CheckBox ForceRenameCheckbox;
private TextBox OriginalTypeName;
private TextBox NewTypeName;
private Button ScoreButton;
@@ -992,4 +1004,5 @@ partial class AssemblyToolGUI
private TabControl TabControlMain;
private MenuStrip menuStrip1;
private ToolStripMenuItem SettingsButton;
+ private CheckBox IsSealed;
}
diff --git a/AssemblyRemapperGUI/Form1.cs b/AssemblyRemapperGUI/Form1.cs
index 067f7bc..869c0e5 100644
--- a/AssemblyRemapperGUI/Form1.cs
+++ b/AssemblyRemapperGUI/Form1.cs
@@ -1,9 +1,13 @@
-using AssemblyRemapper.Utils;
+using AssemblyRemapper.Enums;
+using AssemblyRemapper.Models;
+using AssemblyRemapper.Remapper;
namespace AssemblyRemapperGUI
{
public partial class AssemblyToolGUI : Form
{
+ public static Remapper Remapper { get; private set; }
+
public AssemblyToolGUI()
{
InitializeComponent();
@@ -11,9 +15,51 @@ namespace AssemblyRemapperGUI
#region BUTTONS
+ ///
+ /// Construct a new remap when the button is pressed
+ ///
+ ///
+ ///
private void AddRemapButton_Click(object sender, EventArgs e)
{
- Logger.Log("Hello From GUI!");
+ MethodIncludeBox.Items.Add("TEST");
+
+ var remap = new RemapModel
+ {
+ Succeeded = false,
+ FailureReason = EFailureReason.None,
+ NewTypeName = NewTypeName.Text,
+ OriginalTypeName = OriginalTypeName.Text,
+ UseForceRename = ForceRenameCheckbox.Checked,
+ SearchParams = new SearchParams
+ {
+ IsPublic = IsPublic.Checked,
+ IsAbstract = IsAbstract.Checked,
+ IsInterface = IsInterface.Checked,
+ IsEnum = IsEnum.Checked,
+ IsNested = IsNested.Checked,
+ IsSealed = IsSealed.Checked,
+ HasAttribute = HasAttribute.Checked,
+ IsDerived = IsDerived.Checked,
+ HasGenericParameters = HasGenericParameters.Checked,
+ ParentName = NestedTypeParentName.Text,
+ MatchBaseClass = BaseClassExcludeTextField.Text,
+ IgnoreBaseClass = BaseClassIncludeTextFIeld.Text,
+ // Constructor
+ MethodCount = (int)MethodCountUpDown.Value,
+ FieldCount = (int)FieldCountUpDown.Value,
+ PropertyCount = (int)PropertiesCountUpDown.Value,
+ NestedTypeCount = (int)NestedTypeCountUpDown.Value,
+ IncludeMethods = [],
+ ExcludeMethods = [],
+ IncludeFields = [],
+ ExcludeFields = [],
+ IncludeProperties = [],
+ ExcludeProperties = [],
+ IncludeNestedTypes = [],
+ ExcludeNestedTypes = [],
+ }
+ };
}
private void RemoveRemapButton_Click(object sender, EventArgs e)
@@ -26,66 +72,130 @@ namespace AssemblyRemapperGUI
private void MethodIncludeAddButton_Click(object sender, EventArgs e)
{
+ if (!MethodIncludeBox.Items.Contains(IncludeMethodTextBox.Text))
+ {
+ MethodIncludeBox.Items.Add(IncludeMethodTextBox.Text);
+ }
}
private void MethodIncludeRemoveButton_Click(object sender, EventArgs e)
{
+ if (MethodIncludeBox.SelectedItem != null)
+ {
+ MethodIncludeBox.Items.Remove(MethodIncludeBox.SelectedItem);
+ }
}
private void MethodExcludeAddButton_Click(object sender, EventArgs e)
{
+ if (!MethodExcludeBox.Items.Contains(ExcludeMethodTextBox.Text))
+ {
+ MethodExcludeBox.Items.Add(ExcludeMethodTextBox.Text);
+ }
}
private void MethodExcludeRemoveButton_Click(object sender, EventArgs e)
{
+ if (MethodExcludeBox.SelectedItem != null)
+ {
+ MethodExcludeBox.Items.Remove(MethodExcludeBox.SelectedItem);
+ }
}
private void FIeldIncludeAddButton_Click(object sender, EventArgs e)
{
+ if (!FieldIncludeBox.Items.Contains(FieldsIncludeTextInput.Text))
+ {
+ FieldIncludeBox.Items.Add(FieldsIncludeTextInput.Text);
+ }
}
private void FieldIncludeRemoveButton_Click(object sender, EventArgs e)
{
+ if (FieldIncludeBox.SelectedItem != null)
+ {
+ FieldIncludeBox.Items.Remove(FieldIncludeBox.SelectedItem);
+ }
}
private void FieldExcludeAddButton_Click(object sender, EventArgs e)
{
+ if (!FieldExcludeBox.Items.Contains(FieldsExcludeTextInput.Text))
+ {
+ FieldExcludeBox.Items.Add(FieldsExcludeTextInput.Text);
+ }
}
private void FieldExcludeRemoveButton_Click(object sender, EventArgs e)
{
+ if (FieldExcludeBox.SelectedItem != null)
+ {
+ FieldExcludeBox.Items.Remove(FieldExcludeBox.SelectedItem);
+ }
}
private void PropertiesIncludeAddButton_Click(object sender, EventArgs e)
{
+ if (!PropertiesIncludeBox.Items.Contains(PropertiesIncludeTextField.Text))
+ {
+ PropertiesIncludeBox.Items.Add(PropertiesIncludeTextField.Text);
+ }
}
private void PropertiesIncludeRemoveButton_Click(object sender, EventArgs e)
{
+ if (PropertiesIncludeBox.SelectedItem != null)
+ {
+ PropertiesIncludeBox.Items.Remove(PropertiesIncludeBox.SelectedItem);
+ }
}
private void PropertiesExcludeAddButton_Click(object sender, EventArgs e)
{
+ if (!PropertiesExcludeBox.Items.Contains(PropertiesExcludeTextField.Text))
+ {
+ PropertiesExcludeBox.Items.Add(PropertiesExcludeTextField.Text);
+ }
}
private void PropertiesExcludeRemoveButton_Click(object sender, EventArgs e)
{
+ if (PropertiesExcludeBox.SelectedItem != null)
+ {
+ PropertiesExcludeBox.Items.Remove(PropertiesExcludeBox.SelectedItem);
+ }
}
private void NestedTypesAddButton_Click(object sender, EventArgs e)
{
+ if (!NestedTypesIncludeBox.Items.Contains(NestedTypesIncludeTextField.Text))
+ {
+ NestedTypesIncludeBox.Items.Add(NestedTypesIncludeTextField.Text);
+ }
}
private void NestedTypesRemoveButton_Click(object sender, EventArgs e)
{
+ if (NestedTypesIncludeBox.SelectedItem != null)
+ {
+ NestedTypesIncludeBox.Items.Remove(NestedTypesIncludeBox.SelectedItem);
+ }
}
private void NestedTypesExlcudeAddButton_Click(object sender, EventArgs e)
{
+ if (!NestedTypesExcludeBox.Items.Contains(NestedTypesExcludeTextField.Text))
+ {
+ NestedTypesExcludeBox.Items.Add(NestedTypesExcludeTextField.Text);
+ }
}
private void NestedTypesExcludeRemoveButton_Click(object sender, EventArgs e)
{
+ if (NestedTypesExcludeBox.SelectedItem != null)
+ {
+ NestedTypesExcludeBox.Items.Remove(NestedTypesExcludeBox.SelectedItem);
+ }
}
#endregion BUTTONS
diff --git a/AssemblyRemapperGUI/Utils/GUI.cs b/AssemblyRemapperGUI/Utils/GUI.cs
new file mode 100644
index 0000000..c95f835
--- /dev/null
+++ b/AssemblyRemapperGUI/Utils/GUI.cs
@@ -0,0 +1,12 @@
+namespace RemapperGUI.Utils;
+
+internal static class GUI
+{
+ public static void AddToListBox()
+ {
+ }
+
+ public static void RemoveFromListBox()
+ {
+ }
+}
\ No newline at end of file