Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-30 13:43:45 +00:00
Code Releases Activity

Merge branch 'develop' into feature/subscribe

Browse Source
This commit is contained in:
秦宇航
2017-07-16 21:08:36 +08:00
parent a984a62f7e 82d7558b58
commit 010b093368
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib
+27 -7
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12120" systemVersion="16F71b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12120"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -204,7 +204,11 @@
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.PacServer.ListenAddress" id="4UF-xD-Z2q"/>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.PacServer.ListenAddress" id="qIO-Ro-oYI">
<dictionary key="options">
<bool key="NSContinuouslyUpdatesValue" value="YES"/>
</dictionary>
</binding>
</connections>
</textField>
<textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wNM-6D-tgb">
@@ -215,7 +219,11 @@
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.PacServer.ListenPort" id="Tb3-to-Ngs"/>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.PacServer.ListenPort" id="UVc-Yt-WUF">
<dictionary key="options">
<bool key="NSContinuouslyUpdatesValue" value="YES"/>
</dictionary>
</binding>
</connections>
</textField>
<textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X9m-FK-fcs">
@@ -229,7 +237,11 @@
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.ACLWhiteListURL" id="1OU-Ly-pwB"/>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.ACLWhiteListURL" id="6Jl-JB-WpG">
<dictionary key="options">
<bool key="NSContinuouslyUpdatesValue" value="YES"/>
</dictionary>
</binding>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a5H-9g-9jP">
@@ -259,7 +271,11 @@
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.ACLAutoListURL" id="TO8-ey-7bW"/>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.ACLAutoListURL" id="acu-o9-caX">
<dictionary key="options">
<bool key="NSContinuouslyUpdatesValue" value="YES"/>
</dictionary>
</binding>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jip-F1-43v">
@@ -281,7 +297,11 @@
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.ACLProxyBackCHNURL" id="fgI-di-sSq"/>
<binding destination="pR1-Bo-AWz" name="value" keyPath="values.ACLProxyBackCHNURL" id="tbg-7T-eQO">
<dictionary key="options">
<bool key="NSContinuouslyUpdatesValue" value="YES"/>
</dictionary>
</binding>
</connections>
</textField>
</subviews>
ShadowsocksX-NG/Info.plist
+1 -1
View File
@@ -48,7 +48,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>3</string>
<string>4</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
ShadowsocksX-NG/LaunchAgentUtils.swift
+1 -1
View File
@@ -8,7 +8,7 @@
import Foundation
let SS_LOCAL_VERSION = "2.5.6.8.static"
let SS_LOCAL_VERSION = "2.5.6.9.static"
let PRIVOXY_VERSION = "3.0.26.static"
let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"
ShadowsocksX-NG/install_ss_local.sh
+1 -1
View File
@@ -8,7 +8,7 @@
cd `dirname "${BASH_SOURCE[0]}"`
ssLocalVersion=2.5.6.8.static
ssLocalVersion=2.5.6.9.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"