From b228388c41f7125d24c7be71706344f40a608004 Mon Sep 17 00:00:00 2001 From: Ray Date: Sun, 23 Aug 2020 12:30:22 +0100 Subject: [PATCH] Fixed: toggle options menu on app state --- MainForm.Designer.cs | 13 +++++++------ MainForm.cs | 3 +++ Properties/Resources.Designer.cs | 2 +- Properties/Resources.resx | 2 +- bomg.csproj | 4 +++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index cb220a7..ee63ad6 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -204,6 +204,7 @@ namespace bzit.bomg this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Padding = new System.Windows.Forms.Padding(5, 0, 1, 0); this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.toolStrip1.ShowItemToolTips = false; this.toolStrip1.Size = new System.Drawing.Size(304, 25); this.toolStrip1.TabIndex = 25; this.toolStrip1.Text = "toolStrip1"; @@ -330,27 +331,27 @@ namespace bzit.bomg // expandAllViewMenuItem // this.expandAllViewMenuItem.Name = "expandAllViewMenuItem"; - this.expandAllViewMenuItem.Size = new System.Drawing.Size(205, 22); + this.expandAllViewMenuItem.Size = new System.Drawing.Size(204, 22); this.expandAllViewMenuItem.Text = "&Expand All"; this.expandAllViewMenuItem.Click += new System.EventHandler(this.viewExpandAllMenuItem_Click); // // collapseAllViewMenuItem // this.collapseAllViewMenuItem.Name = "collapseAllViewMenuItem"; - this.collapseAllViewMenuItem.Size = new System.Drawing.Size(205, 22); + this.collapseAllViewMenuItem.Size = new System.Drawing.Size(204, 22); this.collapseAllViewMenuItem.Text = "&Collapse All"; this.collapseAllViewMenuItem.Click += new System.EventHandler(this.viewCollapseAllMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(202, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(201, 6); // // alwaysOnTopToolStripMenuItem1 // this.alwaysOnTopToolStripMenuItem1.Name = "alwaysOnTopToolStripMenuItem1"; this.alwaysOnTopToolStripMenuItem1.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F11))); - this.alwaysOnTopToolStripMenuItem1.Size = new System.Drawing.Size(205, 22); + this.alwaysOnTopToolStripMenuItem1.Size = new System.Drawing.Size(204, 22); this.alwaysOnTopToolStripMenuItem1.Text = "Always On &Top"; this.alwaysOnTopToolStripMenuItem1.Click += new System.EventHandler(this.viewAlwaysOnTopMenuItem_Click); // @@ -362,7 +363,7 @@ namespace bzit.bomg this.toolStripDropDownButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton4.Name = "toolStripDropDownButton4"; this.toolStripDropDownButton4.ShowDropDownArrow = false; - this.toolStripDropDownButton4.Size = new System.Drawing.Size(39, 22); + this.toolStripDropDownButton4.Size = new System.Drawing.Size(38, 22); this.toolStripDropDownButton4.Text = "&Tools"; // // optionsToolMenuItem @@ -370,7 +371,7 @@ namespace bzit.bomg this.optionsToolMenuItem.Image = global::bzit.bomg.Properties.Resources.settings; this.optionsToolMenuItem.Name = "optionsToolMenuItem"; this.optionsToolMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F12; - this.optionsToolMenuItem.Size = new System.Drawing.Size(180, 22); + this.optionsToolMenuItem.Size = new System.Drawing.Size(141, 22); this.optionsToolMenuItem.Text = "&Options"; this.optionsToolMenuItem.Click += new System.EventHandler(this.toolsOptionsMenuItem_Click); // diff --git a/MainForm.cs b/MainForm.cs index c91bc83..0ed09a3 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -222,6 +222,7 @@ namespace bzit.bomg saveAsFileMenuItem.Enabled = false; findEditMenuItem.Enabled = false; expandAllViewMenuItem.Enabled = collapseAllViewMenuItem.Enabled = false; + optionsToolMenuItem.Enabled = false; break; case AppMode.Open: @@ -230,6 +231,7 @@ namespace bzit.bomg saveAsFileMenuItem.Enabled = true; findEditMenuItem.Enabled = true; expandAllViewMenuItem.Enabled = collapseAllViewMenuItem.Enabled = true; + optionsToolMenuItem.Enabled = true; break; case AppMode.New: @@ -240,6 +242,7 @@ namespace bzit.bomg saveAsFileMenuItem.Enabled = true; findEditMenuItem.Enabled = true; expandAllViewMenuItem.Enabled = collapseAllViewMenuItem.Enabled = true; + optionsToolMenuItem.Enabled = true; break; } diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 01f1519..439d428 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -258,7 +258,7 @@ namespace bzit.bomg.Properties { } /// - /// Looks up a localized string similar to https://www.hiimray.co.uk. + /// Looks up a localized string similar to https://www.hiimray.co.uk/software-bookmark-manager. /// internal static string url_about { get { diff --git a/Properties/Resources.resx b/Properties/Resources.resx index d538afe..98fe4e7 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -179,7 +179,7 @@ ..\Resources\2\trash-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - https://www.hiimray.co.uk + https://www.hiimray.co.uk/software-bookmark-manager https://www.hiimray.co.uk/software-bookmark-manager diff --git a/bomg.csproj b/bomg.csproj index 4e0cd30..aa0b82b 100644 --- a/bomg.csproj +++ b/bomg.csproj @@ -77,6 +77,9 @@ bin\Release\ false + + false + packages\HtmlAgilityPack.1.11.24\lib\Net45\HtmlAgilityPack.dll @@ -239,7 +242,6 @@ MainForm.cs - SettingsSingleFileGenerator