Merge branch 'Sharuru'

clowwindy · clowwindy · commit b6f1def40fb6 · 2015-01-21T16:40:06.000+08:00
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));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,11 @@ public Server GetCurrentServer()`
`68`	`68`	`return _config.GetCurrentServer();`
`69`	`69`	`}`
`70`	`70`
	`71`	`+ public bool GetCurrentMode()`
	`72`	`+ {`
	`73`	`+ return _config.global;`
	`74`	`+ }`
	`75`	`+`
`71`	`76`	`// always return copy`
`72`	`77`	`public Configuration GetConfiguration()`
`73`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ public Server GetCurrentServer()`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ public bool GetCurrentMode()`
	`36`	`+ {`
	`37`	`+ return global;`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`public static void CheckServer(Server server)`
`36`	`41`	`{`
`37`	`42`	`CheckPort(server.server_port);`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private void UpdateTrayIcon()`
`114`	`114`	`}`
`115`	`115`	`_notifyIcon.Icon = Icon.FromHandle(icon.GetHicon());`
`116`	`116`
`117`		`- string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + "\n" + controller.GetCurrentServer().FriendlyName();`
	`117`	`+ 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();`
`118`	`118`	`_notifyIcon.Text = text.Substring(0, Math.Min(63, text.Length));`
`119`	`119`	`}`
`120`	`120`