diff --git a/Crypto Notepad/Crypto Notepad.csproj b/Crypto Notepad/Crypto Notepad.csproj index c61632d..95b60fe 100644 --- a/Crypto Notepad/Crypto Notepad.csproj +++ b/Crypto Notepad/Crypto Notepad.csproj @@ -127,11 +127,11 @@ MainForm.cs - + Form - - EnterKeyForm.cs + + EnterPasswordForm.cs @@ -171,8 +171,8 @@ MainForm.cs - - EnterKeyForm.cs + + EnterPasswordForm.cs PasswordGeneratorFrom.cs diff --git a/Crypto Notepad/Forms/EnterKeyForm.Designer.cs b/Crypto Notepad/Forms/EnterPasswordForm.Designer.cs similarity index 96% rename from Crypto Notepad/Forms/EnterKeyForm.Designer.cs rename to Crypto Notepad/Forms/EnterPasswordForm.Designer.cs index cff91c2..8803c39 100644 --- a/Crypto Notepad/Forms/EnterKeyForm.Designer.cs +++ b/Crypto Notepad/Forms/EnterPasswordForm.Designer.cs @@ -1,6 +1,6 @@ namespace Crypto_Notepad { - partial class EnterKeyForm + partial class EnterPasswordForm { /// /// Required designer variable. @@ -29,7 +29,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnterKeyForm)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnterPasswordForm)); this.okButton = new System.Windows.Forms.Button(); this.mainPanel = new System.Windows.Forms.Panel(); this.lockPictureBox = new System.Windows.Forms.PictureBox(); @@ -128,7 +128,7 @@ private void InitializeComponent() this.passwordGeneratorButton.UseVisualStyleBackColor = true; this.passwordGeneratorButton.Click += new System.EventHandler(this.PasswordGeneratorButton_Click); // - // EnterKeyForm + // EnterPasswordForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -141,11 +141,11 @@ private void InitializeComponent() this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "EnterKeyForm"; + this.Name = "EnterPasswordForm"; this.Text = "Crypto Notepad"; - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.EnterKeyForm_FormClosed); - this.Load += new System.EventHandler(this.EnterKeyForm_Load); - this.Shown += new System.EventHandler(this.EnterKeyForm_Shown); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.EnterPasswordForm_FormClosed); + this.Load += new System.EventHandler(this.EnterPasswordForm_Load); + this.Shown += new System.EventHandler(this.EnterPasswordForm_Shown); this.mainPanel.ResumeLayout(false); this.mainPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.lockPictureBox)).EndInit(); diff --git a/Crypto Notepad/Forms/EnterKeyForm.cs b/Crypto Notepad/Forms/EnterPasswordForm.cs similarity index 89% rename from Crypto Notepad/Forms/EnterKeyForm.cs rename to Crypto Notepad/Forms/EnterPasswordForm.cs index cf6cd86..3aa29f0 100644 --- a/Crypto Notepad/Forms/EnterKeyForm.cs +++ b/Crypto Notepad/Forms/EnterPasswordForm.cs @@ -3,16 +3,16 @@ namespace Crypto_Notepad { - public partial class EnterKeyForm : Form + public partial class EnterPasswordForm : Form { - public EnterKeyForm() + public EnterPasswordForm() { PublicVar.okPressed = false; InitializeComponent(); } /*Form Events*/ - private void EnterKeyForm_FormClosed(object sender, FormClosedEventArgs e) + private void EnterPasswordForm_FormClosed(object sender, FormClosedEventArgs e) { MainForm main = Owner as MainForm; if (main.Visible == false) @@ -23,7 +23,7 @@ private void EnterKeyForm_FormClosed(object sender, FormClosedEventArgs e) keyTextBox.Focus(); } - private void EnterKeyForm_Load(object sender, EventArgs e) + private void EnterPasswordForm_Load(object sender, EventArgs e) { fileNameLabel.Text = PublicVar.openFileName; Properties.Settings settings = Properties.Settings.Default; @@ -39,7 +39,7 @@ private void EnterKeyForm_Load(object sender, EventArgs e) } } - private void EnterKeyForm_Shown(object sender, EventArgs e) + private void EnterPasswordForm_Shown(object sender, EventArgs e) { fileNameLabel.Text = PublicVar.openFileName; } diff --git a/Crypto Notepad/Forms/EnterKeyForm.resx b/Crypto Notepad/Forms/EnterPasswordForm.resx similarity index 100% rename from Crypto Notepad/Forms/EnterKeyForm.resx rename to Crypto Notepad/Forms/EnterPasswordForm.resx diff --git a/Crypto Notepad/Forms/MainForm.cs b/Crypto Notepad/Forms/MainForm.cs index 50c72de..ee1041c 100644 --- a/Crypto Notepad/Forms/MainForm.cs +++ b/Crypto Notepad/Forms/MainForm.cs @@ -1,4 +1,4 @@ -using Crypto_Notepad.Properties; +using Crypto_Notepad.Properties; using System; using System.ComponentModel; using System.Diagnostics; @@ -51,9 +51,9 @@ protected override void WndProc(ref Message m) #region Methods private async Task DecryptAES() { - EnterKeyForm enterKeyForm = new EnterKeyForm(); - enterKeyForm.Owner = this; - enterKeyForm.ShowDialog(); + EnterPasswordForm enterPasswordForm = new EnterPasswordForm(); + enterPasswordForm.Owner = this; + enterPasswordForm.ShowDialog(); richTextBox.SuspendDrawing(); UseWaitCursor = true; if (!PublicVar.okPressed) @@ -203,11 +203,11 @@ private async void ContextMenuEncryptReplace() richTextBox.Text = File.ReadAllText(args[1]); PublicVar.openFileName = Path.GetFileName(args[1]); string newFileName = Path.GetDirectoryName(args[1]) + @"\" + Path.GetFileNameWithoutExtension(args[1]) + ".cnp"; - EnterKeyForm enterKeyForm = new EnterKeyForm + EnterPasswordForm enterPasswordForm = new EnterPasswordForm { Owner = this }; - enterKeyForm.ShowDialog(); + enterPasswordForm.ShowDialog(); File.Delete(args[1]); string unencryptedText = richTextBox.Text; string encryptedText = await AES.Encrypt(richTextBox.Text, TypedPassword.Value, null, settings.HashAlgorithm, Convert.ToInt32(settings.PasswordIterations), @@ -767,7 +767,7 @@ private void MainWindow_FormClosing(object sender, FormClosingEventArgs e) e.Cancel = true; return; } - EnterKeyForm enterKeyForm = new EnterKeyForm + EnterPasswordForm enterKeyForm = new EnterPasswordForm { Owner = this }; @@ -1016,7 +1016,7 @@ private void NewMainMenu_Click(object sender, EventArgs e) return; } PublicVar.openFileName = "Unnamed.cnp"; - EnterKeyForm enterKeyForm = new EnterKeyForm + EnterPasswordForm enterKeyForm = new EnterPasswordForm { Owner = this }; @@ -1134,7 +1134,7 @@ private async void SaveAsMainMenu_Click(object sender, EventArgs e) return; } PublicVar.openFileName = Path.GetFileName(saveFileDialog.FileName); - EnterKeyForm enterKeyForm = new EnterKeyForm + EnterPasswordForm enterKeyForm = new EnterPasswordForm { Owner = this };