From 5534ebc5079edebf53e512badf11a43285c6a570 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Nov 2019 22:36:43 +0200 Subject: [PATCH] Renamed ChangeKeyForm to ChangePasswordForm --- Crypto Notepad/Crypto Notepad.csproj | 10 ++-- ...gner.cs => ChangePasswordForm.Designer.cs} | 8 +-- ...ChangeKeyForm.cs => ChangePasswordForm.cs} | 0 ...geKeyForm.resx => ChangePasswordForm.resx} | 0 Crypto Notepad/Forms/MainForm.Designer.cs | 60 +++++++++---------- Crypto Notepad/Forms/MainForm.cs | 26 ++++---- Crypto Notepad/Forms/MainForm.resx | 2 +- 7 files changed, 53 insertions(+), 53 deletions(-) rename Crypto Notepad/Forms/{ChangeKeyForm.Designer.cs => ChangePasswordForm.Designer.cs} (98%) rename Crypto Notepad/Forms/{ChangeKeyForm.cs => ChangePasswordForm.cs} (100%) rename Crypto Notepad/Forms/{ChangeKeyForm.resx => ChangePasswordForm.resx} (100%) diff --git a/Crypto Notepad/Crypto Notepad.csproj b/Crypto Notepad/Crypto Notepad.csproj index 95b60fe..271ef94 100644 --- a/Crypto Notepad/Crypto Notepad.csproj +++ b/Crypto Notepad/Crypto Notepad.csproj @@ -111,11 +111,11 @@ AboutFrom.cs - + Form - - ChangeKeyForm.cs + + ChangePasswordForm.cs @@ -165,8 +165,8 @@ AboutFrom.cs - - ChangeKeyForm.cs + + ChangePasswordForm.cs MainForm.cs diff --git a/Crypto Notepad/Forms/ChangeKeyForm.Designer.cs b/Crypto Notepad/Forms/ChangePasswordForm.Designer.cs similarity index 98% rename from Crypto Notepad/Forms/ChangeKeyForm.Designer.cs rename to Crypto Notepad/Forms/ChangePasswordForm.Designer.cs index 8273f75..2d3c754 100644 --- a/Crypto Notepad/Forms/ChangeKeyForm.Designer.cs +++ b/Crypto Notepad/Forms/ChangePasswordForm.Designer.cs @@ -1,6 +1,6 @@ namespace Crypto_Notepad { - partial class ChangeKeyForm + partial class ChangePasswordForm { /// /// 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(ChangeKeyForm)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChangePasswordForm)); this.acceptButton = new System.Windows.Forms.Button(); this.mainPanel = new System.Windows.Forms.Panel(); this.lockPictureBox = new System.Windows.Forms.PictureBox(); @@ -159,7 +159,7 @@ private void InitializeComponent() this.passwordGeneratorButton.UseVisualStyleBackColor = true; this.passwordGeneratorButton.Click += new System.EventHandler(this.PasswordGeneratorButton_Click); // - // ChangeKeyForm + // ChangePasswordForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -173,7 +173,7 @@ private void InitializeComponent() this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; - this.Name = "ChangeKeyForm"; + this.Name = "ChangePasswordForm"; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Change Password"; diff --git a/Crypto Notepad/Forms/ChangeKeyForm.cs b/Crypto Notepad/Forms/ChangePasswordForm.cs similarity index 100% rename from Crypto Notepad/Forms/ChangeKeyForm.cs rename to Crypto Notepad/Forms/ChangePasswordForm.cs diff --git a/Crypto Notepad/Forms/ChangeKeyForm.resx b/Crypto Notepad/Forms/ChangePasswordForm.resx similarity index 100% rename from Crypto Notepad/Forms/ChangeKeyForm.resx rename to Crypto Notepad/Forms/ChangePasswordForm.resx diff --git a/Crypto Notepad/Forms/MainForm.Designer.cs b/Crypto Notepad/Forms/MainForm.Designer.cs index 0119bae..e9da065 100644 --- a/Crypto Notepad/Forms/MainForm.Designer.cs +++ b/Crypto Notepad/Forms/MainForm.Designer.cs @@ -61,7 +61,7 @@ public void InitializeComponent() this.toolsMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.alwaysOnTopMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.passwordGeneratorMainMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.changeKeyMainMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.changePasswordMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.lockMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.settingsMainMenu = new System.Windows.Forms.ToolStripMenuItem(); this.helpMainMenu = new System.Windows.Forms.ToolStripMenuItem(); @@ -96,7 +96,7 @@ public void InitializeComponent() this.closeToolbarButton = new System.Windows.Forms.Label(); this.lockToolbarButton = new System.Windows.Forms.PictureBox(); this.newToolbarButton = new System.Windows.Forms.PictureBox(); - this.changeKeyToolbarButton = new System.Windows.Forms.PictureBox(); + this.changePasswordToolbarButton = new System.Windows.Forms.PictureBox(); this.openToolbarButton = new System.Windows.Forms.PictureBox(); this.pasteToolbarButton = new System.Windows.Forms.PictureBox(); this.saveToolbarButton = new System.Windows.Forms.PictureBox(); @@ -132,7 +132,7 @@ public void InitializeComponent() this.toolbarPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.lockToolbarButton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.newToolbarButton)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.changeKeyToolbarButton)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.changePasswordToolbarButton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.openToolbarButton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pasteToolbarButton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.saveToolbarButton)).BeginInit(); @@ -399,7 +399,7 @@ public void InitializeComponent() this.toolsMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.alwaysOnTopMainMenu, this.passwordGeneratorMainMenu, - this.changeKeyMainMenu, + this.changePasswordMainMenu, this.lockMainMenu, this.settingsMainMenu}); this.toolsMainMenu.ForeColor = System.Drawing.SystemColors.ControlText; @@ -413,7 +413,7 @@ public void InitializeComponent() this.alwaysOnTopMainMenu.CheckOnClick = true; this.alwaysOnTopMainMenu.Name = "alwaysOnTopMainMenu"; this.alwaysOnTopMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T))); - this.alwaysOnTopMainMenu.Size = new System.Drawing.Size(261, 22); + this.alwaysOnTopMainMenu.Size = new System.Drawing.Size(232, 22); this.alwaysOnTopMainMenu.Text = "Always on Top"; this.alwaysOnTopMainMenu.Click += new System.EventHandler(this.AlwaysOnTopMainMenu_Click); // @@ -421,24 +421,24 @@ public void InitializeComponent() // this.passwordGeneratorMainMenu.Name = "passwordGeneratorMainMenu"; this.passwordGeneratorMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.passwordGeneratorMainMenu.Size = new System.Drawing.Size(261, 22); + this.passwordGeneratorMainMenu.Size = new System.Drawing.Size(232, 22); this.passwordGeneratorMainMenu.Text = "Password Generator"; this.passwordGeneratorMainMenu.Click += new System.EventHandler(this.PasswordGeneratorMainMenu_Click); // - // changeKeyMainMenu + // changePasswordMainMenu // - this.changeKeyMainMenu.Name = "changeKeyMainMenu"; - this.changeKeyMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) + this.changePasswordMainMenu.Name = "changePasswordMainMenu"; + this.changePasswordMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) | System.Windows.Forms.Keys.K))); - this.changeKeyMainMenu.Size = new System.Drawing.Size(232, 22); - this.changeKeyMainMenu.Text = "Change Password"; - this.changeKeyMainMenu.Click += new System.EventHandler(this.ChangeKeyMainMenu_Click); + this.changePasswordMainMenu.Size = new System.Drawing.Size(232, 22); + this.changePasswordMainMenu.Text = "Change Password"; + this.changePasswordMainMenu.Click += new System.EventHandler(this.ChangePasswordMainMenu_Click); // // lockMainMenu // this.lockMainMenu.Name = "lockMainMenu"; this.lockMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); - this.lockMainMenu.Size = new System.Drawing.Size(261, 22); + this.lockMainMenu.Size = new System.Drawing.Size(232, 22); this.lockMainMenu.Text = "Lock"; this.lockMainMenu.Click += new System.EventHandler(this.LockMainMenu_Click); // @@ -448,7 +448,7 @@ public void InitializeComponent() this.settingsMainMenu.ShortcutKeyDisplayString = ""; this.settingsMainMenu.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) | System.Windows.Forms.Keys.S))); - this.settingsMainMenu.Size = new System.Drawing.Size(261, 22); + this.settingsMainMenu.Size = new System.Drawing.Size(232, 22); this.settingsMainMenu.Text = "Settings"; this.settingsMainMenu.Click += new System.EventHandler(this.SettingsMainMenu_Click); // @@ -757,7 +757,7 @@ public void InitializeComponent() this.toolbarPanel.Controls.Add(this.closeToolbarButton, 13, 0); this.toolbarPanel.Controls.Add(this.lockToolbarButton, 9, 0); this.toolbarPanel.Controls.Add(this.newToolbarButton, 0, 0); - this.toolbarPanel.Controls.Add(this.changeKeyToolbarButton, 8, 0); + this.toolbarPanel.Controls.Add(this.changePasswordToolbarButton, 8, 0); this.toolbarPanel.Controls.Add(this.openToolbarButton, 1, 0); this.toolbarPanel.Controls.Add(this.pasteToolbarButton, 7, 0); this.toolbarPanel.Controls.Add(this.saveToolbarButton, 2, 0); @@ -822,19 +822,19 @@ public void InitializeComponent() this.toolTip.SetToolTip(this.newToolbarButton, "New"); this.newToolbarButton.Click += new System.EventHandler(this.NewToolbarButton_Click); // - // changeKeyToolbarButton + // changePasswordToolbarButton // - this.changeKeyToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand; - this.changeKeyToolbarButton.Image = ((System.Drawing.Image)(resources.GetObject("changeKeyToolbarButton.Image"))); - this.changeKeyToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.changeKeyToolbarButton.Location = new System.Drawing.Point(195, 3); - this.changeKeyToolbarButton.Name = "changeKeyToolbarButton"; - this.changeKeyToolbarButton.Size = new System.Drawing.Size(16, 16); - this.changeKeyToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.changeKeyToolbarButton.TabIndex = 15; - this.changeKeyToolbarButton.TabStop = false; - this.toolTip.SetToolTip(this.changeKeyToolbarButton, "Change password"); - this.changeKeyToolbarButton.Click += new System.EventHandler(this.ChangeKeyToolbarButton_Click); + this.changePasswordToolbarButton.Cursor = System.Windows.Forms.Cursors.Hand; + this.changePasswordToolbarButton.Image = ((System.Drawing.Image)(resources.GetObject("changePasswordToolbarButton.Image"))); + this.changePasswordToolbarButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.changePasswordToolbarButton.Location = new System.Drawing.Point(195, 3); + this.changePasswordToolbarButton.Name = "changePasswordToolbarButton"; + this.changePasswordToolbarButton.Size = new System.Drawing.Size(16, 16); + this.changePasswordToolbarButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.changePasswordToolbarButton.TabIndex = 15; + this.changePasswordToolbarButton.TabStop = false; + this.toolTip.SetToolTip(this.changePasswordToolbarButton, "Change password"); + this.changePasswordToolbarButton.Click += new System.EventHandler(this.ChangePasswordToolbarButton_Click); // // openToolbarButton // @@ -1238,7 +1238,7 @@ public void InitializeComponent() this.toolbarPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.lockToolbarButton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.newToolbarButton)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.changeKeyToolbarButton)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.changePasswordToolbarButton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.openToolbarButton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pasteToolbarButton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.saveToolbarButton)).EndInit(); @@ -1298,7 +1298,7 @@ public void InitializeComponent() protected internal System.Windows.Forms.ToolStripMenuItem rightToLeftContextMenu; protected internal System.Windows.Forms.ToolStripMenuItem clearContextMenu; protected internal System.Windows.Forms.ToolStripSeparator mainMenuSeparator1; - protected internal System.Windows.Forms.ToolStripMenuItem changeKeyMainMenu; + protected internal System.Windows.Forms.ToolStripMenuItem changePasswordMainMenu; protected internal System.Windows.Forms.ToolStripMenuItem checkForUpdatesMainMenu; protected internal System.Windows.Forms.ToolStripMenuItem documentationMainMenu; protected internal System.Windows.Forms.ToolStripMenuItem settingsMainMenu; @@ -1311,7 +1311,7 @@ public void InitializeComponent() protected internal System.Windows.Forms.PictureBox cutToolbarButton; protected internal System.Windows.Forms.PictureBox copyToolbarButton; protected internal System.Windows.Forms.PictureBox pasteToolbarButton; - protected internal System.Windows.Forms.PictureBox changeKeyToolbarButton; + protected internal System.Windows.Forms.PictureBox changePasswordToolbarButton; protected internal System.Windows.Forms.PictureBox settingsToolbarButton; protected internal System.Windows.Forms.PictureBox lockToolbarButton; protected internal System.Windows.Forms.ToolStripMenuItem lockMainMenu; diff --git a/Crypto Notepad/Forms/MainForm.cs b/Crypto Notepad/Forms/MainForm.cs index ee1041c..887269c 100644 --- a/Crypto Notepad/Forms/MainForm.cs +++ b/Crypto Notepad/Forms/MainForm.cs @@ -592,7 +592,7 @@ public void MenuIcons(bool menuIcons) selectAllMainMenu.Image = Resources.selection_input; wordWrapMainMenu.Image = Resources.wrap_option; clearMainMenu.Image = Resources.document; - changeKeyMainMenu.Image = Resources.key; + changePasswordMainMenu.Image = Resources.key; lockMainMenu.Image = Resources.lock_warning; settingsMainMenu.Image = Resources.gear; documentationMainMenu.Image = Resources.document_text; @@ -627,7 +627,7 @@ public void ToolbarIcons(bool oldIcons) cutToolbarButton.Image = Resources.old_cut_red; copyToolbarButton.Image = Resources.old_page_white_copy; pasteToolbarButton.Image = Resources.old_paste_plain; - changeKeyToolbarButton.Image = Resources.old_page_white_key; + changePasswordToolbarButton.Image = Resources.old_page_white_key; lockToolbarButton.Image = Resources.old_lock; settingsToolbarButton.Image = Resources.old_setting_tools; alwaysOnTopToolbarButton.Image = Resources.old_application_double; @@ -642,7 +642,7 @@ public void ToolbarIcons(bool oldIcons) cutToolbarButton.Image = Resources.scissors; copyToolbarButton.Image = Resources.document_copy; pasteToolbarButton.Image = Resources.clipboard; - changeKeyToolbarButton.Image = Resources.key; + changePasswordToolbarButton.Image = Resources.key; lockToolbarButton.Image = Resources.lock_warning; settingsToolbarButton.Image = Resources.gear; alwaysOnTopToolbarButton.Image = Resources.applications_blue; @@ -1224,7 +1224,7 @@ private void DeleteFileToolStripMenuItem_Click(object sender, EventArgs e) PublicVar.password.Set(null); fileLocationToolbarButton.Enabled = false; deleteFileToolbarButton.Enabled = false; - changeKeyToolbarButton.Enabled = false; + changePasswordToolbarButton.Enabled = false; lockToolbarButton.Enabled = false; filePath = ""; PublicVar.openFileName = ""; @@ -1395,20 +1395,20 @@ private void ToolsMainMenu_DropDownOpened(object sender, EventArgs e) { if (string.IsNullOrEmpty(PublicVar.password.Get())) { - changeKeyMainMenu.Enabled = false; + changePasswordMainMenu.Enabled = false; lockMainMenu.Enabled = false; } else { - changeKeyMainMenu.Enabled = true; + changePasswordMainMenu.Enabled = true; lockMainMenu.Enabled = true; } } - private void ChangeKeyMainMenu_Click(object sender, EventArgs e) + private void ChangePasswordMainMenu_Click(object sender, EventArgs e) { - ChangeKeyForm changeKeyForm = new ChangeKeyForm(); - changeKeyForm.ShowDialog(this); + ChangePasswordForm changePasswordForm = new ChangePasswordForm(); + changePasswordForm.ShowDialog(this); } private async void LockMainMenu_Click(object sender, EventArgs e) @@ -1590,9 +1590,9 @@ private void PasteToolbarButton_Click(object sender, EventArgs e) PasteMainMenu_Click(this, new EventArgs()); } - private void ChangeKeyToolbarButton_Click(object sender, EventArgs e) + private void ChangePasswordToolbarButton_Click(object sender, EventArgs e) { - ChangeKeyMainMenu_Click(this, new EventArgs()); + ChangePasswordMainMenu_Click(this, new EventArgs()); } private void SettingsToolbarButton_Click(object sender, EventArgs e) @@ -1656,14 +1656,14 @@ private void ToolbarPanel_MouseEnter(object sender, EventArgs e) { fileLocationToolbarButton.Enabled = false; deleteFileToolbarButton.Enabled = false; - changeKeyToolbarButton.Enabled = false; + changePasswordToolbarButton.Enabled = false; lockToolbarButton.Enabled = false; } else { fileLocationToolbarButton.Enabled = true; deleteFileToolbarButton.Enabled = true; - changeKeyToolbarButton.Enabled = true; + changePasswordToolbarButton.Enabled = true; lockToolbarButton.Enabled = true; } } diff --git a/Crypto Notepad/Forms/MainForm.resx b/Crypto Notepad/Forms/MainForm.resx index b9cbf15..099bff6 100644 --- a/Crypto Notepad/Forms/MainForm.resx +++ b/Crypto Notepad/Forms/MainForm.resx @@ -163,7 +163,7 @@ ls8mjzluOrP5k2QAWNYAQ/B729ITVjwAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIfSURBVDhPfYxdSJNhFMfPu/VJhd4E5UVEETFyk+gq