Changeset 6077
- Timestamp:
- Jun 8, 2008, 1:17:36 AM (15 years ago)
- Location:
- trunk/macosx
- Files:
-
- 4 edited
-
English.lproj/InfoWindow.xib (modified) (13 diffs)
-
InfoWindowController.h (modified) (1 diff)
-
InfoWindowController.m (modified) (6 diffs)
-
Torrent.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/English.lproj/InfoWindow.xib
r6076 r6077 2238 2238 <reference key="NSNextResponder" ref="386870512"/> 2239 2239 <int key="NSvFlags">256</int> 2240 <string key="NSFrameSize">{338, 1 68}</string>2240 <string key="NSFrameSize">{338, 172}</string> 2241 2241 <reference key="NSSuperview" ref="386870512"/> 2242 2242 <bool key="NSEnabled">YES</bool> … … 3860 3860 </object> 3861 3861 </object> 3862 <string key="NSFrame">{{1, 17}, {338, 1 68}}</string>3862 <string key="NSFrame">{{1, 17}, {338, 172}}</string> 3863 3863 <reference key="NSSuperview" ref="1009918777"/> 3864 3864 <reference key="NSNextKeyView" ref="221969066"/> … … 3903 3903 <reference ref="209659011"/> 3904 3904 </object> 3905 <string key="NSFrame">{{10, 77}, {340, 1 86}}</string>3905 <string key="NSFrame">{{10, 77}, {340, 190}}</string> 3906 3906 <reference key="NSSuperview" ref="180459949"/> 3907 3907 <reference key="NSNextKeyView" ref="386870512"/> … … 3914 3914 <bytes key="NSScrollAmts">AAAAAAAAAABBgAAAQYAAAA</bytes> 3915 3915 </object> 3916 <object class="NSScrollView" id=" 510604261">3916 <object class="NSScrollView" id="252354812"> 3917 3917 <reference key="NSNextResponder" ref="180459949"/> 3918 3918 <int key="NSvFlags">266</int> 3919 3919 <object class="NSMutableArray" key="NSSubviews"> 3920 3920 <bool key="EncodedWithXMLCoder">YES</bool> 3921 <object class="NSClipView" id=" 720563950">3922 <reference key="NSNextResponder" ref=" 510604261"/>3921 <object class="NSClipView" id="230403242"> 3922 <reference key="NSNextResponder" ref="252354812"/> 3923 3923 <int key="NSvFlags">2304</int> 3924 3924 <object class="NSMutableArray" key="NSSubviews"> 3925 3925 <bool key="EncodedWithXMLCoder">YES</bool> 3926 <object class="NSTableView" id=" 199255624">3927 <reference key="NSNextResponder" ref=" 720563950"/>3926 <object class="NSTableView" id="705721384"> 3927 <reference key="NSNextResponder" ref="230403242"/> 3928 3928 <int key="NSvFlags">256</int> 3929 3929 <string key="NSFrameSize">{338, 48}</string> 3930 <reference key="NSSuperview" ref=" 720563950"/>3930 <reference key="NSSuperview" ref="230403242"/> 3931 3931 <bool key="NSEnabled">YES</bool> 3932 <object class="NSTableHeaderView" key="NSHeaderView" id=" 463743773">3933 <reference key="NSNextResponder" ref=" 337636121"/>3932 <object class="NSTableHeaderView" key="NSHeaderView" id="842629001"> 3933 <reference key="NSNextResponder" ref="238219887"/> 3934 3934 <int key="NSvFlags">256</int> 3935 3935 <string key="NSFrameSize">{338, 17}</string> 3936 <reference key="NSSuperview" ref=" 337636121"/>3937 <reference key="NSTableView" ref=" 199255624"/>3936 <reference key="NSSuperview" ref="238219887"/> 3937 <reference key="NSTableView" ref="705721384"/> 3938 3938 </object> 3939 <object class="_NSCornerView" key="NSCornerView" id=" 56407696">3940 <reference key="NSNextResponder" ref=" 510604261"/>3939 <object class="_NSCornerView" key="NSCornerView" id="336297981"> 3940 <reference key="NSNextResponder" ref="252354812"/> 3941 3941 <int key="NSvFlags">-2147483392</int> 3942 3942 <string key="NSFrame">{{-22, 0}, {12, 17}}</string> 3943 <reference key="NSSuperview" ref=" 510604261"/>3943 <reference key="NSSuperview" ref="252354812"/> 3944 3944 </object> 3945 3945 <object class="NSMutableArray" key="NSTableColumns"> 3946 3946 <bool key="EncodedWithXMLCoder">YES</bool> 3947 <object class="NSTableColumn" id=" 530145251">3947 <object class="NSTableColumn" id="459964989"> 3948 3948 <string key="NSIdentifier">Address</string> 3949 3949 <double key="NSWidth">3.350000e+02</double> … … 3958 3958 <reference key="NSTextColor" ref="390741217"/> 3959 3959 </object> 3960 <object class="NSTextFieldCell" key="NSDataCell" id=" 273130535">3960 <object class="NSTextFieldCell" key="NSDataCell" id="305150555"> 3961 3961 <int key="NSCellFlags">337772096</int> 3962 3962 <int key="NSCellFlags2">2048</int> 3963 3963 <string key="NSContents">Text Cell</string> 3964 3964 <reference key="NSSupport" ref="26"/> 3965 <reference key="NSControlView" ref=" 199255624"/>3965 <reference key="NSControlView" ref="705721384"/> 3966 3966 <reference key="NSBackgroundColor" ref="987864771"/> 3967 3967 <reference key="NSTextColor" ref="534079857"/> … … 3969 3969 <int key="NSResizingMask">1</int> 3970 3970 <bool key="NSIsResizeable">YES</bool> 3971 <reference key="NSTableView" ref=" 199255624"/>3971 <reference key="NSTableView" ref="705721384"/> 3972 3972 </object> 3973 3973 </object> … … 3985 3985 </object> 3986 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"/>3987 <reference key="NSSuperview" ref="252354812"/> 3988 <reference key="NSNextKeyView" ref="705721384"/> 3989 <reference key="NSDocView" ref="705721384"/> 3990 3990 <reference key="NSBGColor" ref="987864771"/> 3991 3991 <int key="NScvFlags">4</int> 3992 3992 </object> 3993 <object class="NSScroller" id=" 930703063">3994 <reference key="NSNextResponder" ref=" 510604261"/>3993 <object class="NSScroller" id="58257122"> 3994 <reference key="NSNextResponder" ref="252354812"/> 3995 3995 <int key="NSvFlags">-2147483392</int> 3996 3996 <string key="NSFrame">{{328, 17}, {11, 96}}</string> 3997 <reference key="NSSuperview" ref=" 510604261"/>3997 <reference key="NSSuperview" ref="252354812"/> 3998 3998 <int key="NSsFlags">256</int> 3999 <reference key="NSTarget" ref=" 510604261"/>3999 <reference key="NSTarget" ref="252354812"/> 4000 4000 <string key="NSAction">_doScroller:</string> 4001 4001 <double key="NSPercent">8.658537e-01</double> 4002 4002 </object> 4003 <object class="NSScroller" id=" 468891034">4004 <reference key="NSNextResponder" ref=" 510604261"/>4003 <object class="NSScroller" id="904154524"> 4004 <reference key="NSNextResponder" ref="252354812"/> 4005 4005 <int key="NSvFlags">-2147483392</int> 4006 4006 <string key="NSFrame">{{1, 113}, {327, 11}}</string> 4007 <reference key="NSSuperview" ref=" 510604261"/>4007 <reference key="NSSuperview" ref="252354812"/> 4008 4008 <int key="NSsFlags">257</int> 4009 <reference key="NSTarget" ref=" 510604261"/>4009 <reference key="NSTarget" ref="252354812"/> 4010 4010 <string key="NSAction">_doScroller:</string> 4011 4011 <double key="NSPercent">8.387097e-01</double> 4012 4012 </object> 4013 <object class="NSClipView" id=" 337636121">4014 <reference key="NSNextResponder" ref=" 510604261"/>4013 <object class="NSClipView" id="238219887"> 4014 <reference key="NSNextResponder" ref="252354812"/> 4015 4015 <int key="NSvFlags">2304</int> 4016 4016 <object class="NSMutableArray" key="NSSubviews"> 4017 4017 <bool key="EncodedWithXMLCoder">YES</bool> 4018 <reference ref=" 463743773"/>4018 <reference ref="842629001"/> 4019 4019 </object> 4020 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"/>4021 <reference key="NSSuperview" ref="252354812"/> 4022 <reference key="NSNextKeyView" ref="842629001"/> 4023 <reference key="NSDocView" ref="842629001"/> 4024 4024 <reference key="NSBGColor" ref="987864771"/> 4025 4025 <int key="NScvFlags">4</int> 4026 4026 </object> 4027 <reference ref=" 56407696"/>4027 <reference ref="336297981"/> 4028 4028 </object> 4029 4029 <string key="NSFrame">{{10, 271}, {340, 66}}</string> 4030 4030 <reference key="NSSuperview" ref="180459949"/> 4031 <reference key="NSNextKeyView" ref=" 720563950"/>4031 <reference key="NSNextKeyView" ref="230403242"/> 4032 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"/>4033 <reference key="NSVScroller" ref="58257122"/> 4034 <reference key="NSHScroller" ref="904154524"/> 4035 <reference key="NSContentView" ref="230403242"/> 4036 <reference key="NSHeaderClipView" ref="238219887"/> 4037 <reference key="NSCornerView" ref="336297981"/> 4038 4038 <bytes key="NSScrollAmts">AAAAAAAAAABBgAAAQYAAAA</bytes> 4039 4039 </object> … … 5833 5833 <string key="label">fWebSeedTable</string> 5834 5834 <reference key="source" ref="1016287627"/> 5835 <reference key="destination" ref=" 199255624"/>5835 <reference key="destination" ref="705721384"/> 5836 5836 </object> 5837 5837 <int key="connectionID">1783</int> … … 5840 5840 <object class="IBOutletConnection" key="connection"> 5841 5841 <string key="label">dataSource</string> 5842 <reference key="source" ref=" 199255624"/>5842 <reference key="source" ref="705721384"/> 5843 5843 <reference key="destination" ref="1016287627"/> 5844 5844 </object> … … 5848 5848 <object class="IBOutletConnection" key="connection"> 5849 5849 <string key="label">delegate</string> 5850 <reference key="source" ref=" 199255624"/>5850 <reference key="source" ref="705721384"/> 5851 5851 <reference key="destination" ref="1016287627"/> 5852 5852 </object> … … 6587 6587 <reference ref="501494805"/> 6588 6588 <reference ref="5853845"/> 6589 <reference ref=" 510604261"/>6589 <reference ref="252354812"/> 6590 6590 </object> 6591 6591 <reference key="parent" ref="261172737"/> … … 8113 8113 <object class="IBObjectRecord"> 8114 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"/>8115 <reference key="object" ref="252354812"/> 8116 <object class="NSMutableArray" key="children"> 8117 <bool key="EncodedWithXMLCoder">YES</bool> 8118 <reference ref="842629001"/> 8119 <reference ref="904154524"/> 8120 <reference ref="58257122"/> 8121 <reference ref="705721384"/> 8122 8122 </object> 8123 8123 <reference key="parent" ref="180459949"/> … … 8125 8125 <object class="IBObjectRecord"> 8126 8126 <int key="objectID">1767</int> 8127 <reference key="object" ref=" 463743773"/>8128 <reference key="parent" ref=" 510604261"/>8127 <reference key="object" ref="842629001"/> 8128 <reference key="parent" ref="252354812"/> 8129 8129 </object> 8130 8130 <object class="IBObjectRecord"> 8131 8131 <int key="objectID">1768</int> 8132 <reference key="object" ref=" 468891034"/>8133 <reference key="parent" ref=" 510604261"/>8132 <reference key="object" ref="904154524"/> 8133 <reference key="parent" ref="252354812"/> 8134 8134 </object> 8135 8135 <object class="IBObjectRecord"> 8136 8136 <int key="objectID">1769</int> 8137 <reference key="object" ref=" 930703063"/>8138 <reference key="parent" ref=" 510604261"/>8137 <reference key="object" ref="58257122"/> 8138 <reference key="parent" ref="252354812"/> 8139 8139 </object> 8140 8140 <object class="IBObjectRecord"> 8141 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"/>8142 <reference key="object" ref="705721384"/> 8143 <object class="NSMutableArray" key="children"> 8144 <bool key="EncodedWithXMLCoder">YES</bool> 8145 <reference ref="459964989"/> 8146 </object> 8147 <reference key="parent" ref="252354812"/> 8148 8148 </object> 8149 8149 <object class="IBObjectRecord"> 8150 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"/>8151 <reference key="object" ref="459964989"/> 8152 <object class="NSMutableArray" key="children"> 8153 <bool key="EncodedWithXMLCoder">YES</bool> 8154 <reference ref="305150555"/> 8155 </object> 8156 <reference key="parent" ref="705721384"/> 8157 8157 </object> 8158 8158 <object class="IBObjectRecord"> 8159 8159 <int key="objectID">1781</int> 8160 <reference key="object" ref=" 273130535"/>8161 <reference key="parent" ref=" 530145251"/>8160 <reference key="object" ref="305150555"/> 8161 <reference key="parent" ref="459964989"/> 8162 8162 </object> 8163 8163 </object> -
trunk/macosx/InfoWindowController.h
r6076 r6077 65 65 IBOutlet PiecesView * fPiecesView; 66 66 IBOutlet NSSegmentedControl * fPiecesControl; 67 BOOL fWebSeedTableHidden; 68 float fPeerTableHeight, fWebSeedTableOrigin; 67 69 68 70 IBOutlet FileOutlineController * fFileController; -
trunk/macosx/InfoWindowController.m
r6076 r6077 73 73 - (NSView *) tabViewForTag: (int) tag; 74 74 - (NSArray *) peerSortDescriptors; 75 - (void) setWebSeederTableHidden: (BOOL) hidden animate: (BOOL) animate; 75 76 76 77 - (void) addTrackers; … … 172 173 [fTrackerAddRemoveControl setLabel: @"-" forSegment: TRACKER_REMOVE_TAG]; 173 174 } 175 176 //prepare for animating peer table and web seed table 177 fWebSeedTableHidden = NO; 178 fPeerTableHeight = [[fPeerTable enclosingScrollView] frame].size.height; 179 fWebSeedTableOrigin = [[fWebSeedTable enclosingScrollView] frame].origin.y; 180 181 [self setWebSeederTableHidden: YES animate: NO]; 174 182 175 183 //set blank inspector … … 360 368 [fWebSeeds release]; 361 369 fWebSeeds = nil; 370 [self setWebSeederTableHidden: YES animate: YES]; 362 371 363 372 [fTrackers release]; … … 368 377 } 369 378 else 370 { 379 { 371 380 Torrent * torrent = [fTorrents objectAtIndex: 0]; 372 381 … … 448 457 [fWebSeeds release]; 449 458 fWebSeeds = [[torrent webSeeders] retain]; 459 [self setWebSeederTableHidden: [fWebSeeds count] == 0 animate: YES]; 450 460 451 461 //get trackers for table … … 1430 1440 } 1431 1441 1442 - (void) setWebSeederTableHidden: (BOOL) hidden animate: (BOOL) animate 1443 { 1444 if (hidden == fWebSeedTableHidden) 1445 return; 1446 1447 fWebSeedTableHidden = hidden; 1448 1449 if (![NSApp isOnLeopardOrBetter]) 1450 animate = NO; 1451 1452 NSRect webSeedFrame = [[fWebSeedTable enclosingScrollView] frame]; 1453 NSRect peerFrame = [[fPeerTable enclosingScrollView] frame]; 1454 1455 if (hidden) 1456 { 1457 float webSeedFrameMaxY = NSMaxY(webSeedFrame); 1458 peerFrame.size.height = webSeedFrameMaxY - peerFrame.origin.y; 1459 1460 webSeedFrame.origin.y = webSeedFrameMaxY; 1461 webSeedFrame.size.height = 0; 1462 } 1463 else 1464 { 1465 peerFrame.size.height = fPeerTableHeight; 1466 1467 webSeedFrame.size.height = webSeedFrame.origin.y - fWebSeedTableOrigin; 1468 webSeedFrame.origin.y = fWebSeedTableOrigin; 1469 } 1470 1471 //actually resize tables 1472 [NSAnimationContext beginGrouping]; 1473 1474 [[[fWebSeedTable enclosingScrollView] animator] setFrame: webSeedFrame]; 1475 [[[fPeerTable enclosingScrollView] animator] setFrame: peerFrame]; 1476 1477 [NSAnimationContext endGrouping]; 1478 } 1479 1432 1480 - (NSArray *) peerSortDescriptors 1433 1481 { -
trunk/macosx/Torrent.m
r6076 r6077 1017 1017 } 1018 1018 1019 #warning store?1020 1019 - (NSArray *) webSeeders 1021 1020 {
Note: See TracChangeset
for help on using the changeset viewer.
