From 8e545fc05f4d389808de766b1f8f4585edea9861 Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Tue, 23 Mar 2021 13:41:43 +0800 Subject: [PATCH] Remove Reload Mode MenuToolStrip --- Netch/Forms/MainForm.Designer.cs | 112 +++++++++++++------------- Netch/Forms/MainForm.cs | 22 +----- Netch/Forms/MainForm.resx | 132 +++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 75 deletions(-) create mode 100644 Netch/Forms/MainForm.resx diff --git a/Netch/Forms/MainForm.Designer.cs b/Netch/Forms/MainForm.Designer.cs index 9c323268b5..d8a8fa071f 100644 --- a/Netch/Forms/MainForm.Designer.cs +++ b/Netch/Forms/MainForm.Designer.cs @@ -29,14 +29,12 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.MenuStrip = new System.Windows.Forms.MenuStrip(); this.ServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ImportServersFromClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CreateProcessModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CreateRouteTableRuleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ReloadModesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SubscribeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ManageSubscribeLinksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UpdateServersFromSubscribeLinksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -95,13 +93,13 @@ private void InitializeComponent() this.ConfigurationGroupBox.SuspendLayout(); this.configLayoutPanel.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize) (this.EditServerPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize) (this.CopyLinkPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize) (this.DeleteServerPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize) (this.SpeedPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.EditServerPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CopyLinkPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.DeleteServerPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.SpeedPictureBox)).BeginInit(); this.tableLayoutPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize) (this.EditModePictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize) (this.DeleteModePictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.EditModePictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.DeleteModePictureBox)).BeginInit(); this.StatusStrip.SuspendLayout(); this.NotifyMenu.SuspendLayout(); this.ProfileGroupBox.SuspendLayout(); @@ -113,10 +111,16 @@ private void InitializeComponent() // this.MenuStrip.BackColor = System.Drawing.SystemColors.Control; this.MenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); - this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] - { - this.ServerToolStripMenuItem, this.ModeToolStripMenuItem, this.SubscribeToolStripMenuItem, this.OptionsToolStripMenuItem, this.HelpToolStripMenuItem, this.exitToolStripMenuItem, this.AboutToolStripButton, this.NewVersionLabel, this.VersionLabel - }); + this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ServerToolStripMenuItem, + this.ModeToolStripMenuItem, + this.SubscribeToolStripMenuItem, + this.OptionsToolStripMenuItem, + this.HelpToolStripMenuItem, + this.exitToolStripMenuItem, + this.AboutToolStripButton, + this.NewVersionLabel, + this.VersionLabel}); this.MenuStrip.Location = new System.Drawing.Point(0, 0); this.MenuStrip.Name = "MenuStrip"; this.MenuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; @@ -125,10 +129,8 @@ private void InitializeComponent() // // ServerToolStripMenuItem // - this.ServerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] - { - this.ImportServersFromClipboardToolStripMenuItem - }); + this.ServerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ImportServersFromClipboardToolStripMenuItem}); this.ServerToolStripMenuItem.Margin = new System.Windows.Forms.Padding(3, 0, 0, 1); this.ServerToolStripMenuItem.Name = "ServerToolStripMenuItem"; this.ServerToolStripMenuItem.Size = new System.Drawing.Size(57, 21); @@ -143,7 +145,9 @@ private void InitializeComponent() // // ModeToolStripMenuItem // - this.ModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.CreateProcessModeToolStripMenuItem, this.CreateRouteTableRuleToolStripMenuItem, this.ReloadModesToolStripMenuItem}); + this.ModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.CreateProcessModeToolStripMenuItem, + this.CreateRouteTableRuleToolStripMenuItem}); this.ModeToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); this.ModeToolStripMenuItem.Name = "ModeToolStripMenuItem"; this.ModeToolStripMenuItem.Size = new System.Drawing.Size(55, 21); @@ -163,19 +167,12 @@ private void InitializeComponent() this.CreateRouteTableRuleToolStripMenuItem.Text = "Create Route Table Rule"; this.CreateRouteTableRuleToolStripMenuItem.Click += new System.EventHandler(this.createRouteTableModeToolStripMenuItem_Click); // - // ReloadModesToolStripMenuItem - // - this.ReloadModesToolStripMenuItem.Name = "ReloadModesToolStripMenuItem"; - this.ReloadModesToolStripMenuItem.Size = new System.Drawing.Size(217, 22); - this.ReloadModesToolStripMenuItem.Text = "Reload Modes"; - this.ReloadModesToolStripMenuItem.Click += new System.EventHandler(this.ReloadModesToolStripMenuItem_Click); - // // SubscribeToolStripMenuItem // - this.SubscribeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] - { - this.ManageSubscribeLinksToolStripMenuItem, this.UpdateServersFromSubscribeLinksToolStripMenuItem, this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem - }); + this.SubscribeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ManageSubscribeLinksToolStripMenuItem, + this.UpdateServersFromSubscribeLinksToolStripMenuItem, + this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem}); this.SubscribeToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); this.SubscribeToolStripMenuItem.Name = "SubscribeToolStripMenuItem"; this.SubscribeToolStripMenuItem.Size = new System.Drawing.Size(77, 21); @@ -204,10 +201,15 @@ private void InitializeComponent() // // OptionsToolStripMenuItem // - this.OptionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] - { - this.OpenDirectoryToolStripMenuItem, this.CleanDNSCacheToolStripMenuItem, this.UpdateACLToolStripMenuItem, this.updateACLWithProxyToolStripMenuItem, this.updatePACToolStripMenuItem, this.UninstallServiceToolStripMenuItem, this.UninstallTapDriverToolStripMenuItem, this.removeNetchFirewallRulesToolStripMenuItem - }); + this.OptionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.OpenDirectoryToolStripMenuItem, + this.CleanDNSCacheToolStripMenuItem, + this.UpdateACLToolStripMenuItem, + this.updateACLWithProxyToolStripMenuItem, + this.updatePACToolStripMenuItem, + this.UninstallServiceToolStripMenuItem, + this.UninstallTapDriverToolStripMenuItem, + this.removeNetchFirewallRulesToolStripMenuItem}); this.OptionsToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); this.OptionsToolStripMenuItem.Name = "OptionsToolStripMenuItem"; this.OptionsToolStripMenuItem.Size = new System.Drawing.Size(66, 21); @@ -271,10 +273,9 @@ private void InitializeComponent() // // HelpToolStripMenuItem // - this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] - { - this.CheckForUpdatesToolStripMenuItem, this.fAQToolStripMenuItem - }); + this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.CheckForUpdatesToolStripMenuItem, + this.fAQToolStripMenuItem}); this.HelpToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; this.HelpToolStripMenuItem.Size = new System.Drawing.Size(47, 21); @@ -550,10 +551,14 @@ private void InitializeComponent() // StatusStrip // this.StatusStrip.ImageScalingSize = new System.Drawing.Size(20, 20); - this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] - { - this.StatusLabel, this.UsedBandwidthLabel, this.DownloadSpeedLabel, this.UploadSpeedLabel, this.blankToolStripStatusLabel, this.NatTypeStatusLabel, this.NatTypeStatusLightLabel - }); + this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.StatusLabel, + this.UsedBandwidthLabel, + this.DownloadSpeedLabel, + this.UploadSpeedLabel, + this.blankToolStripStatusLabel, + this.NatTypeStatusLabel, + this.NatTypeStatusLightLabel}); this.StatusStrip.Location = new System.Drawing.Point(0, 272); this.StatusStrip.Name = "StatusStrip"; this.StatusStrip.Size = new System.Drawing.Size(740, 22); @@ -616,7 +621,7 @@ private void InitializeComponent() // // ControlButton // - this.ControlButton.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.ControlButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.ControlButton.Location = new System.Drawing.Point(631, 3); this.ControlButton.Name = "ControlButton"; this.ControlButton.Size = new System.Drawing.Size(75, 27); @@ -635,10 +640,9 @@ private void InitializeComponent() // NotifyMenu // this.NotifyMenu.ImageScalingSize = new System.Drawing.Size(20, 20); - this.NotifyMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] - { - this.ShowMainFormToolStripButton, this.ExitToolStripButton - }); + this.NotifyMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ShowMainFormToolStripButton, + this.ExitToolStripButton}); this.NotifyMenu.Name = "NotifyMenu"; this.NotifyMenu.ShowItemToolTips = false; this.NotifyMenu.Size = new System.Drawing.Size(108, 48); @@ -659,7 +663,7 @@ private void InitializeComponent() // // SettingsButton // - this.SettingsButton.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.SettingsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.SettingsButton.Location = new System.Drawing.Point(1, 3); this.SettingsButton.Name = "SettingsButton"; this.SettingsButton.Size = new System.Drawing.Size(72, 27); @@ -728,7 +732,7 @@ private void InitializeComponent() this.Controls.Add(this.MenuStrip); this.Controls.Add(this.StatusStrip); this.Controls.Add(this.flowLayoutPanel1); - this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (134))); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MaximizeBox = false; @@ -744,13 +748,13 @@ private void InitializeComponent() this.configLayoutPanel.ResumeLayout(false); this.configLayoutPanel.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize) (this.EditServerPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize) (this.CopyLinkPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize) (this.DeleteServerPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize) (this.SpeedPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.EditServerPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CopyLinkPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.DeleteServerPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.SpeedPictureBox)).EndInit(); this.tableLayoutPanel3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize) (this.EditModePictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize) (this.DeleteModePictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.EditModePictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.DeleteModePictureBox)).EndInit(); this.StatusStrip.ResumeLayout(false); this.StatusStrip.PerformLayout(); this.NotifyMenu.ResumeLayout(false); @@ -760,6 +764,7 @@ private void InitializeComponent() this.ButtomControlContainerControl.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); + } private System.Windows.Forms.ToolStripMenuItem CreateRouteTableRuleToolStripMenuItem; @@ -798,7 +803,6 @@ private void InitializeComponent() private System.Windows.Forms.TableLayoutPanel ProfileTable; private System.Windows.Forms.ToolStripMenuItem UninstallTapDriverToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem CheckForUpdatesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem ReloadModesToolStripMenuItem; private System.Windows.Forms.ComboBox ServerComboBox; private System.Windows.Forms.Label ServerLabel; private System.Windows.Forms.ToolStripMenuItem ServerToolStripMenuItem; diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index 64801a4d3c..8a905f9b8e 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -266,25 +266,6 @@ private void CreateProcessModeToolStripButton_Click(object sender, EventArgs e) Show(); } - private void ReloadModesToolStripMenuItem_Click(object sender, EventArgs e) - { - Enabled = false; - try - { - ModeHelper.Load(); - LoadModes(); - NotifyTip(i18N.Translate("Modes have been reload")); - } - catch (Exception) - { - // ignored - } - finally - { - Enabled = true; - } - } - #endregion #region Subscription @@ -1126,8 +1107,7 @@ void StartDisableItems(bool enabled) // 启动需要禁用的控件 UninstallServiceToolStripMenuItem.Enabled = UpdateACLToolStripMenuItem.Enabled = updateACLWithProxyToolStripMenuItem.Enabled = updatePACToolStripMenuItem.Enabled = UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = - UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem.Enabled = UninstallTapDriverToolStripMenuItem.Enabled = - ReloadModesToolStripMenuItem.Enabled = enabled; + UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem.Enabled = UninstallTapDriverToolStripMenuItem.Enabled = enabled; } _state = value; diff --git a/Netch/Forms/MainForm.resx b/Netch/Forms/MainForm.resx new file mode 100644 index 0000000000..bc26c70217 --- /dev/null +++ b/Netch/Forms/MainForm.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 130, 17 + + + 246, 17 + + + 359, 17 + + \ No newline at end of file