xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr/116' into develop

Browse Source
This commit is contained in:
Charlie Qiu
2016-11-03 23:36:34 +08:00
parent 1ef2d7b909 e6cdfbbc26
commit cc342df5b5
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ShadowsocksX-NG/AppDelegate.swift
View File

@ -67,7 +67,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
"LocalHTTP.ListenAddress": "127.0.0.1", "LocalHTTP.ListenAddress": "127.0.0.1",
"LocalHTTP.ListenPort": NSNumber(value: 1087 as UInt16), "LocalHTTP.ListenPort": NSNumber(value: 1087 as UInt16),
"LocalHTTPOn": true, "LocalHTTPOn": true,
"LocalHTTP.FollowGlobel": true "LocalHTTP.FollowGlobal": true
]) ])
statusItem = NSStatusBar.system().statusItem(withLength: AppDelegate.StatusItemIconWidth) statusItem = NSStatusBar.system().statusItem(withLength: AppDelegate.StatusItemIconWidth)

4
ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
View File

@ -28,12 +28,12 @@
</button> </button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="P4f-0N-7JI"> <button translatesAutoresizingMaskIntoConstraints="NO" id="P4f-0N-7JI">
<rect key="frame" x="18" y="133" width="141" height="18"/> <rect key="frame" x="18" y="133" width="141" height="18"/>
<buttonCell key="cell" type="check" title="Follow Globel Mode" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ofk-Pc-c8f"> <buttonCell key="cell" type="check" title="Follow Global Mode" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ofk-Pc-c8f">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
<connections> <connections>
<binding destination="Adn-6l-wm4" name="value" keyPath="values.LocalHTTP.FollowGlobel" id="mwB-AA-WgF"/> <binding destination="Adn-6l-wm4" name="value" keyPath="values.LocalHTTP.FollowGlobal" id="mwB-AA-WgF"/>
</connections> </connections>
</button> </button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CKF-K9-m8X"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CKF-K9-m8X">

2
ShadowsocksX-NG/ProxyConfHelper.m
View File

@ -141,7 +141,7 @@ FSEventStreamRef fsEventStream;
// Because issue #106 https://github.com/shadowsocks/ShadowsocksX-NG/issues/106 // Because issue #106 https://github.com/shadowsocks/ShadowsocksX-NG/issues/106
// Comment below out. // Comment below out.
// if ([[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTPOn"] && [[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTP.FollowGlobel"]) { // if ([[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTPOn"] && [[NSUserDefaults standardUserDefaults] boolForKey:@"LocalHTTP.FollowGlobal"]) {
// NSUInteger privoxyPort = [[NSUserDefaults standardUserDefaults]integerForKey:@"LocalHTTP.ListenPort"]; // NSUInteger privoxyPort = [[NSUserDefaults standardUserDefaults]integerForKey:@"LocalHTTP.ListenPort"];
// //
// [args addObject:@"--privoxy-port"]; // [args addObject:@"--privoxy-port"];

2
ShadowsocksX-NG/zh-Hans.lproj/HTTPPreferencesWindowController.strings
View File

@ -11,5 +11,5 @@
/* Class = "NSWindow"; title = "HTTP Proxy Preferences"; ObjectID = "vS3-DL-Nq3"; */ /* Class = "NSWindow"; title = "HTTP Proxy Preferences"; ObjectID = "vS3-DL-Nq3"; */
"vS3-DL-Nq3.title" = "HTTP 代理 设置"; "vS3-DL-Nq3.title" = "HTTP 代理 设置";
/* Class = "NSButtonCell"; title = "Follow Globel Mode"; ObjectID = "ofk-Pc-c8f"; */ /* Class = "NSButtonCell"; title = "Follow Global Mode"; ObjectID = "ofk-Pc-c8f"; */
"ofk-Pc-c8f.title" = "跟随全局模式"; "ofk-Pc-c8f.title" = "跟随全局模式";