From d443c6d31173da41ca31f302c64c144f4b6e84e4 Mon Sep 17 00:00:00 2001
From: Amazing_DM <amazingdmdd@gmail.com>
Date: Fri, 6 Mar 2020 13:03:37 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=E5=90=AF=E5=8A=A8=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Netch/Controllers/DNSController.cs    | 4 +++-
 Netch/Controllers/NTTController.cs    | 1 +
 Netch/Controllers/SSController.cs     | 4 +++-
 Netch/Controllers/SSRController.cs    | 4 +++-
 Netch/Controllers/TUNTAPController.cs | 4 +++-
 Netch/Controllers/VMessController.cs  | 4 +++-
 Netch/Forms/MainForm.cs               | 9 +++++++++
 Netch/Resources/zh-CN                 | 7 +++++++
 8 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Netch/Controllers/DNSController.cs b/Netch/Controllers/DNSController.cs
index 8f9cbb3c..67643a3d 100644
--- a/Netch/Controllers/DNSController.cs
+++ b/Netch/Controllers/DNSController.cs
@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Net;
 
 namespace Netch.Controllers
@@ -9,6 +10,7 @@ namespace Netch.Controllers
 
         public bool Start()
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting LocalDns service")}");
             try
             {
                 _ = Server.Listen(new IPEndPoint(IPAddress.IPv6Any, 53));
diff --git a/Netch/Controllers/NTTController.cs b/Netch/Controllers/NTTController.cs
index 07214ec4..9ddc5ba8 100644
--- a/Netch/Controllers/NTTController.cs
+++ b/Netch/Controllers/NTTController.cs
@@ -24,6 +24,7 @@ namespace Netch.Controllers
         /// <returns></returns>
         public (bool, string, string, string) Start()
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting NatTester")}");
             try
             {
                 if (!File.Exists("bin\\NTT.exe"))
diff --git a/Netch/Controllers/SSController.cs b/Netch/Controllers/SSController.cs
index 8ec5fc0a..665ec450 100644
--- a/Netch/Controllers/SSController.cs
+++ b/Netch/Controllers/SSController.cs
@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -25,6 +26,7 @@ namespace Netch.Controllers
         /// <returns>是否启动成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Shadowsocks")}");
             if (!File.Exists("bin\\Shadowsocks.exe"))
             {
                 return false;
diff --git a/Netch/Controllers/SSRController.cs b/Netch/Controllers/SSRController.cs
index f8dc4178..b5b270a1 100644
--- a/Netch/Controllers/SSRController.cs
+++ b/Netch/Controllers/SSRController.cs
@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -25,6 +26,7 @@ namespace Netch.Controllers
         /// <returns>是否启动成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Shadowsocks")}");
             if (!File.Exists("bin\\ShadowsocksR.exe"))
             {
                 return false;
diff --git a/Netch/Controllers/TUNTAPController.cs b/Netch/Controllers/TUNTAPController.cs
index 82565c52..4ca092ba 100644
--- a/Netch/Controllers/TUNTAPController.cs
+++ b/Netch/Controllers/TUNTAPController.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using System.Threading;
-
+using Netch.Forms;
 using Netch.Utils;
 
 namespace Netch.Controllers
@@ -63,6 +63,7 @@ namespace Netch.Controllers
         /// </summary>
         public bool SetupBypass()
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("SetupBypass")}");
             // 让服务器 IP 走直连
             foreach (var address in ServerAddresses)
             {
@@ -242,6 +243,7 @@ namespace Netch.Controllers
         /// <returns>是否成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting Tap")}");
             foreach (var proc in Process.GetProcessesByName("tun2socks"))
             {
                 try
diff --git a/Netch/Controllers/VMessController.cs b/Netch/Controllers/VMessController.cs
index 0da2d177..82e11607 100644
--- a/Netch/Controllers/VMessController.cs
+++ b/Netch/Controllers/VMessController.cs
@@ -1,4 +1,5 @@
-using System;
+using Netch.Forms;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -26,6 +27,7 @@ namespace Netch.Controllers
         /// <returns>是否启动成功</returns>
         public bool Start(Models.Server server, Models.Mode mode)
         {
+            MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Starting V2ray")}");
             if (!File.Exists("bin\\v2ray.exe") || !File.Exists("bin\\v2ctl.exe"))
             {
                 return false;
diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs
index 1f0bcf3c..5320a73e 100644
--- a/Netch/Forms/MainForm.cs
+++ b/Netch/Forms/MainForm.cs
@@ -41,6 +41,11 @@ namespace Netch.Forms
 
         public List<Button> ProfileButtons = new List<Button>();
 
+        /// <summary>
+        /// 主窗体的静态实例
+        /// </summary>
+        public static MainForm Instance = null;
+
         public MainForm()
         {
             InitializeComponent();
@@ -48,6 +53,7 @@ namespace Netch.Forms
 
             CheckForIllegalCrossThreadCalls = false;
             // MenuStrip.Renderer = new Override.ToolStripProfessionalRender();
+            Instance = this;
         }
 
         private void CheckUpdate()
@@ -1214,5 +1220,8 @@ namespace Netch.Forms
                 MessageBox.Show(Utils.i18N.Translate("Please select a server first"), Utils.i18N.Translate("Information"), MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
+        public void StatusText(string text) {
+            StatusLabel.Text = text;
+        }
     }
 }
diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN
index f1a53d82..e99612ff 100644
--- a/Netch/Resources/zh-CN
+++ b/Netch/Resources/zh-CN
@@ -16,6 +16,13 @@
     "Started": "已启动",
     "Stopping": "正在停止中",
     "Stopped": "已停止",
+    "Starting Shadowsocks": "正在启动Shadowsocks",
+    "Starting ShadowsocksR": "正在启动ShadowsocksR",
+    "Starting V2ray": "正在启动V2ray",
+    "Starting Tap": "正在启动Tap",
+    "Starting NatTester": "正在启动Nat测试",
+    "Starting LocalDns service": "正在启动本地DNS服务",
+    "SetupBypass": "设置绕行规则",
 
     "Server": "服务器",
     "Import Servers From Clipboard": "从剪贴板导入服务器",