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

批量导入导出配置文件功能 for Swift 3

Browse Source 
已解决冲突问题，请Merge
This commit is contained in:
qinyuhang
2016-09-12 17:05:28 +08:00
parent 8fa7f76faa
commit 327609c840
5 changed files with 212 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ShadowsocksX-NG/Base.lproj/MainMenu.xib
View File

@ -1,5 +1,10 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
=======
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
>>>>>>> 8dfa5e4... 批量导入导出配置文件功能
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
@ -16,7 +21,9 @@
<connections>
<outlet property="RunningStatusMenuItem" destination="fzk-mE-CEV" id="R4x-gK-Qcw"/>
<outlet property="autoModeMenuItem" destination="r07-Gu-aEz" id="9aH-pQ-Rgi"/>
<outlet property="exportAllServerProfileItem" destination="6k0-gn-DQv" id="v5i-Ok-Z4H"/>
<outlet property="globalModeMenuItem" destination="Mw3-Jm-eXA" id="ar5-Yx-3ze"/>
<outlet property="importBunchJsonFileItem" destination="T9g-gy-gvv" id="cbg-Jr-fM5"/>
<outlet property="lanchAtLoginMenuItem" destination="eUq-p7-ICK" id="w4p-0c-DZn"/>
<outlet property="manualModeMenuItem" destination="8PR-gs-c5N" id="9qz-mU-5kt"/>
<outlet property="proxyMenuItem" destination="diI-fB-Rss" id="Qjk-9U-3Qy"/>
@ -24,6 +31,7 @@
<outlet property="scanQRCodeMenuItem" destination="Qe6-bF-paT" id="XHa-pa-nCa"/>
<outlet property="serversMenuItem" destination="u5M-hQ-VSc" id="8gp-SY-Y4U"/>
<outlet property="serversPreferencesMenuItem" destination="M5r-E7-44f" id="voe-SX-k6a"/>
<outlet property="showBunchJsonExampleFileItem" destination="pdy-JE-50Q" id="5l7-lq-XIn"/>
<outlet property="showQRCodeMenuItem" destination="R6A-96-Zcb" id="XHz-pz-nCz"/>
<outlet property="showRunningModeMenuItem" destination="CCV-hX-fVA" id="AU2-hH-w8F"/>
<outlet property="statusMenu" destination="Hob-KD-bx9" id="clA-ZW-0pT"/>
@ -110,6 +118,24 @@
<action selector="scanQRCodeFromScreen:" target="Voe-Tx-rLC" id="zQZ-IT-H4a"/>
</connections>
</menuItem>
<menuItem title="Show Bunch Json Example File..." id="pdy-JE-50Q">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="showBunchJsonExampleFile:" target="Voe-Tx-rLC" id="7io-Bd-j2n"/>
</connections>
</menuItem>
<menuItem title="Import Bunch Json File..." id="T9g-gy-gvv">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="importBunchJsonFile:" target="Voe-Tx-rLC" id="Pih-Z0-or9"/>
</connections>
</menuItem>
<menuItem title="Export All Server To Json..." id="6k0-gn-DQv">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="exportAllServerProfile:" target="Voe-Tx-rLC" id="ZsF-Ae-75d"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="6sL-A4-S7N"/>
<menuItem title="Server Preferences..." id="M5r-E7-44f">
<modifierMask key="keyEquivalentModifierMask"/>