Changeset 7296
- Timestamp:
- Dec 6, 2008, 2:59:04 AM (14 years ago)
- Location:
- trunk/macosx
- Files:
-
- 5 edited
-
Controller.m (modified) (1 diff)
-
Defaults.plist (modified) (2 diffs)
-
PrefsController.h (modified) (1 diff)
-
PrefsController.m (modified) (3 diffs)
-
en.lproj/PrefsWindow.xib (modified) (31 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Controller.m
r7290 r7296 525 525 526 526 //registering the Web UI to Bonjour 527 if ([fDefaults boolForKey: @"RPC"] )527 if ([fDefaults boolForKey: @"RPC"] && [fDefaults boolForKey: @"RPCWebDiscovery"]) 528 528 [[BonjourController defaultController] startWithPort: [fDefaults integerForKey: @"RPCPort"]]; 529 529 } -
trunk/macosx/Defaults.plist
r7153 r7296 121 121 <key>QueueSeedNumber</key> 122 122 <integer>3</integer> 123 <key>RatioCheck</key> 124 <false/> 125 <key>RatioLimit</key> 126 <integer>2</integer> 123 127 <key>RPC</key> 124 128 <false/> … … 131 135 <key>RPCUsername</key> 132 136 <string>admin</string> 133 <key>R atioCheck</key>137 <key>RPCWebDiscovery</key> 134 138 <false/> 135 <key>RatioLimit</key>136 <integer>2</integer>137 139 <key>SUEnableAutomaticChecks</key> 138 140 <true/> -
trunk/macosx/PrefsController.h
r7184 r7296 134 134 - (void) setRPCPort: (id) sender; 135 135 - (void) setRPCUseWhitelist: (id) sender; 136 - (void) setRPCWebUIDiscovery: (id) sender; 136 137 - (void) updateRPCWhitelist; 137 138 - (void) addRemoveRPCIP: (id) sender; -
trunk/macosx/PrefsController.m
r7290 r7296 824 824 tr_sessionSetRPCEnabled(fHandle, enable); 825 825 826 //Registering the Web UI to Bonjour 827 if (enable) 828 [[BonjourController defaultController] startWithPort: [fDefaults integerForKey: @"RPCPort"]]; 829 else 830 [[BonjourController defaultController] stop]; 826 [self setRPCWebUIDiscovery: nil]; 831 827 } 832 828 … … 880 876 tr_sessionSetRPCPort(fHandle, port); 881 877 882 //Registering the Web UI to Bonjour 883 if ([fDefaults boolForKey:@"RPC"]) 884 [[BonjourController defaultController] startWithPort: port]; 878 [self setRPCWebUIDiscovery: nil]; 885 879 } 886 880 … … 888 882 { 889 883 tr_sessionSetRPCWhitelistEnabled(fHandle, [fDefaults boolForKey: @"RPCUseWhitelist"]); 884 } 885 886 - (void) setRPCWebUIDiscovery: (id) sender 887 { 888 if ([fDefaults boolForKey:@"RPC"] && [fDefaults boolForKey: @"RPCWebDiscovery"]) 889 [[BonjourController defaultController] startWithPort: [fDefaults integerForKey: @"RPCPort"]]; 890 else 891 [[BonjourController defaultController] stop]; 890 892 } 891 893 -
trunk/macosx/en.lproj/PrefsWindow.xib
r7216 r7296 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value="66"/> 12 <integer value="1760"/> 11 <integer value="1481"/> 13 12 </object> 14 13 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 1528 1527 </object> 1529 1528 <object class="NSCustomView" id="284666863"> 1530 < referencekey="NSNextResponder"/>1529 <nil key="NSNextResponder"/> 1531 1530 <int key="NSvFlags">256</int> 1532 1531 <object class="NSMutableArray" key="NSSubviews"> … … 3048 3047 <string key="NSFrame">{{1, 1}, {141, 169}}</string> 3049 3048 <reference key="NSSuperview" ref="544077474"/> 3050 <reference key="NSNextKeyView" ref="638525082"/>3051 3049 <reference key="NSDocView" ref="638525082"/> 3052 3050 <reference key="NSBGColor" ref="729660797"/> … … 3076 3074 <string key="NSFrame">{{20, 49}, {143, 171}}</string> 3077 3075 <reference key="NSSuperview" ref="284666863"/> 3078 <reference key="NSNextKeyView" ref="568562479"/>3079 3076 <int key="NSsFlags">530</int> 3080 3077 <reference key="NSVScroller" ref="287972127"/> … … 3285 3282 </object> 3286 3283 <string key="NSFrameSize">{535, 240}</string> 3287 <reference key="NSSuperview"/>3288 3284 <string key="NSClassName">NSView</string> 3289 3285 </object> … … 4341 4337 </object> 4342 4338 <object class="NSCustomView" id="204700639"> 4343 < referencekey="NSNextResponder"/>4339 <nil key="NSNextResponder"/> 4344 4340 <int key="NSvFlags">256</int> 4345 4341 <object class="NSMutableArray" key="NSSubviews"> … … 4927 4923 </object> 4928 4924 <string key="NSFrameSize">{535, 319}</string> 4929 <reference key="NSSuperview"/>4930 4925 <string key="NSClassName">NSView</string> 4931 4926 <string key="NSExtension">NSResponder</string> 4932 4927 </object> 4933 4928 <object class="NSCustomView" id="810116101"> 4934 < nilkey="NSNextResponder"/>4929 <reference key="NSNextResponder"/> 4935 4930 <int key="NSvFlags">256</int> 4936 4931 <object class="NSMutableArray" key="NSSubviews"> … … 4939 4934 <reference key="NSNextResponder" ref="810116101"/> 4940 4935 <int key="NSvFlags">256</int> 4941 <string key="NSFrame">{{ 100, 220}, {96, 17}}</string>4936 <string key="NSFrame">{{77, 254}, {96, 17}}</string> 4942 4937 <reference key="NSSuperview" ref="810116101"/> 4943 4938 <bool key="NSEnabled">YES</bool> … … 4955 4950 <reference key="NSNextResponder" ref="810116101"/> 4956 4951 <int key="NSvFlags">256</int> 4957 <string key="NSFrame">{{1 23, 262}, {68, 17}}</string>4952 <string key="NSFrame">{{100, 296}, {68, 17}}</string> 4958 4953 <reference key="NSSuperview" ref="810116101"/> 4959 4954 <bool key="NSEnabled">YES</bool> … … 4971 4966 <reference key="NSNextResponder" ref="810116101"/> 4972 4967 <int key="NSvFlags">256</int> 4973 <string key="NSFrame">{{ 120, 288}, {71, 17}}</string>4968 <string key="NSFrame">{{97, 322}, {71, 17}}</string> 4974 4969 <reference key="NSSuperview" ref="810116101"/> 4975 4970 <bool key="NSEnabled">YES</bool> … … 4987 4982 <reference key="NSNextResponder" ref="810116101"/> 4988 4983 <int key="NSvFlags">256</int> 4989 <string key="NSFrame">{{ 202, 218}, {50, 22}}</string>4984 <string key="NSFrame">{{179, 252}, {50, 22}}</string> 4990 4985 <reference key="NSSuperview" ref="810116101"/> 4991 4986 <bool key="NSEnabled">YES</bool> … … 5053 5048 <reference key="NSNextResponder" ref="810116101"/> 5054 5049 <int key="NSvFlags">256</int> 5055 <string key="NSFrame">{{ 82, 407}, {158, 18}}</string>5050 <string key="NSFrame">{{59, 441}, {158, 18}}</string> 5056 5051 <reference key="NSSuperview" ref="810116101"/> 5057 5052 <bool key="NSEnabled">YES</bool> … … 5072 5067 </object> 5073 5068 </object> 5069 <object class="NSButton" id="3575"> 5070 <reference key="NSNextResponder" ref="810116101"/> 5071 <int key="NSvFlags">256</int> 5072 <string key="NSFrame">{{78, 34}, {398, 18}}</string> 5073 <reference key="NSSuperview" ref="810116101"/> 5074 <bool key="NSEnabled">YES</bool> 5075 <object class="NSButtonCell" key="NSCell" id="105041185"> 5076 <int key="NSCellFlags">67239424</int> 5077 <int key="NSCellFlags2">0</int> 5078 <string key="NSContents">Display the web interface on the local network with Bonjour</string> 5079 <reference key="NSSupport" ref="86725571"/> 5080 <reference key="NSControlView" ref="3575"/> 5081 <int key="NSButtonFlags">1211912703</int> 5082 <int key="NSButtonFlags2">2</int> 5083 <reference key="NSNormalImage" ref="1001726176"/> 5084 <reference key="NSAlternateImage" ref="764913887"/> 5085 <string key="NSAlternateContents"/> 5086 <string key="NSKeyEquivalent"/> 5087 <int key="NSPeriodicDelay">200</int> 5088 <int key="NSPeriodicInterval">25</int> 5089 </object> 5090 </object> 5074 5091 <object class="NSButton" id="151618662"> 5075 5092 <reference key="NSNextResponder" ref="810116101"/> 5076 5093 <int key="NSvFlags">256</int> 5077 <string key="NSFrame">{{ 101, 312}, {165, 18}}</string>5094 <string key="NSFrame">{{78, 346}, {165, 18}}</string> 5078 5095 <reference key="NSSuperview" ref="810116101"/> 5079 5096 <bool key="NSEnabled">YES</bool> … … 5097 5114 <reference key="NSNextResponder" ref="810116101"/> 5098 5115 <int key="NSvFlags">256</int> 5099 <string key="NSFrame">{{ 101, 182}, {332, 18}}</string>5116 <string key="NSFrame">{{78, 216}, {332, 18}}</string> 5100 5117 <reference key="NSSuperview" ref="810116101"/> 5101 5118 <bool key="NSEnabled">YES</bool> … … 5119 5136 <reference key="NSNextResponder" ref="810116101"/> 5120 5137 <int key="NSvFlags">256</int> 5121 <string key="NSFrame">{{ 100, 391}, {318, 14}}</string>5138 <string key="NSFrame">{{77, 425}, {318, 14}}</string> 5122 5139 <reference key="NSSuperview" ref="810116101"/> 5123 5140 <bool key="NSEnabled">YES</bool> … … 5135 5152 <reference key="NSNextResponder" ref="810116101"/> 5136 5153 <int key="NSvFlags">256</int> 5137 <string key="NSFrame">{{1 96, 260}, {184, 22}}</string>5154 <string key="NSFrame">{{173, 294}, {184, 22}}</string> 5138 5155 <reference key="NSSuperview" ref="810116101"/> 5139 5156 <bool key="NSEnabled">YES</bool> … … 5269 5286 <reference ref="1018053122"/> 5270 5287 </object> 5271 <string key="NSFrame">{{1 23, 63}, {308, 113}}</string>5288 <string key="NSFrame">{{100, 97}, {308, 113}}</string> 5272 5289 <reference key="NSSuperview" ref="810116101"/> 5273 5290 <reference key="NSNextKeyView" ref="206862330"/> … … 5283 5300 <reference key="NSNextResponder" ref="810116101"/> 5284 5301 <int key="NSvFlags">292</int> 5285 <string key="NSFrame">{{1 23, 35}, {67, 23}}</string>5302 <string key="NSFrame">{{100, 69}, {67, 23}}</string> 5286 5303 <reference key="NSSuperview" ref="810116101"/> 5287 5304 <bool key="NSEnabled">YES</bool> … … 5315 5332 <reference key="NSNextResponder" ref="810116101"/> 5316 5333 <int key="NSvFlags">256</int> 5317 <string key="NSFrame">{{1 95, 39}, {196, 14}}</string>5334 <string key="NSFrame">{{172, 73}, {196, 14}}</string> 5318 5335 <reference key="NSSuperview" ref="810116101"/> 5319 5336 <bool key="NSEnabled">YES</bool> … … 5331 5348 <reference key="NSNextResponder" ref="810116101"/> 5332 5349 <int key="NSvFlags">256</int> 5333 <string key="NSFrame">{{1 96, 286}, {184, 22}}</string>5350 <string key="NSFrame">{{173, 320}, {184, 22}}</string> 5334 5351 <reference key="NSSuperview" ref="810116101"/> 5335 5352 <bool key="NSEnabled">YES</bool> … … 5368 5385 <reference key="NSNextResponder" ref="810116101"/> 5369 5386 <int key="NSvFlags">256</int> 5370 <string key="NSFrame">{{ 103, 347}, {149, 25}}</string>5387 <string key="NSFrame">{{80, 381}, {149, 25}}</string> 5371 5388 <reference key="NSSuperview" ref="810116101"/> 5372 5389 <bool key="NSEnabled">YES</bool> … … 5387 5404 </object> 5388 5405 </object> 5389 <string key="NSFrameSize">{535, 443}</string> 5406 <string key="NSFrameSize">{535, 477}</string> 5407 <reference key="NSSuperview"/> 5390 5408 <string key="NSClassName">NSView</string> 5391 5409 <string key="NSExtension">NSResponder</string> 5392 5410 </object> 5393 5411 <object class="NSUserDefaultsController" id="356871564"> 5412 <object class="NSMutableArray" key="NSDeclaredKeys"> 5413 <bool key="EncodedWithXMLCoder">YES</bool> 5414 <string>RPC</string> 5415 <string>RPCWebDiscovery</string> 5416 </object> 5394 5417 <bool key="NSSharedInstance">YES</bool> 5395 5418 </object> … … 8472 8495 <int key="connectionID">1822</int> 8473 8496 </object> 8497 <object class="IBConnectionRecord"> 8498 <object class="IBBindingConnection" key="connection"> 8499 <string key="label">enabled: values.RPC</string> 8500 <reference key="source" ref="3575"/> 8501 <reference key="destination" ref="356871564"/> 8502 <object class="NSNibBindingConnector" key="connector"> 8503 <reference key="NSSource" ref="3575"/> 8504 <reference key="NSDestination" ref="356871564"/> 8505 <string key="NSLabel">enabled: values.RPC</string> 8506 <string key="NSBinding">enabled</string> 8507 <string key="NSKeyPath">values.RPC</string> 8508 <int key="NSNibBindingConnectorVersion">2</int> 8509 </object> 8510 </object> 8511 <int key="connectionID">1827</int> 8512 </object> 8513 <object class="IBConnectionRecord"> 8514 <object class="IBBindingConnection" key="connection"> 8515 <string key="label">value: values.RPCWebDiscovery</string> 8516 <reference key="source" ref="3575"/> 8517 <reference key="destination" ref="356871564"/> 8518 <object class="NSNibBindingConnector" key="connector"> 8519 <reference key="NSSource" ref="3575"/> 8520 <reference key="NSDestination" ref="356871564"/> 8521 <string key="NSLabel">value: values.RPCWebDiscovery</string> 8522 <string key="NSBinding">value</string> 8523 <string key="NSKeyPath">values.RPCWebDiscovery</string> 8524 <int key="NSNibBindingConnectorVersion">2</int> 8525 </object> 8526 </object> 8527 <int key="connectionID">1828</int> 8528 </object> 8529 <object class="IBConnectionRecord"> 8530 <object class="IBActionConnection" key="connection"> 8531 <string key="label">setRPCWebUIDiscovery:</string> 8532 <reference key="source" ref="511492310"/> 8533 <reference key="destination" ref="3575"/> 8534 </object> 8535 <int key="connectionID">1829</int> 8536 </object> 8474 8537 </object> 8475 8538 <object class="IBMutableOrderedSet" key="objectRecords"> … … 10161 10224 <reference ref="52925771"/> 10162 10225 <reference ref="264419599"/> 10226 <reference ref="3575"/> 10163 10227 </object> 10164 10228 <reference key="parent" ref="37013934"/> … … 11008 11072 <reference key="object" ref="810991095"/> 11009 11073 <reference key="parent" ref="415414007"/> 11074 </object> 11075 <object class="IBObjectRecord"> 11076 <int key="objectID">1825</int> 11077 <reference key="object" ref="3575"/> 11078 <object class="NSMutableArray" key="children"> 11079 <bool key="EncodedWithXMLCoder">YES</bool> 11080 <reference ref="105041185"/> 11081 </object> 11082 <reference key="parent" ref="810116101"/> 11083 </object> 11084 <object class="IBObjectRecord"> 11085 <int key="objectID">1826</int> 11086 <reference key="object" ref="105041185"/> 11087 <reference key="parent" ref="3575"/> 11010 11088 </object> 11011 11089 </object> … … 11355 11433 <string>1823.ImportedFromIB2</string> 11356 11434 <string>1824.IBPluginDependency</string> 11435 <string>1825.IBPluginDependency</string> 11436 <string>1825.ImportedFromIB2</string> 11437 <string>1826.IBPluginDependency</string> 11357 11438 <string>190.IBPluginDependency</string> 11358 11439 <string>190.ImportedFromIB2</string> … … 11733 11814 <reference ref="761722050"/> 11734 11815 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11735 <string>{{179, 3 77}, {535, 443}}</string>11816 <string>{{179, 343}, {535, 477}}</string> 11736 11817 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11737 11818 <reference ref="761722050"/> … … 11893 11974 <reference ref="50227240"/> 11894 11975 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11976 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11977 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11978 <real value="1.000000e+00"/> 11895 11979 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 11896 11980 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> … … 12125 12209 </object> 12126 12210 <nil key="sourceID"/> 12127 <int key="maxID">182 4</int>12211 <int key="maxID">1829</int> 12128 12212 </object> 12129 12213 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 12303 12387 <string>setRPCUseWhitelist:</string> 12304 12388 <string>setRPCUsername:</string> 12389 <string>setRPCWebUIDiscovery:</string> 12305 12390 <string>setRatioStop:</string> 12306 12391 <string>setSound:</string> … … 12358 12443 <string>id</string> 12359 12444 <string>id</string> 12445 <string>id</string> 12360 12446 </object> 12361 12447 </object>
Note: See TracChangeset
for help on using the changeset viewer.
