Merge pull request #245 from LovelyWei/master

netchx · Feb 18, 2020 · 9f46d7a · 9f46d7a
2 parents 9b7f0b1 + df70603
commit 9f46d7a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 8 deletions.
diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs
@@ -1,4 +1,4 @@
-using Netch.Controllers;
+using Netch.Controllers;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -791,6 +791,26 @@ private void ControlButton_Click(object sender, EventArgs e)
                         // UsedBandwidthLabel.Visible = UploadSpeedLabel.Visible = DownloadSpeedLabel.Visible = true;
                         // MainController.pNFController.OnBandwidthUpdated += OnBandwidthUpdated;
 
+                        // 如果勾选启动后最小化
+                        if (Global.Settings.MinimizeWhenStarted)
+                        {
+                            WindowState = FormWindowState.Minimized;
+                            NotifyIcon.Visible = true;
+
+                            if (IsFirstOpened)
+                            {
+                                // 显示提示语
+                                NotifyIcon.ShowBalloonTip(5,
+                                UpdateChecker.Name,
+                                Utils.i18N.Translate("Netch is now minimized to the notification bar, double click this icon to restore."),
+                                ToolTipIcon.Info);
+
+                                IsFirstOpened = false;
+                            }
+
+                            Hide();
+                        }
+
                         ControlButton.Enabled = true;
                         ControlButton.Text = Utils.i18N.Translate("Stop");
 

diff --git a/Netch/Forms/SettingForm.Designer.cs b/Netch/Forms/SettingForm.Designer.cs
diff --git a/Netch/Forms/SettingForm.cs b/Netch/Forms/SettingForm.cs
@@ -57,6 +57,7 @@ private void SettingForm_Load(object sender, EventArgs e)
             StopWhenExitedCheckBox.Checked = Global.Settings.StopWhenExited;
             StartWhenOpenedCheckBox.Checked = Global.Settings.StartWhenOpened;
             CheckUpdateWhenOpenedCheckBox.Checked = Global.Settings.CheckUpdateWhenOpened;
+            MinimizeWhenStartedCheckBox.Checked = Global.Settings.MinimizeWhenStarted;
 
             Socks5PortTextBox.Text = Global.Settings.Socks5LocalPort.ToString();
             HTTPPortTextBox.Text = Global.Settings.HTTPLocalPort.ToString();
@@ -72,6 +73,7 @@ private void SettingForm_Load(object sender, EventArgs e)
             ExitWhenClosedCheckBox.Text = Utils.i18N.Translate(ExitWhenClosedCheckBox.Text);
             StopWhenExitedCheckBox.Text = Utils.i18N.Translate(StopWhenExitedCheckBox.Text);
             StartWhenOpenedCheckBox.Text = Utils.i18N.Translate(StartWhenOpenedCheckBox.Text);
+            MinimizeWhenStartedCheckBox.Text = Utils.i18N.Translate(MinimizeWhenStartedCheckBox.Text);
             CheckUpdateWhenOpenedCheckBox.Text = Utils.i18N.Translate(CheckUpdateWhenOpenedCheckBox.Text);
             ProfileCount_Label.Text = Utils.i18N.Translate(ProfileCount_Label.Text);
 
@@ -133,6 +135,7 @@ private void ControlButton_Click(object sender, EventArgs e)
             Global.Settings.StopWhenExited = StopWhenExitedCheckBox.Checked;
             Global.Settings.StartWhenOpened = StartWhenOpenedCheckBox.Checked;
             Global.Settings.CheckUpdateWhenOpened = CheckUpdateWhenOpenedCheckBox.Checked;
+            Global.Settings.MinimizeWhenStarted = MinimizeWhenStartedCheckBox.Checked;
 
             try
             {

diff --git a/Netch/Models/Setting.cs b/Netch/Models/Setting.cs
@@ -63,6 +63,11 @@ public class Setting
         /// </summary>
         public bool StartWhenOpened = false;
 
+        /// <summary>
+        ///     是否启动后自动最小化
+        /// </summary>
+        public bool MinimizeWhenStarted = false;
+
         /// <summary>
         ///		是否打开软件时检查更新
         /// </summary>

diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN
@@ -119,6 +119,7 @@
 
     "Settings": "设置",
     "Start when opened": "打开软件时启动加速",
+    "Minimize when started": "启动加速后隐藏",
     "Local Port": "本地端口",
     "Allow other Devices to connect": "允许其他设备连入",
     "Netmask": "子网掩码",