Merge branch 'Sharuru'

tvvocold · Jan 21, 2015 · b6f1def · b6f1def
2 parents ce53273 + 7918cb4
commit b6f1def
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -68,6 +68,11 @@ public Server GetCurrentServer()
             return _config.GetCurrentServer();
         }
 
+        public bool GetCurrentMode()
+        {
+            return _config.global;
+        }
+
         // always return copy
         public Configuration GetConfiguration()
         {

diff --git a/shadowsocks-csharp/Model/Configuration.cs b/shadowsocks-csharp/Model/Configuration.cs
@@ -32,6 +32,11 @@ public Server GetCurrentServer()
             }
         }
 
+        public bool GetCurrentMode()
+        {
+            return global;
+        }
+
         public static void CheckServer(Server server)
         {
             CheckPort(server.server_port);

diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs
@@ -114,7 +114,7 @@ private void UpdateTrayIcon()
             }
             _notifyIcon.Icon = Icon.FromHandle(icon.GetHicon());
 
-            string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + "\n" + controller.GetCurrentServer().FriendlyName();
+            string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + " " + (controller.GetCurrentMode() ? I18N.GetString("Global") : I18N.GetString("PAC")) + "\n" + controller.GetCurrentServer().FriendlyName();
             _notifyIcon.Text = text.Substring(0, Math.Min(63, text.Length));
         }