Changeset 10612
- Timestamp:
- May 1, 2010, 4:31:44 PM (8 years ago)
- Location:
- trunk/macosx
- Files:
-
- 4 edited
-
Defaults.plist (modified) (1 diff)
-
PrefsController.h (modified) (1 diff)
-
PrefsController.m (modified) (3 diffs)
-
en.lproj/PrefsWindow.xib (modified) (25 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Defaults.plist
r10469 r10612 83 83 <key>InspectorSelected</key> 84 84 <string>Info</string> 85 <key>LocalPeerDiscoveryGlobal</key> 86 <false/> 85 87 <key>MagnetOpenAsk</key> 86 88 <true/> -
trunk/macosx/PrefsController.h
r10424 r10612 85 85 - (void) setPEX: (id) sender; 86 86 - (void) setDHT: (id) sender; 87 - (void) setLDS: (id) sender; 87 88 88 89 - (void) setEncryptionMode: (id) sender; -
trunk/macosx/PrefsController.m
r10522 r10612 482 482 } 483 483 484 - (void) setLDS: (id) sender 485 { 486 tr_sessionSetLDSEnabled(fHandle, [fDefaults boolForKey: @"LocalPeerDiscoveryGlobal"]); 487 } 488 484 489 - (void) setEncryptionMode: (id) sender 485 490 { … … 1150 1155 [fDefaults setBool: dht forKey: @"DHTGlobal"]; 1151 1156 1157 //dht 1158 const BOOL lds = tr_sessionIsLDSEnabled(fHandle); 1159 [fDefaults setBool: lds forKey: @"LocalPeerDiscovery"]; 1160 1152 1161 //auto start 1153 1162 const BOOL autoStart = !tr_sessionGetPaused(fHandle); … … 1231 1240 1232 1241 //dht handled by bindings 1242 1243 //lds handled by bindings 1233 1244 1234 1245 [fPortField setIntValue: port]; -
trunk/macosx/en.lproj/PrefsWindow.xib
r10469 r10612 13 13 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 14 14 <bool key="EncodedWithXMLCoder">YES</bool> 15 <integer value=" 41"/>15 <integer value="1361"/> 16 16 </object> 17 17 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 434 434 </object> 435 435 <object class="NSCustomView" id="314557528"> 436 < referencekey="NSNextResponder"/>436 <nil key="NSNextResponder"/> 437 437 <int key="NSvFlags">256</int> 438 438 <object class="NSMutableArray" key="NSSubviews"> … … 1624 1624 </object> 1625 1625 <string key="NSFrameSize">{542, 331}</string> 1626 <reference key="NSSuperview"/>1627 1626 <string key="NSClassName">NSView</string> 1628 1627 <string key="NSExtension">NSResponder</string> … … 2950 2949 </object> 2951 2950 <object class="NSCustomView" id="538122014"> 2952 < nilkey="NSNextResponder"/>2951 <reference key="NSNextResponder"/> 2953 2952 <int key="NSvFlags">256</int> 2954 2953 <object class="NSMutableArray" key="NSSubviews"> … … 3017 3016 <reference key="NSNextResponder" ref="538122014"/> 3018 3017 <int key="NSvFlags">256</int> 3019 <string key="NSFrame">{{45, 2 78}, {87, 17}}</string>3018 <string key="NSFrame">{{45, 298}, {87, 17}}</string> 3020 3019 <reference key="NSSuperview" ref="538122014"/> 3021 3020 <bool key="NSEnabled">YES</bool> … … 3033 3032 <reference key="NSNextResponder" ref="538122014"/> 3034 3033 <int key="NSvFlags">256</int> 3035 <string key="NSFrame">{{134, 2 78}, {196, 17}}</string>3034 <string key="NSFrame">{{134, 298}, {196, 17}}</string> 3036 3035 <reference key="NSSuperview" ref="538122014"/> 3037 3036 <bool key="NSEnabled">YES</bool> … … 3049 3048 <reference key="NSNextResponder" ref="538122014"/> 3050 3049 <int key="NSvFlags">256</int> 3051 <string key="NSFrame">{{335, 2 76}, {50, 22}}</string>3050 <string key="NSFrame">{{335, 296}, {50, 22}}</string> 3052 3051 <reference key="NSSuperview" ref="538122014"/> 3053 3052 <bool key="NSEnabled">YES</bool> … … 3113 3112 <reference key="NSNextResponder" ref="538122014"/> 3114 3113 <int key="NSvFlags">256</int> 3115 <string key="NSFrame">{{390, 2 78}, {39, 17}}</string>3114 <string key="NSFrame">{{390, 298}, {39, 17}}</string> 3116 3115 <reference key="NSSuperview" ref="538122014"/> 3117 3116 <bool key="NSEnabled">YES</bool> … … 3129 3128 <reference key="NSNextResponder" ref="538122014"/> 3130 3129 <int key="NSvFlags">256</int> 3131 <string key="NSFrame">{{457, 2 52}, {39, 17}}</string>3130 <string key="NSFrame">{{457, 272}, {39, 17}}</string> 3132 3131 <reference key="NSSuperview" ref="538122014"/> 3133 3132 <bool key="NSEnabled">YES</bool> … … 3145 3144 <reference key="NSNextResponder" ref="538122014"/> 3146 3145 <int key="NSvFlags">256</int> 3147 <string key="NSFrame">{{402, 2 50}, {50, 22}}</string>3146 <string key="NSFrame">{{402, 270}, {50, 22}}</string> 3148 3147 <reference key="NSSuperview" ref="538122014"/> 3149 3148 <bool key="NSEnabled">YES</bool> … … 3209 3208 <reference key="NSNextResponder" ref="538122014"/> 3210 3209 <int key="NSvFlags">256</int> 3211 <string key="NSFrame">{{134, 2 52}, {263, 17}}</string>3210 <string key="NSFrame">{{134, 272}, {263, 17}}</string> 3212 3211 <reference key="NSSuperview" ref="538122014"/> 3213 3212 <bool key="NSEnabled">YES</bool> … … 3225 3224 <reference key="NSNextResponder" ref="538122014"/> 3226 3225 <int key="NSvFlags">256</int> 3227 <string key="NSFrame">{{135, 2 10}, {296, 18}}</string>3226 <string key="NSFrame">{{135, 230}, {296, 18}}</string> 3228 3227 <reference key="NSSuperview" ref="538122014"/> 3229 3228 <bool key="NSEnabled">YES</bool> … … 3244 3243 </object> 3245 3244 </object> 3245 <object class="NSButton" id="1042006550"> 3246 <reference key="NSNextResponder" ref="538122014"/> 3247 <int key="NSvFlags">256</int> 3248 <string key="NSFrame">{{135, 190}, {294, 18}}</string> 3249 <reference key="NSSuperview" ref="538122014"/> 3250 <bool key="NSEnabled">YES</bool> 3251 <object class="NSButtonCell" key="NSCell" id="548071836"> 3252 <int key="NSCellFlags">67239424</int> 3253 <int key="NSCellFlags2">0</int> 3254 <string key="NSContents">Use local peer discovery for public torrents</string> 3255 <reference key="NSSupport" ref="86725571"/> 3256 <reference key="NSControlView" ref="1042006550"/> 3257 <int key="NSButtonFlags">1211912703</int> 3258 <int key="NSButtonFlags2">2</int> 3259 <reference key="NSNormalImage" ref="1001726176"/> 3260 <reference key="NSAlternateImage" ref="764913887"/> 3261 <string key="NSAlternateContents"/> 3262 <string key="NSKeyEquivalent"/> 3263 <int key="NSPeriodicDelay">200</int> 3264 <int key="NSPeriodicInterval">25</int> 3265 </object> 3266 </object> 3246 3267 <object class="NSButton" id="72739699"> 3247 3268 <reference key="NSNextResponder" ref="538122014"/> 3248 3269 <int key="NSvFlags">256</int> 3249 <string key="NSFrame">{{135, 190}, {347, 18}}</string>3270 <string key="NSFrame">{{135, 210}, {347, 18}}</string> 3250 3271 <reference key="NSSuperview" ref="538122014"/> 3251 3272 <bool key="NSEnabled">YES</bool> … … 3269 3290 <reference key="NSNextResponder" ref="538122014"/> 3270 3291 <int key="NSvFlags">256</int> 3271 <string key="NSFrame">{{134, 2 32}, {379, 14}}</string>3292 <string key="NSFrame">{{134, 252}, {379, 14}}</string> 3272 3293 <reference key="NSSuperview" ref="538122014"/> 3273 3294 <bool key="NSEnabled">YES</bool> … … 3421 3442 </object> 3422 3443 </object> 3423 <string key="NSFrameSize">{542, 318}</string> 3444 <string key="NSFrameSize">{542, 342}</string> 3445 <reference key="NSSuperview"/> 3424 3446 <string key="NSClassName">NSView</string> 3425 3447 <string key="NSExtension">NSResponder</string> … … 4517 4539 <object class="NSMutableArray" key="NSDeclaredKeys"> 4518 4540 <bool key="EncodedWithXMLCoder">YES</bool> 4519 <string> MagnetOpenAsk</string>4541 <string>LocalPeerDiscoveryGlobal</string> 4520 4542 </object> 4521 4543 <bool key="NSSharedInstance">YES</bool> … … 7863 7885 <int key="connectionID">1950</int> 7864 7886 </object> 7887 <object class="IBConnectionRecord"> 7888 <object class="IBActionConnection" key="connection"> 7889 <string key="label">setLDS:</string> 7890 <reference key="source" ref="511492310"/> 7891 <reference key="destination" ref="1042006550"/> 7892 </object> 7893 <int key="connectionID">1955</int> 7894 </object> 7895 <object class="IBConnectionRecord"> 7896 <object class="IBBindingConnection" key="connection"> 7897 <string key="label">value: values.LocalPeerDiscoveryGlobal</string> 7898 <reference key="source" ref="1042006550"/> 7899 <reference key="destination" ref="356871564"/> 7900 <object class="NSNibBindingConnector" key="connector"> 7901 <reference key="NSSource" ref="1042006550"/> 7902 <reference key="NSDestination" ref="356871564"/> 7903 <string key="NSLabel">value: values.LocalPeerDiscoveryGlobal</string> 7904 <string key="NSBinding">value</string> 7905 <string key="NSKeyPath">values.LocalPeerDiscoveryGlobal</string> 7906 <int key="NSNibBindingConnectorVersion">2</int> 7907 </object> 7908 </object> 7909 <int key="connectionID">1956</int> 7910 </object> 7865 7911 </object> 7866 7912 <object class="IBMutableOrderedSet" key="objectRecords"> … … 9251 9297 <reference ref="1064247210"/> 9252 9298 <reference ref="72739699"/> 9299 <reference ref="1042006550"/> 9253 9300 </object> 9254 9301 <reference key="parent" ref="0"/> … … 10664 10711 <reference key="object" ref="372147059"/> 10665 10712 <reference key="parent" ref="326342301"/> 10713 </object> 10714 <object class="IBObjectRecord"> 10715 <int key="objectID">1951</int> 10716 <reference key="object" ref="1042006550"/> 10717 <object class="NSMutableArray" key="children"> 10718 <bool key="EncodedWithXMLCoder">YES</bool> 10719 <reference ref="548071836"/> 10720 </object> 10721 <reference key="parent" ref="538122014"/> 10722 </object> 10723 <object class="IBObjectRecord"> 10724 <int key="objectID">1952</int> 10725 <reference key="object" ref="548071836"/> 10726 <reference key="parent" ref="1042006550"/> 10666 10727 </object> 10667 10728 </object> … … 11068 11129 <string>195.IBPluginDependency</string> 11069 11130 <string>195.ImportedFromIB2</string> 11131 <string>1951.IBPluginDependency</string> 11132 <string>1951.ImportedFromIB2</string> 11133 <string>1952.IBPluginDependency</string> 11070 11134 <string>196.IBPluginDependency</string> 11071 11135 <string>196.ImportedFromIB2</string> … … 11383 11447 <real value="1"/> 11384 11448 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11385 <string>{{371, 336}, {542, 318}}</string>11449 <string>{{371, 494}, {542, 342}}</string> 11386 11450 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11387 11451 <real value="1"/> … … 11671 11735 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11672 11736 <real value="1"/> 11737 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11738 <real value="1"/> 11739 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11673 11740 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11674 11741 <real value="1"/> … … 11899 11966 </object> 11900 11967 <nil key="sourceID"/> 11901 <int key="maxID">195 0</int>11968 <int key="maxID">1956</int> 11902 11969 </object> 11903 11970 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 12073 12140 <string>setEncryptionMode:</string> 12074 12141 <string>setGlobalLimit:</string> 12142 <string>setLDS:</string> 12075 12143 <string>setNat:</string> 12076 12144 <string>setPEX:</string> … … 12163 12231 <string>id</string> 12164 12232 <string>id</string> 12233 <string>id</string> 12165 12234 </object> 12166 12235 </object>
Note: See TracChangeset
for help on using the changeset viewer.
