From 7987dfb81959c486c1b15c1d3787d2234aa7e134 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Tue, 24 May 2022 15:45:56 -0400 Subject: [PATCH] Rename 'liberate visible' menu items. Similar names are error-prone --- Source/AppScaffolding/AppScaffolding.csproj | 2 +- Source/LibationWinForms/Form1.Designer.cs | 36 +++++++++---------- Source/LibationWinForms/Form1.VisibleBooks.cs | 20 +++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index dfd70435..83008a3a 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -3,7 +3,7 @@ net6.0-windows - 7.8.0.1 + 7.8.1.1 diff --git a/Source/LibationWinForms/Form1.Designer.cs b/Source/LibationWinForms/Form1.Designer.cs index f4abad4f..c670c6d3 100644 --- a/Source/LibationWinForms/Form1.Designer.cs +++ b/Source/LibationWinForms/Form1.Designer.cs @@ -46,7 +46,7 @@ this.beginBookBackupsToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem(); this.beginPdfBackupsToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem(); this.convertAllM4bToMp3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.liberateVisible2ToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem(); + this.liberateVisibleToolStripMenuItem_LiberateMenu = new LibationWinForms.FormattableToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportLibraryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.quickFiltersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -55,7 +55,7 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.scanningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.visibleBooksToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem(); - this.liberateVisibleToolStripMenuItem = new LibationWinForms.FormattableToolStripMenuItem(); + this.liberateVisibleToolStripMenuItem_VisibleBooksMenu = new LibationWinForms.FormattableToolStripMenuItem(); this.replaceTagsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.setDownloadedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -215,7 +215,7 @@ this.beginBookBackupsToolStripMenuItem, this.beginPdfBackupsToolStripMenuItem, this.convertAllM4bToMp3ToolStripMenuItem, - this.liberateVisible2ToolStripMenuItem}); + this.liberateVisibleToolStripMenuItem_LiberateMenu}); this.liberateToolStripMenuItem.Name = "liberateToolStripMenuItem"; this.liberateToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.liberateToolStripMenuItem.Text = "&Liberate"; @@ -243,13 +243,13 @@ this.convertAllM4bToMp3ToolStripMenuItem.Text = "Convert all &M4b to Mp3 [Long-running]..."; this.convertAllM4bToMp3ToolStripMenuItem.Click += new System.EventHandler(this.convertAllM4bToMp3ToolStripMenuItem_Click); // - // liberateVisible2ToolStripMenuItem + // liberateVisibleToolStripMenuItem_LiberateMenu // - this.liberateVisible2ToolStripMenuItem.FormatText = "Liberate &Visible Books: {0}"; - this.liberateVisible2ToolStripMenuItem.Name = "liberateVisible2ToolStripMenuItem"; - this.liberateVisible2ToolStripMenuItem.Size = new System.Drawing.Size(293, 22); - this.liberateVisible2ToolStripMenuItem.Text = "Liberate &Visible Books: {0}"; - this.liberateVisible2ToolStripMenuItem.Click += new System.EventHandler(this.liberateVisible); + this.liberateVisibleToolStripMenuItem_LiberateMenu.FormatText = "Liberate &Visible Books: {0}"; + this.liberateVisibleToolStripMenuItem_LiberateMenu.Name = "liberateVisibleToolStripMenuItem_LiberateMenu"; + this.liberateVisibleToolStripMenuItem_LiberateMenu.Size = new System.Drawing.Size(293, 22); + this.liberateVisibleToolStripMenuItem_LiberateMenu.Text = "Liberate &Visible Books: {0}"; + this.liberateVisibleToolStripMenuItem_LiberateMenu.Click += new System.EventHandler(this.liberateVisible); // // exportToolStripMenuItem // @@ -310,7 +310,7 @@ // visibleBooksToolStripMenuItem // this.visibleBooksToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.liberateVisibleToolStripMenuItem, + this.liberateVisibleToolStripMenuItem_VisibleBooksMenu, this.replaceTagsToolStripMenuItem, this.setDownloadedToolStripMenuItem, this.removeToolStripMenuItem}); @@ -319,13 +319,13 @@ this.visibleBooksToolStripMenuItem.Size = new System.Drawing.Size(108, 20); this.visibleBooksToolStripMenuItem.Text = "&Visible Books: {0}"; // - // liberateVisibleToolStripMenuItem + // liberateVisibleToolStripMenuItem_VisibleBooksMenu // - this.liberateVisibleToolStripMenuItem.FormatText = "&Liberate: {0}"; - this.liberateVisibleToolStripMenuItem.Name = "liberateVisibleToolStripMenuItem"; - this.liberateVisibleToolStripMenuItem.Size = new System.Drawing.Size(209, 22); - this.liberateVisibleToolStripMenuItem.Text = "&Liberate: {0}"; - this.liberateVisibleToolStripMenuItem.Click += new System.EventHandler(this.liberateVisible); + this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.FormatText = "&Liberate: {0}"; + this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Name = "liberateVisibleToolStripMenuItem_VisibleBooksMenu"; + this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Size = new System.Drawing.Size(209, 22); + this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Text = "&Liberate: {0}"; + this.liberateVisibleToolStripMenuItem_VisibleBooksMenu.Click += new System.EventHandler(this.liberateVisible); // // replaceTagsToolStripMenuItem // @@ -574,11 +574,11 @@ private System.Windows.Forms.ToolStripMenuItem scanningToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem autoScanLibraryToolStripMenuItem; private LibationWinForms.FormattableToolStripMenuItem visibleBooksToolStripMenuItem; - private LibationWinForms.FormattableToolStripMenuItem liberateVisibleToolStripMenuItem; + private LibationWinForms.FormattableToolStripMenuItem liberateVisibleToolStripMenuItem_VisibleBooksMenu; private System.Windows.Forms.ToolStripMenuItem replaceTagsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem setDownloadedToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem removeToolStripMenuItem; - private LibationWinForms.FormattableToolStripMenuItem liberateVisible2ToolStripMenuItem; + private LibationWinForms.FormattableToolStripMenuItem liberateVisibleToolStripMenuItem_LiberateMenu; private System.Windows.Forms.SplitContainer splitContainer1; private LibationWinForms.ProcessQueue.ProcessQueueControl processBookQueue1; private System.Windows.Forms.Panel panel1; diff --git a/Source/LibationWinForms/Form1.VisibleBooks.cs b/Source/LibationWinForms/Form1.VisibleBooks.cs index a17effa7..5f29172d 100644 --- a/Source/LibationWinForms/Form1.VisibleBooks.cs +++ b/Source/LibationWinForms/Form1.VisibleBooks.cs @@ -14,8 +14,8 @@ namespace LibationWinForms { // init formattable visibleCountLbl.Format(0); - liberateVisibleToolStripMenuItem.Format(0); - liberateVisible2ToolStripMenuItem.Format(0); + liberateVisibleToolStripMenuItem_VisibleBooksMenu.Format(0); + liberateVisibleToolStripMenuItem_LiberateMenu.Format(0); // top menu strip visibleBooksToolStripMenuItem.Format(0); @@ -31,19 +31,19 @@ namespace LibationWinForms { if (notLiberated > 0) { - liberateVisibleToolStripMenuItem.Format(notLiberated); - liberateVisibleToolStripMenuItem.Enabled = true; + liberateVisibleToolStripMenuItem_VisibleBooksMenu.Format(notLiberated); + liberateVisibleToolStripMenuItem_VisibleBooksMenu.Enabled = true; - liberateVisible2ToolStripMenuItem.Format(notLiberated); - liberateVisible2ToolStripMenuItem.Enabled = true; + liberateVisibleToolStripMenuItem_LiberateMenu.Format(notLiberated); + liberateVisibleToolStripMenuItem_LiberateMenu.Enabled = true; } else { - liberateVisibleToolStripMenuItem.Text = "All visible books are liberated"; - liberateVisibleToolStripMenuItem.Enabled = false; + liberateVisibleToolStripMenuItem_VisibleBooksMenu.Text = "All visible books are liberated"; + liberateVisibleToolStripMenuItem_VisibleBooksMenu.Enabled = false; - liberateVisible2ToolStripMenuItem.Text = "All visible books are liberated"; - liberateVisible2ToolStripMenuItem.Enabled = false; + liberateVisibleToolStripMenuItem_LiberateMenu.Text = "All visible books are liberated"; + liberateVisibleToolStripMenuItem_LiberateMenu.Enabled = false; } }); }