diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 1f32f8d..bc6a263 100644 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -562,7 +562,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele image = NSImage(named: "menu_icon_manual")! //statusItem?.title = "Manual".localized } else if mode == "whiteList" { - image = NSImage(named: "menu_icon_white")! + if defaults.string(forKey: "ACLFileName")! == "chn.acl" { + image = NSImage(named: "menu_icon_white")! + } else { + image = NSImage(named: "menu_icon_acl")! + } } let titleWidth:CGFloat = 0//statusItem?.title!.size(withAttributes: [NSFontAttributeName: statusItem?.button!.font!]).width//这里不包含IP白名单模式等等,需要重新调整//PS还是给上游加上白名单模式? let imageWidth:CGFloat = 22 diff --git a/ShadowsocksX-NG/Info.plist b/ShadowsocksX-NG/Info.plist index 5708213..207a57d 100644 --- a/ShadowsocksX-NG/Info.plist +++ b/ShadowsocksX-NG/Info.plist @@ -48,7 +48,7 @@ CFBundleVersion - 1 + 2 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index 40a939e..39ada61 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -8,7 +8,7 @@ import Foundation -let SS_LOCAL_VERSION = "2.5.6.5.static" +let SS_LOCAL_VERSION = "2.5.6.56static" let PRIVOXY_VERSION = "3.0.26.static" let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/" let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/" diff --git a/ShadowsocksX-NG/install_ss_local.sh b/ShadowsocksX-NG/install_ss_local.sh index 3a68b02..decc43c 100755 --- a/ShadowsocksX-NG/install_ss_local.sh +++ b/ShadowsocksX-NG/install_ss_local.sh @@ -8,7 +8,7 @@ cd `dirname "${BASH_SOURCE[0]}"` -ssLocalVersion=2.5.6.5.static +ssLocalVersion=2.5.6.6.static mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion" cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/" rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local" diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local index 8a1810e..8d1c7ae 100755 Binary files a/ShadowsocksX-NG/ss-local and b/ShadowsocksX-NG/ss-local differ