mirror of
https://github.com/qinyuhang/ShadowsocksX-NG-R.git
synced 2026-11-05 21:45:06 +00:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 秦宇航
|
f38ade4584 | ||
|
秦宇航
|
abfb8c1dd3 | ||
|
秦宇航
|
61e40e77bf | ||
 ImPerat0R_
|
8baf1c8485 | ||
|
秦宇航
|
682fc346f8 | ||
|
秦宇航
|
8e09347fac | ||
|
秦宇航
|
e94ba06959 | ||
|
秦宇航
|
25d2dfdd4a | ||
|
秦宇航
|
294c2a94e1 | ||
|
秦宇航
|
8162d7346b |
@@ -375,7 +375,7 @@ DQ
|
|||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstAttribute="width" constant="69" id="s2I-cF-RJc"/>
|
<constraint firstAttribute="width" constant="69" id="s2I-cF-RJc"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
<buttonCell key="cell" type="push" title="Cacnel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j03-9E-uHW">
|
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j03-9E-uHW">
|
||||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||||
<font key="font" metaFont="system"/>
|
<font key="font" metaFont="system"/>
|
||||||
<string key="keyEquivalent" base64-UTF8="YES">
|
<string key="keyEquivalent" base64-UTF8="YES">
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.4.1-R8</string>
|
<string>1.4.3-R8</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleURLTypes</key>
|
<key>CFBundleURLTypes</key>
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
</dict>
|
</dict>
|
||||||
</array>
|
</array>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>4</string>
|
<string>2</string>
|
||||||
<key>LSApplicationCategoryType</key>
|
<key>LSApplicationCategoryType</key>
|
||||||
<string>public.app-category.utilities</string>
|
<string>public.app-category.utilities</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
let SS_LOCAL_VERSION = "2.5.6.9.static"
|
let SS_LOCAL_VERSION = "2.5.6.12.static"
|
||||||
let PRIVOXY_VERSION = "3.0.26.static"
|
let PRIVOXY_VERSION = "3.0.26.static"
|
||||||
let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
|
let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
|
||||||
let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"
|
let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ class PreferencesWindowController: NSWindowController
|
|||||||
"auth_aes128_sha1",
|
"auth_aes128_sha1",
|
||||||
"auth_aes128_md5",
|
"auth_aes128_md5",
|
||||||
"auth_chain_a",
|
"auth_chain_a",
|
||||||
|
"auth_chain_b",
|
||||||
])
|
])
|
||||||
ObfsTextField.addItems(withObjectValues: [
|
ObfsTextField.addItems(withObjectValues: [
|
||||||
"plain",
|
"plain",
|
||||||
|
|||||||
@@ -50,9 +50,9 @@
|
|||||||
CGContextRef bitmapRef = CGBitmapContextCreate(nil, width, height, 8, 0, cs, (CGBitmapInfo)kCGImageAlphaNone);
|
CGContextRef bitmapRef = CGBitmapContextCreate(nil, width, height, 8, 0, cs, (CGBitmapInfo)kCGImageAlphaNone);
|
||||||
|
|
||||||
#if TARGET_OS_IPHONE
|
#if TARGET_OS_IPHONE
|
||||||
CIContext *context = [CIContext contextWithOptions:nil];
|
CIContext *context = [CIContext contextWithOptions: @{kCIContextUseSoftwareRenderer: true}];
|
||||||
#else
|
#else
|
||||||
CIContext *context = [CIContext contextWithCGContext:bitmapRef options:nil];
|
CIContext *context = [CIContext contextWithCGContext:bitmapRef options:@{kCIContextUseSoftwareRenderer: @true}];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CGImageRef bitmapImage = [context createCGImage:image fromRect:extent];
|
CGImageRef bitmapImage = [context createCGImage:image fromRect:extent];
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ class ServerProfileManager: NSObject {
|
|||||||
|
|
||||||
func isExisted(profile: ServerProfile) -> (Bool, Int){
|
func isExisted(profile: ServerProfile) -> (Bool, Int){
|
||||||
for (index, value) in profiles.enumerated() {
|
for (index, value) in profiles.enumerated() {
|
||||||
let ret = value.serverHost == profile.serverHost
|
let ret = (value.serverHost == profile.serverHost && value.serverPort == profile.serverPort)
|
||||||
if ret {
|
if ret {
|
||||||
return (ret, index)
|
return (ret, index)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
|
|
||||||
cd `dirname "${BASH_SOURCE[0]}"`
|
cd `dirname "${BASH_SOURCE[0]}"`
|
||||||
ssLocalVersion=2.5.6.9.static
|
ssLocalVersion=2.5.6.12.static
|
||||||
mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion"
|
mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion"
|
||||||
cp -f ss-local "$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"
|
rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local"
|
||||||
|
|||||||
Binary file not shown.
@@ -26,7 +26,7 @@
|
|||||||
/* Class = "NSTextFieldCell"; title = "Obfs Param"; ObjectID = "g7c-fW-7J4"; */
|
/* Class = "NSTextFieldCell"; title = "Obfs Param"; ObjectID = "g7c-fW-7J4"; */
|
||||||
"g7c-fW-7J4.title" = "混淆参数:";
|
"g7c-fW-7J4.title" = "混淆参数:";
|
||||||
|
|
||||||
/* Class = "NSButtonCell"; title = "Cacnel"; ObjectID = "j03-9E-uHW"; */
|
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "j03-9E-uHW"; */
|
||||||
"j03-9E-uHW.title" = "取消";
|
"j03-9E-uHW.title" = "取消";
|
||||||
|
|
||||||
/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */
|
/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */
|
||||||
|
|||||||
Reference in New Issue
Block a user