From ce2d4e8a55b7d7986ad7f75ed273c49ce8dcc481 Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Tue, 14 Jun 2016 20:26:12 +0800 Subject: [PATCH 1/6] Change Default listen address from localhost to 127.0.0.1 --- ShadowsocksX-NG/AppDelegate.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 3678bf8..b76c62e 100644 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -48,7 +48,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele "ShadowsocksOn": true, "ShadowsocksRunningMode": "auto", "LocalSocks5.ListenPort": NSNumber(unsignedShort: 1086), - "LocalSocks5.ListenAddress": "localhost", + "LocalSocks5.ListenAddress": "127.0.0.1", "LocalSocks5.Timeout": NSNumber(unsignedInteger: 60), "LocalSocks5.EnableUDPRelay": NSNumber(bool: false), "GFWListURL": "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt" From a28612b1c33aa0c1a5e8d26c6aae4948dcbe1e6f Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Tue, 14 Jun 2016 20:29:55 +0800 Subject: [PATCH 2/6] Build number to 2 --- ShadowsocksX-NG/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShadowsocksX-NG/Info.plist b/ShadowsocksX-NG/Info.plist index e2c0649..afafe77 100644 --- a/ShadowsocksX-NG/Info.plist +++ b/ShadowsocksX-NG/Info.plist @@ -36,7 +36,7 @@ CFBundleVersion - 1 + 2 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion From 326b080027f5e42a8755eefb809dd0eb4f144db7 Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Wed, 15 Jun 2016 05:38:50 +0800 Subject: [PATCH 3/6] Enable ss-local verbose mode. --- ShadowsocksX-NG/LaunchAgentUtils.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index a068fed..5eac669 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -32,7 +32,7 @@ func generateSSLocalLauchAgentPlist() -> Bool { let enableUdpRelay = NSUserDefaults.standardUserDefaults().boolForKey("LocalSocks5.EnableUDPRelay") - var arguments = [sslocalPath, "-c", "ss-local-config.json"] + var arguments = [sslocalPath, "-v", "-c", "ss-local-config.json"] if enableUdpRelay { arguments.append("-u") } From 7e184d5a1b9b636a0be03a788200bbce7dbce509 Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Sat, 18 Jun 2016 10:44:09 +0800 Subject: [PATCH 4/6] 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" = "高级设置"; From 23696420a5677a342d339af821c1ea18e3f03eac Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Sat, 18 Jun 2016 11:06:49 +0800 Subject: [PATCH 5/6] Add show logs menu item. --- ShadowsocksX-NG/AppDelegate.swift | 9 +++++++++ ShadowsocksX-NG/Base.lproj/MainMenu.xib | 6 ++++++ ShadowsocksX-NG/zh-Hans.lproj/MainMenu.strings | 3 +++ 3 files changed, 18 insertions(+) diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 213f542..11a6c6b 100644 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -284,6 +284,15 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele } } + @IBAction func showLogs(sender: NSMenuItem) { + let ws = NSWorkspace.sharedWorkspace() + if let appUrl = ws.URLForApplicationWithBundleIdentifier("com.apple.Console") { + try! ws.launchApplicationAtURL(appUrl + ,options: .Default + ,configuration: [NSWorkspaceLaunchConfigurationArguments: "~/Library/Logs/ss-local.log"]) + } + } + @IBAction func feedback(sender: NSMenuItem) { NSWorkspace.sharedWorkspace().openURL(NSURL(string: "https://github.com/qiuyuzhou/ShadowsocksX-NG/issues")!) } diff --git a/ShadowsocksX-NG/Base.lproj/MainMenu.xib b/ShadowsocksX-NG/Base.lproj/MainMenu.xib index cdd88f3..cab9deb 100644 --- a/ShadowsocksX-NG/Base.lproj/MainMenu.xib +++ b/ShadowsocksX-NG/Base.lproj/MainMenu.xib @@ -117,6 +117,12 @@ + + + + + + diff --git a/ShadowsocksX-NG/zh-Hans.lproj/MainMenu.strings b/ShadowsocksX-NG/zh-Hans.lproj/MainMenu.strings index 949e03b..b574f5b 100644 --- a/ShadowsocksX-NG/zh-Hans.lproj/MainMenu.strings +++ b/ShadowsocksX-NG/zh-Hans.lproj/MainMenu.strings @@ -14,6 +14,9 @@ /* Class = "NSMenu"; title = "ShadowsocksX-NE"; ObjectID = "Hob-KD-bx9"; */ "Hob-KD-bx9.title" = "ShadowsocksX-NE"; +/* Class = "NSMenuItem"; title = "Show Logs..."; ObjectID = "Jfy-sf-Fhl"; */ +"Jfy-sf-Fhl.title" = "显示日志..."; + /* Class = "NSMenuItem"; title = "About"; ObjectID = "LgB-6g-Gba"; */ "LgB-6g-Gba.title" = "关于"; From 4659a963b36aeb986df9bb5f787ac102812b9bb4 Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Mon, 20 Jun 2016 15:41:12 +0800 Subject: [PATCH 6/6] Update build number to 3. --- ShadowsocksX-NG/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShadowsocksX-NG/Info.plist b/ShadowsocksX-NG/Info.plist index afafe77..01b772e 100644 --- a/ShadowsocksX-NG/Info.plist +++ b/ShadowsocksX-NG/Info.plist @@ -36,7 +36,7 @@ CFBundleVersion - 2 + 3 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion