Changeset 6076
- Timestamp:
- Jun 7, 2008, 11:38:05 PM (14 years ago)
- Location:
- trunk/macosx
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/English.lproj/InfoWindow.xib
r5998 r6076 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value="1066"/> 12 <integer value="1615"/> 11 <integer value="1030"/> 13 12 </object> 14 13 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 1690 1689 </object> 1691 1690 <object class="NSCustomView" id="296911506"> 1692 < referencekey="NSNextResponder"/>1691 <nil key="NSNextResponder"/> 1693 1692 <int key="NSvFlags">274</int> 1694 1693 <object class="NSMutableArray" key="NSSubviews"> … … 2143 2142 <string key="NSFrame">{{1, 1}, {360, 143}}</string> 2144 2143 <reference key="NSSuperview" ref="754568592"/> 2145 <reference key="NSNextKeyView" ref="423972458"/>2146 2144 <reference key="NSDocView" ref="423972458"/> 2147 2145 <reference key="NSBGColor" ref="987864771"/> … … 2172 2170 <string key="NSFrame">{{10, 202}, {362, 145}}</string> 2173 2171 <reference key="NSSuperview" ref="296911506"/> 2174 <reference key="NSNextKeyView" ref="198254095"/>2175 2172 <int key="NSsFlags">530</int> 2176 2173 <reference key="NSVScroller" ref="964808471"/> … … 2218 2215 </object> 2219 2216 <string key="NSFrameSize">{382, 352}</string> 2220 <reference key="NSSuperview"/>2221 2217 <object class="NSMutableString" key="NSClassName"> 2222 2218 <characters key="NS.bytes">NSView</characters> … … 2225 2221 </object> 2226 2222 <object class="NSCustomView" id="180459949"> 2227 < nilkey="NSNextResponder"/>2223 <reference key="NSNextResponder"/> 2228 2224 <int key="NSvFlags">274</int> 2229 2225 <object class="NSMutableArray" key="NSSubviews"> … … 2242 2238 <reference key="NSNextResponder" ref="386870512"/> 2243 2239 <int key="NSvFlags">256</int> 2244 <string key="NSFrameSize">{338, 242}</string>2240 <string key="NSFrameSize">{338, 168}</string> 2245 2241 <reference key="NSSuperview" ref="386870512"/> 2246 2242 <bool key="NSEnabled">YES</bool> … … 3861 3857 <int key="NSDraggingSourceMaskForLocal">15</int> 3862 3858 <int key="NSDraggingSourceMaskForNonLocal">0</int> 3863 <bool key="NSAllowsTypeSelect"> YES</bool>3859 <bool key="NSAllowsTypeSelect">NO</bool> 3864 3860 </object> 3865 3861 </object> 3866 <string key="NSFrame">{{1, 17}, {338, 242}}</string>3862 <string key="NSFrame">{{1, 17}, {338, 168}}</string> 3867 3863 <reference key="NSSuperview" ref="1009918777"/> 3868 3864 <reference key="NSNextKeyView" ref="221969066"/> … … 3874 3870 <reference key="NSNextResponder" ref="1009918777"/> 3875 3871 <int key="NSvFlags">-2147483392</int> 3876 <string key="NSFrame">{{ 89, 17}, {11, 72}}</string>3872 <string key="NSFrame">{{328, 17}, {11, 117}}</string> 3877 3873 <reference key="NSSuperview" ref="1009918777"/> 3878 3874 <int key="NSsFlags">256</int> 3879 3875 <reference key="NSTarget" ref="1009918777"/> 3880 3876 <string key="NSAction">_doScroller:</string> 3881 <double key="NSPercent"> 8.658537e-01</double>3877 <double key="NSPercent">9.922481e-01</double> 3882 3878 </object> 3883 3879 <object class="NSScroller" id="38561669"> 3884 3880 <reference key="NSNextResponder" ref="1009918777"/> 3885 3881 <int key="NSvFlags">-2147483392</int> 3886 <string key="NSFrame">{{1, 248}, {338, 11}}</string>3882 <string key="NSFrame">{{1, 134}, {327, 11}}</string> 3887 3883 <reference key="NSSuperview" ref="1009918777"/> 3888 3884 <int key="NSsFlags">257</int> … … 3907 3903 <reference ref="209659011"/> 3908 3904 </object> 3909 <string key="NSFrame">{{10, 77}, {340, 260}}</string>3905 <string key="NSFrame">{{10, 77}, {340, 186}}</string> 3910 3906 <reference key="NSSuperview" ref="180459949"/> 3911 3907 <reference key="NSNextKeyView" ref="386870512"/> … … 3918 3914 <bytes key="NSScrollAmts">AAAAAAAAAABBgAAAQYAAAA</bytes> 3919 3915 </object> 3916 <object class="NSScrollView" id="510604261"> 3917 <reference key="NSNextResponder" ref="180459949"/> 3918 <int key="NSvFlags">266</int> 3919 <object class="NSMutableArray" key="NSSubviews"> 3920 <bool key="EncodedWithXMLCoder">YES</bool> 3921 <object class="NSClipView" id="720563950"> 3922 <reference key="NSNextResponder" ref="510604261"/> 3923 <int key="NSvFlags">2304</int> 3924 <object class="NSMutableArray" key="NSSubviews"> 3925 <bool key="EncodedWithXMLCoder">YES</bool> 3926 <object class="NSTableView" id="199255624"> 3927 <reference key="NSNextResponder" ref="720563950"/> 3928 <int key="NSvFlags">256</int> 3929 <string key="NSFrameSize">{338, 48}</string> 3930 <reference key="NSSuperview" ref="720563950"/> 3931 <bool key="NSEnabled">YES</bool> 3932 <object class="NSTableHeaderView" key="NSHeaderView" id="463743773"> 3933 <reference key="NSNextResponder" ref="337636121"/> 3934 <int key="NSvFlags">256</int> 3935 <string key="NSFrameSize">{338, 17}</string> 3936 <reference key="NSSuperview" ref="337636121"/> 3937 <reference key="NSTableView" ref="199255624"/> 3938 </object> 3939 <object class="_NSCornerView" key="NSCornerView" id="56407696"> 3940 <reference key="NSNextResponder" ref="510604261"/> 3941 <int key="NSvFlags">-2147483392</int> 3942 <string key="NSFrame">{{-22, 0}, {12, 17}}</string> 3943 <reference key="NSSuperview" ref="510604261"/> 3944 </object> 3945 <object class="NSMutableArray" key="NSTableColumns"> 3946 <bool key="EncodedWithXMLCoder">YES</bool> 3947 <object class="NSTableColumn" id="530145251"> 3948 <string key="NSIdentifier">Address</string> 3949 <double key="NSWidth">3.350000e+02</double> 3950 <double key="NSMinWidth">1.000000e+01</double> 3951 <double key="NSMaxWidth">1.000000e+04</double> 3952 <object class="NSTableHeaderCell" key="NSHeaderCell"> 3953 <int key="NSCellFlags">67239424</int> 3954 <int key="NSCellFlags2">0</int> 3955 <string key="NSContents">Web Seeders</string> 3956 <reference key="NSSupport" ref="26"/> 3957 <reference key="NSBackgroundColor" ref="665452585"/> 3958 <reference key="NSTextColor" ref="390741217"/> 3959 </object> 3960 <object class="NSTextFieldCell" key="NSDataCell" id="273130535"> 3961 <int key="NSCellFlags">337772096</int> 3962 <int key="NSCellFlags2">2048</int> 3963 <string key="NSContents">Text Cell</string> 3964 <reference key="NSSupport" ref="26"/> 3965 <reference key="NSControlView" ref="199255624"/> 3966 <reference key="NSBackgroundColor" ref="987864771"/> 3967 <reference key="NSTextColor" ref="534079857"/> 3968 </object> 3969 <int key="NSResizingMask">1</int> 3970 <bool key="NSIsResizeable">YES</bool> 3971 <reference key="NSTableView" ref="199255624"/> 3972 </object> 3973 </object> 3974 <double key="NSIntercellSpacingWidth">3.000000e+00</double> 3975 <double key="NSIntercellSpacingHeight">2.000000e+00</double> 3976 <reference key="NSBackgroundColor" ref="880039277"/> 3977 <reference key="NSGridColor" ref="705909853"/> 3978 <double key="NSRowHeight">1.400000e+01</double> 3979 <int key="NSTvFlags">-759169024</int> 3980 <int key="NSColumnAutoresizingStyle">4</int> 3981 <int key="NSDraggingSourceMaskForLocal">15</int> 3982 <int key="NSDraggingSourceMaskForNonLocal">0</int> 3983 <bool key="NSAllowsTypeSelect">NO</bool> 3984 </object> 3985 </object> 3986 <string key="NSFrame">{{1, 17}, {338, 48}}</string> 3987 <reference key="NSSuperview" ref="510604261"/> 3988 <reference key="NSNextKeyView" ref="199255624"/> 3989 <reference key="NSDocView" ref="199255624"/> 3990 <reference key="NSBGColor" ref="987864771"/> 3991 <int key="NScvFlags">4</int> 3992 </object> 3993 <object class="NSScroller" id="930703063"> 3994 <reference key="NSNextResponder" ref="510604261"/> 3995 <int key="NSvFlags">-2147483392</int> 3996 <string key="NSFrame">{{328, 17}, {11, 96}}</string> 3997 <reference key="NSSuperview" ref="510604261"/> 3998 <int key="NSsFlags">256</int> 3999 <reference key="NSTarget" ref="510604261"/> 4000 <string key="NSAction">_doScroller:</string> 4001 <double key="NSPercent">8.658537e-01</double> 4002 </object> 4003 <object class="NSScroller" id="468891034"> 4004 <reference key="NSNextResponder" ref="510604261"/> 4005 <int key="NSvFlags">-2147483392</int> 4006 <string key="NSFrame">{{1, 113}, {327, 11}}</string> 4007 <reference key="NSSuperview" ref="510604261"/> 4008 <int key="NSsFlags">257</int> 4009 <reference key="NSTarget" ref="510604261"/> 4010 <string key="NSAction">_doScroller:</string> 4011 <double key="NSPercent">8.387097e-01</double> 4012 </object> 4013 <object class="NSClipView" id="337636121"> 4014 <reference key="NSNextResponder" ref="510604261"/> 4015 <int key="NSvFlags">2304</int> 4016 <object class="NSMutableArray" key="NSSubviews"> 4017 <bool key="EncodedWithXMLCoder">YES</bool> 4018 <reference ref="463743773"/> 4019 </object> 4020 <string key="NSFrame">{{1, 0}, {338, 17}}</string> 4021 <reference key="NSSuperview" ref="510604261"/> 4022 <reference key="NSNextKeyView" ref="463743773"/> 4023 <reference key="NSDocView" ref="463743773"/> 4024 <reference key="NSBGColor" ref="987864771"/> 4025 <int key="NScvFlags">4</int> 4026 </object> 4027 <reference ref="56407696"/> 4028 </object> 4029 <string key="NSFrame">{{10, 271}, {340, 66}}</string> 4030 <reference key="NSSuperview" ref="180459949"/> 4031 <reference key="NSNextKeyView" ref="720563950"/> 4032 <int key="NSsFlags">562</int> 4033 <reference key="NSVScroller" ref="930703063"/> 4034 <reference key="NSHScroller" ref="468891034"/> 4035 <reference key="NSContentView" ref="720563950"/> 4036 <reference key="NSHeaderClipView" ref="337636121"/> 4037 <reference key="NSCornerView" ref="56407696"/> 4038 <bytes key="NSScrollAmts">AAAAAAAAAABBgAAAQYAAAA</bytes> 4039 </object> 3920 4040 <object class="NSTextField" id="1005919072"> 3921 4041 <reference key="NSNextResponder" ref="180459949"/> … … 4135 4255 </object> 4136 4256 <string key="NSFrameSize">{360, 342}</string> 4257 <reference key="NSSuperview"/> 4137 4258 <string key="NSClassName">NSView</string> 4138 4259 <string key="NSExtension">NSResponder</string> … … 4337 4458 </object> 4338 4459 <object class="NSCustomView" id="1005910882"> 4339 < referencekey="NSNextResponder"/>4460 <nil key="NSNextResponder"/> 4340 4461 <int key="NSvFlags">258</int> 4341 4462 <object class="NSMutableArray" key="NSSubviews"> … … 4992 5113 </object> 4993 5114 <string key="NSFrameSize">{351, 161}</string> 4994 <reference key="NSSuperview"/>4995 5115 <object class="NSMutableString" key="NSClassName"> 4996 5116 <characters key="NS.bytes">NSView</characters> … … 5708 5828 </object> 5709 5829 <int key="connectionID">1765</int> 5830 </object> 5831 <object class="IBConnectionRecord"> 5832 <object class="IBOutletConnection" key="connection"> 5833 <string key="label">fWebSeedTable</string> 5834 <reference key="source" ref="1016287627"/> 5835 <reference key="destination" ref="199255624"/> 5836 </object> 5837 <int key="connectionID">1783</int> 5838 </object> 5839 <object class="IBConnectionRecord"> 5840 <object class="IBOutletConnection" key="connection"> 5841 <string key="label">dataSource</string> 5842 <reference key="source" ref="199255624"/> 5843 <reference key="destination" ref="1016287627"/> 5844 </object> 5845 <int key="connectionID">1784</int> 5846 </object> 5847 <object class="IBConnectionRecord"> 5848 <object class="IBOutletConnection" key="connection"> 5849 <string key="label">delegate</string> 5850 <reference key="source" ref="199255624"/> 5851 <reference key="destination" ref="1016287627"/> 5852 </object> 5853 <int key="connectionID">1785</int> 5710 5854 </object> 5711 5855 </object> … … 6443 6587 <reference ref="501494805"/> 6444 6588 <reference ref="5853845"/> 6589 <reference ref="510604261"/> 6445 6590 </object> 6446 6591 <reference key="parent" ref="261172737"/> … … 7965 8110 <reference key="object" ref="586936794"/> 7966 8111 <reference key="parent" ref="899994514"/> 8112 </object> 8113 <object class="IBObjectRecord"> 8114 <int key="objectID">1766</int> 8115 <reference key="object" ref="510604261"/> 8116 <object class="NSMutableArray" key="children"> 8117 <bool key="EncodedWithXMLCoder">YES</bool> 8118 <reference ref="463743773"/> 8119 <reference ref="468891034"/> 8120 <reference ref="930703063"/> 8121 <reference ref="199255624"/> 8122 </object> 8123 <reference key="parent" ref="180459949"/> 8124 </object> 8125 <object class="IBObjectRecord"> 8126 <int key="objectID">1767</int> 8127 <reference key="object" ref="463743773"/> 8128 <reference key="parent" ref="510604261"/> 8129 </object> 8130 <object class="IBObjectRecord"> 8131 <int key="objectID">1768</int> 8132 <reference key="object" ref="468891034"/> 8133 <reference key="parent" ref="510604261"/> 8134 </object> 8135 <object class="IBObjectRecord"> 8136 <int key="objectID">1769</int> 8137 <reference key="object" ref="930703063"/> 8138 <reference key="parent" ref="510604261"/> 8139 </object> 8140 <object class="IBObjectRecord"> 8141 <int key="objectID">1770</int> 8142 <reference key="object" ref="199255624"/> 8143 <object class="NSMutableArray" key="children"> 8144 <bool key="EncodedWithXMLCoder">YES</bool> 8145 <reference ref="530145251"/> 8146 </object> 8147 <reference key="parent" ref="510604261"/> 8148 </object> 8149 <object class="IBObjectRecord"> 8150 <int key="objectID">1772</int> 8151 <reference key="object" ref="530145251"/> 8152 <object class="NSMutableArray" key="children"> 8153 <bool key="EncodedWithXMLCoder">YES</bool> 8154 <reference ref="273130535"/> 8155 </object> 8156 <reference key="parent" ref="199255624"/> 8157 </object> 8158 <object class="IBObjectRecord"> 8159 <int key="objectID">1781</int> 8160 <reference key="object" ref="273130535"/> 8161 <reference key="parent" ref="530145251"/> 7967 8162 </object> 7968 8163 </object> … … 8255 8450 <string>1753.IBPluginDependency</string> 8256 8451 <string>1754.IBPluginDependency</string> 8452 <string>1766.IBPluginDependency</string> 8453 <string>1766.ImportedFromIB2</string> 8454 <string>1767.IBShouldRemoveOnLegacySave</string> 8455 <string>1768.IBShouldRemoveOnLegacySave</string> 8456 <string>1769.IBShouldRemoveOnLegacySave</string> 8457 <string>1770.IBPluginDependency</string> 8458 <string>1770.ImportedFromIB2</string> 8459 <string>1772.IBPluginDependency</string> 8460 <string>1772.ImportedFromIB2</string> 8461 <string>1781.IBShouldRemoveOnLegacySave</string> 8257 8462 <string>28.IBPluginDependency</string> 8258 8463 <string>28.ImportedFromIB2</string> … … 8425 8630 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8426 8631 <reference ref="9"/> 8427 <string>{{ 42, 607}, {360, 342}}</string>8632 <string>{{634, 496}, {360, 342}}</string> 8428 8633 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8429 8634 <reference ref="9"/> … … 8643 8848 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8644 8849 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8850 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8851 <reference ref="9"/> 8852 <reference ref="9"/> 8853 <reference ref="9"/> 8854 <reference ref="9"/> 8855 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8856 <reference ref="9"/> 8857 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8858 <reference ref="9"/> 8859 <reference ref="9"/> 8645 8860 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 8646 8861 <reference ref="9"/> … … 8767 8982 </object> 8768 8983 <nil key="sourceID"/> 8769 <int key="maxID">17 65</int>8984 <int key="maxID">1785</int> 8770 8985 </object> 8771 8986 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 8948 9163 <string>fUploadedTotalField</string> 8949 9164 <string>fUploadingToField</string> 9165 <string>fWebSeedTable</string> 8950 9166 </object> 8951 9167 <object class="NSMutableArray" key="dict.values"> … … 9014 9230 <string>NSTextField</string> 9015 9231 <string>NSTextField</string> 9232 <string>NSTableView</string> 9016 9233 </object> 9017 9234 </object> -
trunk/macosx/InfoWindowController.h
r5998 r6076 33 33 @interface InfoWindowController : NSWindowController 34 34 { 35 NSArray * fTorrents , * fPeers;35 NSArray * fTorrents; 36 36 NSMutableArray * fTrackers; 37 37 … … 57 57 IBOutlet NSTextField * fAnnounceAddressField, * fAnnounceLastField, * fAnnounceResponseField, * fAnnounceNextField, 58 58 * fScrapeAddressField, * fScrapeLastField, * fScrapeResponseField, * fScrapeNextField; 59 60 IBOutlet NSTableView * fPeerTable; 59 60 NSArray * fPeers, * fWebSeeds; 61 IBOutlet NSTableView * fPeerTable, * fWebSeedTable; 61 62 IBOutlet NSTextField * fConnectedPeersField, * fDownloadingFromField, * fUploadingToField, * fKnownField, 62 63 * fSeedersField, * fLeechersField, * fCompletedFromTrackerField; -
trunk/macosx/InfoWindowController.m
r6048 r6076 205 205 [fTorrents release]; 206 206 [fPeers release]; 207 [fWebSeeds release]; 207 208 [fTrackers release]; 208 209 … … 357 358 fPeers = nil; 358 359 360 [fWebSeeds release]; 361 fWebSeeds = nil; 362 359 363 [fTrackers release]; 360 364 fTrackers = nil; … … 441 445 [fPiecesView setTorrent: torrent]; 442 446 447 //get webseers for table 448 [fWebSeeds release]; 449 fWebSeeds = [[torrent webSeeders] retain]; 450 443 451 //get trackers for table 444 452 [fTrackers release]; … … 457 465 [fTrackerTable reloadData]; 458 466 467 [fWebSeedTable reloadData]; 468 #warning check if should just be reloaded when not 1 torrent 459 469 [fPeerTable reloadData]; 460 470 } … … 772 782 if (tableView == fPeerTable) 773 783 return fPeers ? [fPeers count] : 0; 784 else if (tableView == fWebSeedTable) 785 return fWebSeeds ? [fWebSeeds count] : 0; 774 786 else if (tableView == fTrackerTable) 775 787 return fTrackers ? [fTrackers count] : 0; … … 802 814 else 803 815 return [peer objectForKey: @"IP"]; 816 } 817 else if (tableView == fWebSeedTable) 818 { 819 return [fWebSeeds objectAtIndex: row]; 804 820 } 805 821 else if (tableView == fTrackerTable) -
trunk/macosx/Torrent.h
r6048 r6076 190 190 191 191 - (NSArray *) peers; 192 - (NSArray *) webSeeders; 192 193 193 194 - (NSString *) progressString; -
trunk/macosx/Torrent.m
r6048 r6076 1017 1017 } 1018 1018 1019 #warning store? 1020 - (NSArray *) webSeeders 1021 { 1022 int webSeedCount = fInfo->webseedCount, i; 1023 NSMutableArray * webSeeders = [NSMutableArray arrayWithCapacity: webSeedCount]; 1024 1025 for (i = 0; i < webSeedCount; i++) 1026 [webSeeders addObject: [NSString stringWithUTF8String: fInfo->webseeds[i]]]; 1027 1028 return webSeeders; 1029 } 1030 1019 1031 - (NSString *) progressString 1020 1032 {
Note: See TracChangeset
for help on using the changeset viewer.