Changeset 13296
- Timestamp:
- May 14, 2012, 12:00:19 AM (9 years ago)
- Location:
- trunk/macosx
- Files:
-
- 5 edited
-
FileOutlineController.h (modified) (1 diff)
-
FileOutlineController.m (modified) (1 diff)
-
InfoFileView.xib (modified) (19 diffs)
-
InfoFileViewController.h (modified) (2 diffs)
-
InfoFileViewController.m (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/FileOutlineController.h
r13251 r13296 48 48 - (void) setCheck: (id) sender; 49 49 - (void) setOnlySelectedCheck: (id) sender; 50 - (void) checkAll; 51 - (void) uncheckAll; 50 52 - (void) setPriority: (id) sender; 51 53 -
trunk/macosx/FileOutlineController.m
r13251 r13296 379 379 } 380 380 381 - (void) checkAll 382 { 383 NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])]; 384 [fTorrent setFileCheckState: NSOnState forIndexes: indexSet]; 385 [fOutline setNeedsDisplay: YES]; 386 } 387 388 - (void) uncheckAll 389 { 390 NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])]; 391 [fTorrent setFileCheckState: NSOffState forIndexes: indexSet]; 392 [fOutline setNeedsDisplay: YES]; 393 } 394 381 395 - (void) setPriority: (id) sender 382 396 { -
trunk/macosx/InfoFileView.xib
r12940 r13296 3 3 <data> 4 4 <int key="IBDocument.SystemTarget">1060</int> 5 <string key="IBDocument.SystemVersion">11 B26</string>6 <string key="IBDocument.InterfaceBuilderVersion"> 1617</string>7 <string key="IBDocument.AppKitVersion">1138 </string>8 <string key="IBDocument.HIToolboxVersion">56 6.00</string>5 <string key="IBDocument.SystemVersion">11E53</string> 6 <string key="IBDocument.InterfaceBuilderVersion">2182</string> 7 <string key="IBDocument.AppKitVersion">1138.47</string> 8 <string key="IBDocument.HIToolboxVersion">569.00</string> 9 9 <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> 10 10 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> 11 <string key="NS.object.0"> 1617</string>11 <string key="NS.object.0">2182</string> 12 12 </object> 13 13 <array key="IBDocument.IntegratedClassDependencies"> … … 16 16 <string>NSScrollView</string> 17 17 <string>NSSearchField</string> 18 <string>NSButton</string> 18 19 <string>NSCustomView</string> 19 20 <string>NSButtonCell</string> … … 26 27 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 27 28 </array> 28 <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/> 29 <object class="NSMutableDictionary" key="IBDocument.Metadata"> 30 <string key="NS.key.0">PluginDependencyRecalculationVersion</string> 31 <integer value="1" key="NS.object.0"/> 32 </object> 29 33 <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> 30 34 <object class="NSCustomObject" id="1001"> … … 38 42 </object> 39 43 <object class="NSCustomView" id="30097843"> 40 < nilkey="NSNextResponder"/>44 <reference key="NSNextResponder"/> 41 45 <int key="NSvFlags">274</int> 42 46 <array class="NSMutableArray" key="NSSubviews"> 47 <object class="NSButton" id="38777799"> 48 <reference key="NSNextResponder" ref="30097843"/> 49 <int key="NSvFlags">289</int> 50 <string key="NSFrame">{{238, 10}, {42, 17}}</string> 51 <reference key="NSSuperview" ref="30097843"/> 52 <reference key="NSWindow"/> 53 <reference key="NSNextKeyView" ref="752853209"/> 54 <string key="NSReuseIdentifierKey">_NS:9</string> 55 <bool key="NSEnabled">YES</bool> 56 <object class="NSButtonCell" key="NSCell" id="788427236"> 57 <int key="NSCellFlags">-2080244224</int> 58 <int key="NSCellFlags2">134348800</int> 59 <string key="NSContents">All</string> 60 <object class="NSFont" key="NSSupport" id="26"> 61 <string key="NSName">LucidaGrande</string> 62 <double key="NSSize">11</double> 63 <int key="NSfFlags">3100</int> 64 </object> 65 <string key="NSCellIdentifier">_NS:9</string> 66 <reference key="NSControlView" ref="38777799"/> 67 <int key="NSButtonFlags">-2038152961</int> 68 <int key="NSButtonFlags2">164</int> 69 <string key="NSAlternateContents"/> 70 <string key="NSKeyEquivalent"/> 71 <int key="NSPeriodicDelay">400</int> 72 <int key="NSPeriodicInterval">75</int> 73 </object> 74 </object> 75 <object class="NSButton" id="752853209"> 76 <reference key="NSNextResponder" ref="30097843"/> 77 <int key="NSvFlags">289</int> 78 <string key="NSFrame">{{288, 10}, {42, 17}}</string> 79 <reference key="NSSuperview" ref="30097843"/> 80 <reference key="NSWindow"/> 81 <reference key="NSNextKeyView"/> 82 <string key="NSReuseIdentifierKey">_NS:9</string> 83 <bool key="NSEnabled">YES</bool> 84 <object class="NSButtonCell" key="NSCell" id="544969693"> 85 <int key="NSCellFlags">-2080244224</int> 86 <int key="NSCellFlags2">134348800</int> 87 <string key="NSContents">None</string> 88 <reference key="NSSupport" ref="26"/> 89 <string key="NSCellIdentifier">_NS:9</string> 90 <reference key="NSControlView" ref="752853209"/> 91 <int key="NSButtonFlags">-2038152961</int> 92 <int key="NSButtonFlags2">164</int> 93 <string key="NSAlternateContents"/> 94 <string key="NSKeyEquivalent"/> 95 <int key="NSPeriodicDelay">400</int> 96 <int key="NSPeriodicInterval">75</int> 97 </object> 98 </object> 43 99 <object class="NSScrollView" id="850988097"> 44 100 <reference key="NSNextResponder" ref="30097843"/> … … 54 110 <string key="NSFrameSize">{318, 324}</string> 55 111 <reference key="NSSuperview" ref="95499405"/> 112 <reference key="NSWindow"/> 113 <reference key="NSNextKeyView" ref="205767664"/> 56 114 <bool key="NSEnabled">YES</bool> 57 115 <object class="_NSCornerView" key="NSCornerView"> … … 70 128 <int key="NSCellFlags2">2048</int> 71 129 <string key="NSContents">Name</string> 72 <object class="NSFont" key="NSSupport" id="26"> 73 <string key="NSName">LucidaGrande</string> 74 <double key="NSSize">11</double> 75 <int key="NSfFlags">3100</int> 76 </object> 130 <reference key="NSSupport" ref="26"/> 77 131 <object class="NSColor" key="NSBackgroundColor"> 78 132 <int key="NSColorSpace">3</int> … … 213 267 <string key="NSFrame">{{1, 1}, {318, 324}}</string> 214 268 <reference key="NSSuperview" ref="850988097"/> 269 <reference key="NSWindow"/> 215 270 <reference key="NSNextKeyView" ref="553375370"/> 216 271 <reference key="NSDocView" ref="553375370"/> … … 223 278 <string key="NSFrame">{{304, 1}, {15, 324}}</string> 224 279 <reference key="NSSuperview" ref="850988097"/> 280 <reference key="NSWindow"/> 281 <reference key="NSNextKeyView" ref="558986626"/> 225 282 <reference key="NSTarget" ref="850988097"/> 226 283 <string key="NSAction">_doScroller:</string> … … 232 289 <string key="NSFrame">{{-100, -100}, {328, 15}}</string> 233 290 <reference key="NSSuperview" ref="850988097"/> 291 <reference key="NSWindow"/> 292 <reference key="NSNextKeyView" ref="95499405"/> 234 293 <int key="NSsFlags">1</int> 235 294 <reference key="NSTarget" ref="850988097"/> … … 240 299 <string key="NSFrame">{{10, 34}, {320, 326}}</string> 241 300 <reference key="NSSuperview" ref="30097843"/> 242 <reference key="NSNextKeyView" ref="95499405"/> 301 <reference key="NSWindow"/> 302 <reference key="NSNextKeyView" ref="401920833"/> 243 303 <int key="NSsFlags">133138</int> 244 304 <reference key="NSVScroller" ref="205767664"/> … … 252 312 <string key="NSFrame">{{10, 10}, {110, 19}}</string> 253 313 <reference key="NSSuperview" ref="30097843"/> 314 <reference key="NSWindow"/> 315 <reference key="NSNextKeyView" ref="38777799"/> 254 316 <bool key="NSEnabled">YES</bool> 255 317 <object class="NSSearchFieldCell" key="NSCell" id="28724714"> … … 306 368 </array> 307 369 <string key="NSFrameSize">{340, 365}</string> 370 <reference key="NSSuperview"/> 371 <reference key="NSWindow"/> 372 <reference key="NSNextKeyView" ref="850988097"/> 308 373 <object class="NSMutableString" key="NSClassName"> 309 374 <characters key="NS.bytes">NSView</characters> … … 326 391 </object> 327 392 <object class="IBConnectionRecord"> 393 <object class="IBActionConnection" key="connection"> 394 <string key="label">setFileFilterText:</string> 395 <reference key="source" ref="1001"/> 396 <reference key="destination" ref="558986626"/> 397 </object> 398 <int key="connectionID">21</int> 399 </object> 400 <object class="IBConnectionRecord"> 401 <object class="IBOutletConnection" key="connection"> 402 <string key="label">fFileFilterField</string> 403 <reference key="source" ref="1001"/> 404 <reference key="destination" ref="558986626"/> 405 </object> 406 <int key="connectionID">23</int> 407 </object> 408 <object class="IBConnectionRecord"> 409 <object class="IBOutletConnection" key="connection"> 410 <string key="label">view</string> 411 <reference key="source" ref="1001"/> 412 <reference key="destination" ref="30097843"/> 413 </object> 414 <int key="connectionID">24</int> 415 </object> 416 <object class="IBConnectionRecord"> 417 <object class="IBActionConnection" key="connection"> 418 <string key="label">checkAll:</string> 419 <reference key="source" ref="1001"/> 420 <reference key="destination" ref="38777799"/> 421 </object> 422 <int key="connectionID">29</int> 423 </object> 424 <object class="IBConnectionRecord"> 425 <object class="IBActionConnection" key="connection"> 426 <string key="label">uncheckAll:</string> 427 <reference key="source" ref="1001"/> 428 <reference key="destination" ref="752853209"/> 429 </object> 430 <int key="connectionID">30</int> 431 </object> 432 <object class="IBConnectionRecord"> 433 <object class="IBOutletConnection" key="connection"> 434 <string key="label">fCheckAllButton</string> 435 <reference key="source" ref="1001"/> 436 <reference key="destination" ref="38777799"/> 437 </object> 438 <int key="connectionID">31</int> 439 </object> 440 <object class="IBConnectionRecord"> 441 <object class="IBOutletConnection" key="connection"> 442 <string key="label">fUncheckAllButton</string> 443 <reference key="source" ref="1001"/> 444 <reference key="destination" ref="752853209"/> 445 </object> 446 <int key="connectionID">32</int> 447 </object> 448 <object class="IBConnectionRecord"> 449 <object class="IBOutletConnection" key="connection"> 450 <string key="label">dataSource</string> 451 <reference key="source" ref="553375370"/> 452 <reference key="destination" ref="576026135"/> 453 </object> 454 <int key="connectionID">19</int> 455 </object> 456 <object class="IBConnectionRecord"> 457 <object class="IBOutletConnection" key="connection"> 458 <string key="label">delegate</string> 459 <reference key="source" ref="553375370"/> 460 <reference key="destination" ref="576026135"/> 461 </object> 462 <int key="connectionID">20</int> 463 </object> 464 <object class="IBConnectionRecord"> 328 465 <object class="IBOutletConnection" key="connection"> 329 466 <string key="label">fOutline</string> … … 333 470 <int key="connectionID">18</int> 334 471 </object> 335 <object class="IBConnectionRecord">336 <object class="IBOutletConnection" key="connection">337 <string key="label">dataSource</string>338 <reference key="source" ref="553375370"/>339 <reference key="destination" ref="576026135"/>340 </object>341 <int key="connectionID">19</int>342 </object>343 <object class="IBConnectionRecord">344 <object class="IBOutletConnection" key="connection">345 <string key="label">delegate</string>346 <reference key="source" ref="553375370"/>347 <reference key="destination" ref="576026135"/>348 </object>349 <int key="connectionID">20</int>350 </object>351 <object class="IBConnectionRecord">352 <object class="IBActionConnection" key="connection">353 <string key="label">setFileFilterText:</string>354 <reference key="source" ref="1001"/>355 <reference key="destination" ref="558986626"/>356 </object>357 <int key="connectionID">21</int>358 </object>359 <object class="IBConnectionRecord">360 <object class="IBOutletConnection" key="connection">361 <string key="label">fFileFilterField</string>362 <reference key="source" ref="1001"/>363 <reference key="destination" ref="558986626"/>364 </object>365 <int key="connectionID">23</int>366 </object>367 <object class="IBConnectionRecord">368 <object class="IBOutletConnection" key="connection">369 <string key="label">view</string>370 <reference key="source" ref="1001"/>371 <reference key="destination" ref="30097843"/>372 </object>373 <int key="connectionID">24</int>374 </object>375 472 </array> 376 473 <object class="IBMutableOrderedSet" key="objectRecords"> … … 406 503 <reference ref="558986626"/> 407 504 <reference ref="850988097"/> 505 <reference ref="752853209"/> 506 <reference ref="38777799"/> 408 507 </array> 409 508 <reference key="parent" ref="0"/> … … 497 596 <reference key="parent" ref="0"/> 498 597 <string key="objectName">File Outline Controller</string> 598 </object> 599 <object class="IBObjectRecord"> 600 <int key="objectID">25</int> 601 <reference key="object" ref="752853209"/> 602 <array class="NSMutableArray" key="children"> 603 <reference ref="544969693"/> 604 </array> 605 <reference key="parent" ref="30097843"/> 606 </object> 607 <object class="IBObjectRecord"> 608 <int key="objectID">26</int> 609 <reference key="object" ref="544969693"/> 610 <reference key="parent" ref="752853209"/> 611 </object> 612 <object class="IBObjectRecord"> 613 <int key="objectID">27</int> 614 <reference key="object" ref="38777799"/> 615 <array class="NSMutableArray" key="children"> 616 <reference ref="788427236"/> 617 </array> 618 <reference key="parent" ref="30097843"/> 619 </object> 620 <object class="IBObjectRecord"> 621 <int key="objectID">28</int> 622 <reference key="object" ref="788427236"/> 623 <reference key="parent" ref="38777799"/> 499 624 </object> 500 625 </array> … … 513 638 <string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 514 639 <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 640 <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 641 <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 642 <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 643 <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 515 644 <string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> 516 645 <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> … … 528 657 <dictionary class="NSMutableDictionary" key="localizations"/> 529 658 <nil key="sourceID"/> 530 <int key="maxID"> 24</int>659 <int key="maxID">32</int> 531 660 </object> 532 <object class="IBClassDescriber" key="IBDocument.Classes"/> 661 <object class="IBClassDescriber" key="IBDocument.Classes"> 662 <array class="NSMutableArray" key="referencedPartialClassDescriptions"> 663 <object class="IBPartialClassDescription"> 664 <string key="className">FileOutlineController</string> 665 <string key="superclassName">NSObject</string> 666 <object class="NSMutableDictionary" key="outlets"> 667 <string key="NS.key.0">fOutline</string> 668 <string key="NS.object.0">FileOutlineView</string> 669 </object> 670 <object class="NSMutableDictionary" key="toOneOutletInfosByName"> 671 <string key="NS.key.0">fOutline</string> 672 <object class="IBToOneOutletInfo" key="NS.object.0"> 673 <string key="name">fOutline</string> 674 <string key="candidateClassName">FileOutlineView</string> 675 </object> 676 </object> 677 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 678 <string key="majorKey">IBProjectSource</string> 679 <string key="minorKey">./Classes/FileOutlineController.h</string> 680 </object> 681 </object> 682 <object class="IBPartialClassDescription"> 683 <string key="className">FileOutlineView</string> 684 <string key="superclassName">NSOutlineView</string> 685 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 686 <string key="majorKey">IBProjectSource</string> 687 <string key="minorKey">./Classes/FileOutlineView.h</string> 688 </object> 689 </object> 690 <object class="IBPartialClassDescription"> 691 <string key="className">InfoFileViewController</string> 692 <string key="superclassName">NSViewController</string> 693 <dictionary class="NSMutableDictionary" key="actions"> 694 <string key="checkAll:">id</string> 695 <string key="setFileFilterText:">id</string> 696 <string key="uncheckAll:">id</string> 697 </dictionary> 698 <dictionary class="NSMutableDictionary" key="actionInfosByName"> 699 <object class="IBActionInfo" key="checkAll:"> 700 <string key="name">checkAll:</string> 701 <string key="candidateClassName">id</string> 702 </object> 703 <object class="IBActionInfo" key="setFileFilterText:"> 704 <string key="name">setFileFilterText:</string> 705 <string key="candidateClassName">id</string> 706 </object> 707 <object class="IBActionInfo" key="uncheckAll:"> 708 <string key="name">uncheckAll:</string> 709 <string key="candidateClassName">id</string> 710 </object> 711 </dictionary> 712 <dictionary class="NSMutableDictionary" key="outlets"> 713 <string key="fCheckAllButton">NSButton</string> 714 <string key="fFileController">FileOutlineController</string> 715 <string key="fFileFilterField">NSSearchField</string> 716 <string key="fUncheckAllButton">NSButton</string> 717 </dictionary> 718 <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> 719 <object class="IBToOneOutletInfo" key="fCheckAllButton"> 720 <string key="name">fCheckAllButton</string> 721 <string key="candidateClassName">NSButton</string> 722 </object> 723 <object class="IBToOneOutletInfo" key="fFileController"> 724 <string key="name">fFileController</string> 725 <string key="candidateClassName">FileOutlineController</string> 726 </object> 727 <object class="IBToOneOutletInfo" key="fFileFilterField"> 728 <string key="name">fFileFilterField</string> 729 <string key="candidateClassName">NSSearchField</string> 730 </object> 731 <object class="IBToOneOutletInfo" key="fUncheckAllButton"> 732 <string key="name">fUncheckAllButton</string> 733 <string key="candidateClassName">NSButton</string> 734 </object> 735 </dictionary> 736 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 737 <string key="majorKey">IBProjectSource</string> 738 <string key="minorKey">./Classes/InfoFileViewController.h</string> 739 </object> 740 </object> 741 </array> 742 </object> 533 743 <int key="IBDocument.localizationMode">0</int> 534 744 <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> … … 539 749 <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> 540 750 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> 541 < integer value="1060" key="NS.object.0"/>751 <real value="1070" key="NS.object.0"/> 542 752 </object> 543 753 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> -
trunk/macosx/InfoFileViewController.h
r13162 r13296 38 38 39 39 IBOutlet NSSearchField * fFileFilterField; 40 IBOutlet NSButton * fCheckAllButton, *fUncheckAllButton; 40 41 } 41 42 … … 45 46 - (void) saveViewSize; 46 47 47 - (void) setFileFilterText: (id) sender; 48 - (IBAction) setFileFilterText: (id) sender; 49 - (IBAction) checkAll: (id) sender; 50 - (IBAction) uncheckAll: (id) sender; 48 51 49 52 - (NSArray *) quickLookURLs; -
trunk/macosx/InfoFileViewController.m
r13251 r13296 84 84 85 85 if ([fTorrents count] == 1) 86 { 86 87 [fFileController refresh]; 88 89 Torrent * torrent = [fTorrents objectAtIndex: 0]; 90 if ([torrent isFolder]) 91 { 92 const NSInteger filesCheckState = [torrent checkForFiles: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [torrent fileCount])]]; 93 [fCheckAllButton setEnabled: filesCheckState != NSOnState]; //if anything is unchecked 94 [fUncheckAllButton setEnabled: ![torrent allDownloaded]]; //if there are any checked files that aren't finished 95 } 96 } 87 97 } 88 98 … … 95 105 { 96 106 [fFileController setFilterText: [sender stringValue]]; 107 } 108 109 - (IBAction) checkAll: (id) sender 110 { 111 [fFileController checkAll]; 112 } 113 114 - (IBAction) uncheckAll: (id) sender 115 { 116 [fFileController uncheckAll]; 97 117 } 98 118 … … 174 194 175 195 [fFileController setTorrent: torrent]; 176 [fFileFilterField setEnabled: [torrent isFolder]]; 196 197 const BOOL isFolder = [torrent isFolder]; 198 [fFileFilterField setEnabled: isFolder]; 199 200 if (!isFolder) 201 { 202 [fCheckAllButton setEnabled: NO]; 203 [fUncheckAllButton setEnabled: NO]; 204 } 177 205 } 178 206 else 179 207 { 180 208 [fFileController setTorrent: nil]; 209 181 210 [fFileFilterField setEnabled: NO]; 211 212 [fCheckAllButton setEnabled: NO]; 213 [fUncheckAllButton setEnabled: NO]; 182 214 } 183 215
Note: See TracChangeset
for help on using the changeset viewer.
