From 7cb863b0c28ba281025a2b3552b595473fe4c152 Mon Sep 17 00:00:00 2001
From: clowwindy <clowwindy42@gmail.com>
Date: Sat, 24 Jan 2015 23:58:18 +0800
Subject: [PATCH] update some menu title

---
 shadowsocks-csharp/Data/cn.txt                |  6 +++---
 shadowsocks-csharp/View/MenuViewController.cs | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/cn.txt
index fd16174b..38e72d4a 100644
--- a/shadowsocks-csharp/Data/cn.txt
+++ b/shadowsocks-csharp/Data/cn.txt
@@ -1,6 +1,6 @@
 Shadowsocks=Shadowsocks
 Enable System Proxy=启用系统代理
-Mode=代理模式
+Mode=系统代理模式
 PAC=PAC 模式
 Global=全局模式
 Servers=服务器
@@ -38,8 +38,8 @@ Shadowsocks {0} Update Found=Shadowsocks {0} 更新
 Click here to download=点击这里下载
 Shadowsocks is here=Shadowsocks 在这里
 You can turn on/off Shadowsocks in the context menu=可以在右键菜单中开关 Shadowsocks
-Enabled=已启用代理
-Disabled=已禁用代理
+System Proxy Enabled=已启用系统代理
+System Proxy Disabled=已禁用系统代理
 Update PAC from GFWList=从 GFWList 更新 PAC
 Failed to update PAC file =更新 PAC 文件失败
 PAC updated=更新 PAC 成功
diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs
index 95505c7d..816db24e 100755
--- a/shadowsocks-csharp/View/MenuViewController.cs
+++ b/shadowsocks-csharp/View/MenuViewController.cs
@@ -27,6 +27,7 @@ namespace Shadowsocks.View
 
         private bool _isFirstRun;
         private MenuItem enableItem;
+        private MenuItem modeItem;
         private MenuItem AutoStartupItem;
         private MenuItem ShareOverLANItem;
         private MenuItem SeperatorItem;
@@ -116,7 +117,10 @@ namespace Shadowsocks.View
             }
             _notifyIcon.Icon = Icon.FromHandle(icon.GetHicon());
 
-            string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + "\n" + (global ? I18N.GetString("Global") : I18N.GetString("PAC")) + "\n" + config.GetCurrentServer().FriendlyName();
+            string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + 
+                (enabled ? I18N.GetString("System Proxy Enabled") : I18N.GetString("System Proxy Disabled")) +
+                (enabled ? "(" + (global ? I18N.GetString("Global") : I18N.GetString("PAC")) + ")" : "") + "\n" +
+                config.GetCurrentServer().FriendlyName();
             _notifyIcon.Text = text.Substring(0, Math.Min(63, text.Length));
         }
 
@@ -134,7 +138,7 @@ namespace Shadowsocks.View
         {
             this.contextMenu1 = new ContextMenu(new MenuItem[] {
                 this.enableItem = CreateMenuItem("Enable System Proxy", new EventHandler(this.EnableItem_Click)),
-                CreateMenuGroup("Mode", new MenuItem[] {
+                this.modeItem = CreateMenuGroup("Mode", new MenuItem[] {
                     this.PACModeItem = CreateMenuItem("PAC", new EventHandler(this.PACModeItem_Click)),
                     this.globalModeItem = CreateMenuItem("Global", new EventHandler(this.GlobalModeItem_Click))
                 }),
@@ -166,6 +170,7 @@ namespace Shadowsocks.View
         private void controller_EnableStatusChanged(object sender, EventArgs e)
         {
             enableItem.Checked = controller.GetConfiguration().enabled;
+            modeItem.Enabled = enableItem.Checked;
         }
 
         void controller_ShareOverLANStatusChanged(object sender, EventArgs e)
@@ -224,6 +229,7 @@ namespace Shadowsocks.View
             Configuration config = controller.GetConfiguration();
             UpdateServersMenu();
             enableItem.Checked = config.enabled;
+            modeItem.Enabled = config.enabled;
             globalModeItem.Checked = config.global;
             PACModeItem.Checked = !config.global;
             ShareOverLANItem.Checked = config.shareOverLan;