From 2c1894e25567ee3fd43b35e404717a4909ded2d2 Mon Sep 17 00:00:00 2001
From: qinyuhang <qinyuhangxiaoxiang@gmail.com>
Date: Fri, 9 Sep 2016 13:59:53 +0800
Subject: [PATCH] Add Ping result in main menu

---
 ShadowsocksX-NG/AppDelegate.swift | 30 +++++++++++++++++++-----------
 ShadowsocksX-NG/PingClient.swift  |  1 +
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift
index 7108a40..585877e 100644
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@@ -197,6 +197,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         // Insert code here to tear down your application
         StopSSLocal()
         ProxyConfHelper.disableProxy("hi")
+        let defaults = NSUserDefaults.standardUserDefaults()
+        defaults.setBool(false, forKey: "ShadowsocksOn")
         ProxyConfHelper.stopPACServer()
 
 
@@ -445,15 +447,21 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         let defaults = NSUserDefaults.standardUserDefaults()
         let mode = defaults.stringForKey("ShadowsocksRunningMode")
         var serverMenuText = "Servers".localized
-        for i in defaults.arrayForKey("ServerProfiles")! {
-            if i["Id"] as! String == defaults.stringForKey("ActiveServerProfileId")! {
-                if i["Remark"] as! String != "" {
-                    serverMenuText = i["Remark"] as! String
+        
+        let mgr = ServerProfileManager.instance
+        for p in mgr.profiles {
+            if mgr.activeProfileId == p.uuid {
+                if !p.remark.isEmpty {
+                    serverMenuText = p.remark
                 } else {
-                    serverMenuText = i["ServerHost"] as! String
+                    serverMenuText = p.serverHost
+                }
+                if let latency = p.latency{
+                    serverMenuText += "  - \(latency)ms"
                 }
             }
         }
+
         serversMenuItem.title = serverMenuText
         if mode == "auto" {
             proxyMenuItem.title = "Proxy - Auto By PAC".localized
@@ -502,13 +510,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         let defaults = NSUserDefaults.standardUserDefaults()
         let isOn = defaults.boolForKey("ShadowsocksOn")
         if isOn {
-            runningStatusMenuItem.title = "ShadowsocksR: On".localized
+            runningStatusMenuItem.title = "Shadowsocks: On".localized
             toggleRunningMenuItem.title = "Turn Shadowsocks Off".localized
             let image = NSImage(named: "menu_icon")
             statusItemView.setIcon(image!)
-//            statusItem.image = image
+//            statusItem!.image = image
         } else {
-            runningStatusMenuItem.title = "ShadowsocksR: Off".localized
+            runningStatusMenuItem.title = "Shadowsocks: Off".localized
             toggleRunningMenuItem.title = "Turn Shadowsocks On".localized
             let image = NSImage(named: "menu_icon_disabled")
 //            statusItem.image = image
@@ -531,7 +539,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         let showBunch = showBunchJsonExampleFileItem
         let importBuntch = importBunchJsonFileItem
         let exportAllServer = exportAllServerProfileItem
-        let pingItem = pingserverMenuItem
+//        let pingItem = pingserverMenuItem
 
         var i = 0
         for p in mgr.profiles {
@@ -544,7 +552,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
             }
 
             if let latency = p.latency{
-                item.title += "  -\(latency)ms"
+                item.title += "  - \(latency)ms"
             }
 
             if mgr.activeProfileId == p.uuid {
@@ -568,7 +576,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
         serversMenuItem.submenu?.addItem(exportAllServer)
         serversMenuItem.submenu?.addItem(NSMenuItem.separatorItem())
         serversMenuItem.submenu?.addItem(preferencesItem)
-        serversMenuItem.submenu?.addItem(pingItem)
+//        serversMenuItem.submenu?.addItem(pingItem)
 
     }
     
diff --git a/ShadowsocksX-NG/PingClient.swift b/ShadowsocksX-NG/PingClient.swift
index 2191d09..c3f4776 100644
--- a/ShadowsocksX-NG/PingClient.swift
+++ b/ShadowsocksX-NG/PingClient.swift
@@ -84,6 +84,7 @@ class PingServers:NSObject{
 
         if i >= SerMgr.profiles.count{
             (NSApplication.sharedApplication().delegate as! AppDelegate).updateServersMenu()
+            (NSApplication.sharedApplication().delegate as! AppDelegate).updateRunningModeMenu()
             let notice = NSUserNotification()
             notice.title = "Ping测试完成！"
             notice.subtitle = "最快的是\(SerMgr.profiles[fastest_id].remark) \(SerMgr.profiles[fastest_id].serverHost) \(SerMgr.profiles[fastest_id].latency!)ms"