diff --git a/Netch/Forms/MainForm.Designer.cs b/Netch/Forms/MainForm.Designer.cs index 99cd7571..473ddea1 100644 --- a/Netch/Forms/MainForm.Designer.cs +++ b/Netch/Forms/MainForm.Designer.cs @@ -39,7 +39,6 @@ this.AddVMessServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AddTrojanServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CreateProcessModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ReloadModesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SubscribeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -52,11 +51,13 @@ this.updateACLWithProxyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UninstallServiceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.reinstallTapDriverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CheckForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AboutToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.VersionLabel = new System.Windows.Forms.ToolStripLabel(); - this.NewVersionLabel = new System.Windows.Forms.ToolStripLabel(); + this.fAQToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AboutToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.NewVersionLabel = new System.Windows.Forms.ToolStripLabel(); + this.VersionLabel = new System.Windows.Forms.ToolStripLabel(); this.ConfigurationGroupBox = new System.Windows.Forms.GroupBox(); this.configLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); this.ProfileLabel = new System.Windows.Forms.Label(); @@ -191,15 +192,6 @@ this.ModeToolStripMenuItem.Size = new System.Drawing.Size(55, 21); this.ModeToolStripMenuItem.Text = "Mode"; // - // HelpToolStripMenuItem - // - this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.CheckForUpdatesToolStripMenuItem}); - this.HelpToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1); - this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(55, 21); - this.HelpToolStripMenuItem.Text = "Help"; - // // CreateProcessModeToolStripMenuItem // this.CreateProcessModeToolStripMenuItem.Name = "CreateProcessModeToolStripMenuItem"; @@ -294,13 +286,37 @@ this.reinstallTapDriverToolStripMenuItem.Text = "Reinstall TUN/TAP driver"; this.reinstallTapDriverToolStripMenuItem.Click += new System.EventHandler(this.reinstallTapDriverToolStripMenuItem_Click); // + // HelpToolStripMenuItem + // + 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); + this.HelpToolStripMenuItem.Text = "Help"; + // // CheckForUpdatesToolStripMenuItem // this.CheckForUpdatesToolStripMenuItem.Name = "CheckForUpdatesToolStripMenuItem"; - this.CheckForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.CheckForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(183, 22); this.CheckForUpdatesToolStripMenuItem.Text = "Check for updates"; this.CheckForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.CheckForUpdatesToolStripMenuItem_Click); // + // fAQToolStripMenuItem + // + this.fAQToolStripMenuItem.Name = "fAQToolStripMenuItem"; + this.fAQToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.fAQToolStripMenuItem.Text = "FAQ"; + this.fAQToolStripMenuItem.Click += new System.EventHandler(this.fAQToolStripMenuItem_Click); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.Size = new System.Drawing.Size(40, 22); + this.exitToolStripMenuItem.Text = "Exit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // // AboutToolStripButton // this.AboutToolStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -316,13 +332,13 @@ this.NewVersionLabel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.NewVersionLabel.BackColor = System.Drawing.Color.Transparent; this.NewVersionLabel.ForeColor = System.Drawing.Color.Red; - this.NewVersionLabel.LinkColor = System.Drawing.Color.Red; this.NewVersionLabel.IsLink = true; - this.NewVersionLabel.Visible = false; this.NewVersionLabel.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline; + this.NewVersionLabel.LinkColor = System.Drawing.Color.Red; this.NewVersionLabel.Name = "NewVersionLabel"; - this.NewVersionLabel.Size = new System.Drawing.Size(26, 19); + this.NewVersionLabel.Size = new System.Drawing.Size(135, 19); this.NewVersionLabel.Text = "New version available"; + this.NewVersionLabel.Visible = false; this.NewVersionLabel.Click += new System.EventHandler(this.NewVersionLabel_Click); // // VersionLabel @@ -337,13 +353,6 @@ this.VersionLabel.Text = "xxx"; this.VersionLabel.Click += new System.EventHandler(this.VersionLabel_Click); // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(40, 22); - this.exitToolStripMenuItem.Text = "Exit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // // ConfigurationGroupBox // this.ConfigurationGroupBox.Controls.Add(this.configLayoutPanel); @@ -594,7 +603,7 @@ // blankToolStripStatusLabel // this.blankToolStripStatusLabel.Name = "blankToolStripStatusLabel"; - this.blankToolStripStatusLabel.Size = new System.Drawing.Size(268, 17); + this.blankToolStripStatusLabel.Size = new System.Drawing.Size(487, 17); this.blankToolStripStatusLabel.Spring = true; // // NatTypeStatusLabel @@ -800,7 +809,9 @@ private System.Windows.Forms.ToolStripLabel VersionLabel; private System.Windows.Forms.ToolStripStatusLabel NatTypeStatusLightLabel; private System.Windows.Forms.ToolStripStatusLabel blankToolStripStatusLabel; + private System.Windows.Forms.ToolStripMenuItem fAQToolStripMenuItem; #endregion + } } \ No newline at end of file diff --git a/Netch/Forms/MainForm.MenuStrip.cs b/Netch/Forms/MainForm.MenuStrip.cs index 97fdebc4..065f5a1e 100644 --- a/Netch/Forms/MainForm.MenuStrip.cs +++ b/Netch/Forms/MainForm.MenuStrip.cs @@ -391,6 +391,11 @@ namespace Netch.Forms Show(); } + private void fAQToolStripMenuItem_Click(object sender, EventArgs e) + { + Utils.Utils.Open($"https://netch.org/#/docs/zh-CN/faq"); + } + #endregion } } \ No newline at end of file diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index 713ca7ed..7cbde88c 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -189,6 +189,7 @@ namespace Netch.Forms CheckForUpdatesToolStripMenuItem.Text = i18N.Translate("Check for updates"); OpenDirectoryToolStripMenuItem.Text = i18N.Translate("Open Directory"); AboutToolStripButton.Text = i18N.Translate("About"); + fAQToolStripMenuItem.Text = i18N.Translate("FAQ"); NewVersionLabel.Text = i18N.Translate("New version available"); // VersionLabel.Text = i18N.Translate("xxx"); exitToolStripMenuItem.Text = i18N.Translate("Exit"); diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN index 5bf3349a..50856791 100644 --- a/Netch/Resources/zh-CN +++ b/Netch/Resources/zh-CN @@ -100,6 +100,7 @@ "Open Directory": "打开目录", "About": "关于", + "FAQ": "常见问题", "Telegram Channel": "Telegram 频道", "Sponsor": "赞助商", diff --git a/modes b/modes index 20239a17..f0327e93 160000 --- a/modes +++ b/modes @@ -1 +1 @@ -Subproject commit 20239a17aae4ce1de13a44f5b48156133cb9f879 +Subproject commit f0327e93991856680b4b5f84f02a5401467ceaf5