From 7e184d5a1b9b636a0be03a788200bbce7dbce509 Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Sat, 18 Jun 2016 10:44:09 +0800 Subject: [PATCH] Add "Enable verbose mode" to adv preferences panel. --- ShadowsocksX-NG/AppDelegate.swift | 1 + .../AdvPreferencesWindowController.xib | 192 +++++++++++------- ShadowsocksX-NG/LaunchAgentUtils.swift | 9 +- .../AdvPreferencesWindowController.strings | 3 + 4 files changed, 125 insertions(+), 80 deletions(-) diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index b76c62e..213f542 100644 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -51,6 +51,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele "LocalSocks5.ListenAddress": "127.0.0.1", "LocalSocks5.Timeout": NSNumber(unsignedInteger: 60), "LocalSocks5.EnableUDPRelay": NSNumber(bool: false), + "LocalSocks5.EnableVerboseMode": NSNumber(bool: false), "GFWListURL": "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt" ]) diff --git a/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib b/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib index 048c9aa..7b76e43 100644 --- a/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib +++ b/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib @@ -14,14 +14,63 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -29,7 +78,7 @@ - + @@ -37,10 +86,7 @@ - - - - + @@ -55,7 +101,7 @@ - + @@ -63,7 +109,7 @@ - + @@ -79,7 +125,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -142,49 +153,74 @@ - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index 5eac669..1488fe3 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -30,12 +30,17 @@ func generateSSLocalLauchAgentPlist() -> Bool { let oldSha1Sum = getFileSHA1Sum(plistFilepath) - let enableUdpRelay = NSUserDefaults.standardUserDefaults().boolForKey("LocalSocks5.EnableUDPRelay") + let defaults = NSUserDefaults.standardUserDefaults() + let enableUdpRelay = defaults.boolForKey("LocalSocks5.EnableUDPRelay") + let enableVerboseMode = defaults.boolForKey("LocalSocks5.EnableVerboseMode") - var arguments = [sslocalPath, "-v", "-c", "ss-local-config.json"] + var arguments = [sslocalPath, "-c", "ss-local-config.json"] if enableUdpRelay { arguments.append("-u") } + if enableVerboseMode { + arguments.append("-v") + } // For a complete listing of the keys, see the launchd.plist manual page. let dict: NSMutableDictionary = [ diff --git a/ShadowsocksX-NG/zh-Hans.lproj/AdvPreferencesWindowController.strings b/ShadowsocksX-NG/zh-Hans.lproj/AdvPreferencesWindowController.strings index 6c30cf1..c26222d 100644 --- a/ShadowsocksX-NG/zh-Hans.lproj/AdvPreferencesWindowController.strings +++ b/ShadowsocksX-NG/zh-Hans.lproj/AdvPreferencesWindowController.strings @@ -2,6 +2,9 @@ /* Class = "NSButtonCell"; title = "启用 Udp Replay"; ObjectID = "1C3-4s-Apd"; */ "1C3-4s-Apd.title" = "启用 Udp Replay"; +/* Class = "NSTextFieldCell"; title = "Don't change these preferences if you have no idea what are they."; ObjectID = "8wL-qv-5nD"; */ +"8wL-qv-5nD.title" = "如果你不明白这些选项是什么,请不要修改"; + /* Class = "NSWindow"; title = "高级设置"; ObjectID = "F0z-JX-Cv5"; */ "F0z-JX-Cv5.title" = "高级设置";