Changeset 6085
- Timestamp:
- Jun 8, 2008, 3:54:34 PM (14 years ago)
- Location:
- trunk/macosx
- Files:
-
- 3 edited
-
English.lproj/InfoWindow.xib (modified) (11 diffs)
-
InfoWindowController.m (modified) (9 diffs)
-
Torrent.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/English.lproj/InfoWindow.xib
r6077 r6085 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value="1 030"/>11 <integer value="1766"/> 12 12 </object> 13 13 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 2142 2142 <string key="NSFrame">{{1, 1}, {360, 143}}</string> 2143 2143 <reference key="NSSuperview" ref="754568592"/> 2144 <reference key="NSNextKeyView" ref="423972458"/> 2144 2145 <reference key="NSDocView" ref="423972458"/> 2145 2146 <reference key="NSBGColor" ref="987864771"/> … … 2170 2171 <string key="NSFrame">{{10, 202}, {362, 145}}</string> 2171 2172 <reference key="NSSuperview" ref="296911506"/> 2173 <reference key="NSNextKeyView" ref="198254095"/> 2172 2174 <int key="NSsFlags">530</int> 2173 2175 <reference key="NSVScroller" ref="964808471"/> … … 3940 3942 <reference key="NSNextResponder" ref="252354812"/> 3941 3943 <int key="NSvFlags">-2147483392</int> 3942 <string key="NSFrame">{{ -22, 0}, {12, 17}}</string>3944 <string key="NSFrame">{{328, 0}, {12, 17}}</string> 3943 3945 <reference key="NSSuperview" ref="252354812"/> 3944 3946 </object> … … 3947 3949 <object class="NSTableColumn" id="459964989"> 3948 3950 <string key="NSIdentifier">Address</string> 3949 <double key="NSWidth"> 3.350000e+02</double>3951 <double key="NSWidth">2.940000e+02</double> 3950 3952 <double key="NSMinWidth">1.000000e+01</double> 3951 3953 <double key="NSMaxWidth">1.000000e+04</double> … … 3967 3969 <reference key="NSTextColor" ref="534079857"/> 3968 3970 </object> 3969 <int key="NSResizingMask"> 1</int>3971 <int key="NSResizingMask">3</int> 3970 3972 <bool key="NSIsResizeable">YES</bool> 3971 3973 <reference key="NSTableView" ref="705721384"/> 3974 <object class="NSSortDescriptor" key="NSSortDescriptorPrototype"> 3975 <string key="NSKey">Address</string> 3976 <bool key="NSAscending">YES</bool> 3977 <string key="NSSelector">caseInsensitiveCompare:</string> 3978 </object> 3979 </object> 3980 <object class="NSTableColumn" id="651742019"> 3981 <string key="NSIdentifier">DL From</string> 3982 <double key="NSWidth">3.800000e+01</double> 3983 <double key="NSMinWidth">1.800000e+01</double> 3984 <double key="NSMaxWidth">6.000000e+01</double> 3985 <object class="NSTableHeaderCell" key="NSHeaderCell"> 3986 <int key="NSCellFlags">75628032</int> 3987 <int key="NSCellFlags2">0</int> 3988 <string key="NSContents">DL</string> 3989 <reference key="NSSupport" ref="26"/> 3990 <reference key="NSBackgroundColor" ref="665452585"/> 3991 <reference key="NSTextColor" ref="390741217"/> 3992 </object> 3993 <object class="NSTextFieldCell" key="NSDataCell" id="513647075"> 3994 <int key="NSCellFlags">337772096</int> 3995 <int key="NSCellFlags2">2048</int> 3996 <string key="NSContents">Text Cell</string> 3997 <reference key="NSSupport" ref="615908458"/> 3998 <reference key="NSControlView" ref="705721384"/> 3999 <reference key="NSBackgroundColor" ref="987864771"/> 4000 <reference key="NSTextColor" ref="534079857"/> 4001 </object> 4002 <int key="NSResizingMask">2</int> 4003 <bool key="NSIsResizeable">YES</bool> 4004 <reference key="NSTableView" ref="705721384"/> 4005 <object class="NSSortDescriptor" key="NSSortDescriptorPrototype"> 4006 <string key="NSKey">DL From Rate</string> 4007 <bool key="NSAscending">YES</bool> 4008 <string key="NSSelector">compare:</string> 4009 </object> 3972 4010 </object> 3973 4011 </object> … … 3977 4015 <reference key="NSGridColor" ref="705909853"/> 3978 4016 <double key="NSRowHeight">1.400000e+01</double> 3979 <int key="NSTvFlags">-759169024</int> 3980 <int key="NSColumnAutoresizingStyle">4</int> 4017 <int key="NSTvFlags">-742359040</int> 4018 <string key="NSAutosaveName">InspectorTableWebSeeds</string> 4019 <int key="NSColumnAutoresizingStyle">1</int> 3981 4020 <int key="NSDraggingSourceMaskForLocal">15</int> 3982 4021 <int key="NSDraggingSourceMaskForNonLocal">0</int> … … 3994 4033 <reference key="NSNextResponder" ref="252354812"/> 3995 4034 <int key="NSvFlags">-2147483392</int> 3996 <string key="NSFrame">{{328, 17}, {11, 96}}</string>4035 <string key="NSFrame">{{328, 17}, {11, 37}}</string> 3997 4036 <reference key="NSSuperview" ref="252354812"/> 3998 4037 <int key="NSsFlags">256</int> 3999 4038 <reference key="NSTarget" ref="252354812"/> 4000 4039 <string key="NSAction">_doScroller:</string> 4001 <double key="NSPercent"> 8.658537e-01</double>4040 <double key="NSPercent">7.708333e-01</double> 4002 4041 </object> 4003 4042 <object class="NSScroller" id="904154524"> 4004 4043 <reference key="NSNextResponder" ref="252354812"/> 4005 4044 <int key="NSvFlags">-2147483392</int> 4006 <string key="NSFrame">{{1, 113}, {327, 11}}</string>4045 <string key="NSFrame">{{1, 54}, {327, 11}}</string> 4007 4046 <reference key="NSSuperview" ref="252354812"/> 4008 4047 <int key="NSsFlags">257</int> 4009 4048 <reference key="NSTarget" ref="252354812"/> 4010 4049 <string key="NSAction">_doScroller:</string> 4011 <double key="NSPercent">8. 387097e-01</double>4050 <double key="NSPercent">8.918206e-01</double> 4012 4051 </object> 4013 4052 <object class="NSClipView" id="238219887"> … … 8144 8183 <bool key="EncodedWithXMLCoder">YES</bool> 8145 8184 <reference ref="459964989"/> 8185 <reference ref="651742019"/> 8146 8186 </object> 8147 8187 <reference key="parent" ref="252354812"/> … … 8160 8200 <reference key="object" ref="305150555"/> 8161 8201 <reference key="parent" ref="459964989"/> 8202 </object> 8203 <object class="IBObjectRecord"> 8204 <int key="objectID">1786</int> 8205 <reference key="object" ref="651742019"/> 8206 <object class="NSMutableArray" key="children"> 8207 <bool key="EncodedWithXMLCoder">YES</bool> 8208 <reference ref="513647075"/> 8209 </object> 8210 <reference key="parent" ref="705721384"/> 8211 </object> 8212 <object class="IBObjectRecord"> 8213 <int key="objectID">1787</int> 8214 <reference key="object" ref="513647075"/> 8215 <reference key="parent" ref="651742019"/> 8162 8216 </object> 8163 8217 </object> … … 8982 9036 </object> 8983 9037 <nil key="sourceID"/> 8984 <int key="maxID">178 5</int>9038 <int key="maxID">1787</int> 8985 9039 </object> 8986 9040 <object class="IBClassDescriber" key="IBDocument.Classes"> -
trunk/macosx/InfoWindowController.m
r6084 r6085 155 155 sortDescriptorPrototype]]]; 156 156 157 //initially sort webseed table by address 158 if ([[fWebSeedTable sortDescriptors] count] == 0) 159 [fWebSeedTable setSortDescriptors: [NSArray arrayWithObject: [[fWebSeedTable tableColumnWithIdentifier: @"Address"] 160 sortDescriptorPrototype]]]; 161 157 162 //set table header tool tips 158 163 if ([NSApp isOnLeopardOrBetter]) … … 166 171 [[fPeerTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Peer", 167 172 "inspector -> peer table -> header tool tip")]; 173 174 #warning add tooltip for webseeds? 175 [[fWebSeedTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Web Seeder", 176 "inspector -> peer table -> header tool tip")]; 168 177 } 169 178 else … … 215 224 [fWebSeeds release]; 216 225 [fTrackers release]; 226 227 [fWebSeedTableAnimation release]; 217 228 218 229 [super dealloc]; … … 365 376 [fPeers release]; 366 377 fPeers = nil; 378 [fPeerTable reloadData]; 367 379 368 380 [fWebSeeds release]; 369 381 fWebSeeds = nil; 382 [fWebSeedTable reloadData]; 370 383 [self setWebSeederTableHidden: YES animate: YES]; 371 384 … … 472 485 [self updateOptions]; 473 486 487 //reload tables that won't change every update 474 488 [fTrackerTable setTrackers: fTrackers]; 475 489 [fTrackerTable reloadData]; 476 477 [fWebSeedTable reloadData];478 #warning check if should just be reloaded when not 1 torrent479 [fPeerTable reloadData];480 490 } 481 491 … … 853 863 else if (tableView == fWebSeedTable) 854 864 { 855 return [fWebSeeds objectAtIndex: row]; 865 NSString * ident = [column identifier]; 866 NSDictionary * webSeed = [fWebSeeds objectAtIndex: row]; 867 868 if ([ident isEqualToString: @"DL From"]) 869 { 870 NSNumber * rate; 871 return (rate = [webSeed objectForKey: @"DL From Rate"]) ? [NSString stringForSpeedAbbrev: [rate floatValue]] : @""; 872 } 873 else 874 return [webSeed objectForKey: @"Address"]; 856 875 } 857 876 else if (tableView == fTrackerTable) … … 884 903 } 885 904 } 905 else if (tableView == fWebSeedTable) 906 { 907 if (fWebSeeds) 908 { 909 NSArray * oldWebSeeds = fWebSeeds; 910 fWebSeeds = [[fWebSeeds sortedArrayUsingDescriptors: [fWebSeedTable sortDescriptors]] retain]; 911 [oldWebSeeds release]; 912 [tableView reloadData]; 913 } 914 } 915 else; 886 916 } 887 917 … … 1435 1465 [fPeers release]; 1436 1466 fPeers = [[[torrent peers] sortedArrayUsingDescriptors: [self peerSortDescriptors]] retain]; 1437 1438 1467 [fPeerTable reloadData]; 1468 1469 [fWebSeeds release]; 1470 fWebSeeds = [[[torrent webSeeders] sortedArrayUsingDescriptors: [fWebSeedTable sortDescriptors]] retain]; 1471 [fWebSeedTable reloadData]; 1439 1472 } 1440 1473 … … 1513 1546 fWebSeedTableAnimation = [[NSViewAnimation alloc] initWithViewAnimations: 1514 1547 [NSArray arrayWithObjects: webSeedDict, peerDict, nil]]; 1515 [fWebSeedTableAnimation setDuration: 0.1 ];1548 [fWebSeedTableAnimation setDuration: 0.125]; 1516 1549 [fWebSeedTableAnimation setAnimationBlockingMode: NSAnimationNonblocking]; 1517 1550 [fWebSeedTableAnimation setDelegate: self]; -
trunk/macosx/Torrent.m
r6077 r6085 1023 1023 1024 1024 for (i = 0; i < webSeedCount; i++) 1025 [webSeeders addObject: [NSString stringWithUTF8String: fInfo->webseeds[i]]]; 1025 { 1026 NSMutableDictionary * dict = [NSMutableDictionary dictionaryWithCapacity: 2]; 1027 1028 [dict setObject: [NSString stringWithUTF8String: fInfo->webseeds[i]] forKey: @"Address"]; 1029 1030 /*if (webSeeders->isDownloadingFrom) 1031 [dict setObject: [NSNumber numberWithFloat: peer->downloadFromRate] forKey: @"DL From Rate"];*/ 1032 1033 [webSeeders addObject: dict]; 1034 } 1026 1035 1027 1036 return webSeeders;
Note: See TracChangeset
for help on using the changeset viewer.
