Changeset 3475

Timestamp:

Oct 20, 2007, 7:13:52 PM (15 years ago)

Author:

livings124

Message:

simplify how the file outline accesses the torrent

Location:

trunk/macosx

Files:

• FileNameCell.m (modified) (4 diffs)
• FileOutlineView.h (modified) (2 diffs)
• FileOutlineView.m (modified) (3 diffs)
• FilePriorityCell.m (modified) (4 diffs)
• InfoWindowController.h (modified) (1 diff)
• InfoWindowController.m (modified) (3 diffs)
• TransmissionHelp/html/FAQ.html (modified) (1 diff)

trunk/macosx/FileNameCell.m

@@ -23 +23 @@
  *****************************************************************************/
 
+#import "FileOutlineView.h"
 #import "FileNameCell.h"
-#import "InfoWindowController.h"
+#import "Torrent.h"
 #import "NSStringAdditions.h"
 
@@ -90 +91 @@
                     fraction: 1.0];
     
-    Torrent * torrent = [[[[self controlView] window] windowController] selectedTorrent];
-    
     //title
     NSColor * specialColor = nil;
@@ -97 +96 @@
             && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
         specialColor = [NSColor whiteColor];
-    else if ([torrent checkForFiles: [[self objectValue] objectForKey: @"Indexes"]] == NSOffState)
+    else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles:
+                    [[self objectValue] objectForKey: @"Indexes"]] == NSOffState)
         specialColor = [NSColor disabledControlTextColor];
     else;
@@ -196 +196 @@
         [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
     
-    Torrent * torrent = [[[[self controlView] window] windowController] selectedTorrent];
+    Torrent * torrent = [(FileOutlineView *)[self controlView] torrent];
     float percent = [torrent fileProgress: [[[self objectValue] objectForKey: @"Indexes"] firstIndex]] * 100.0;
     

trunk/macosx/FileOutlineView.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 
+@class Torrent;
+
 @interface FileOutlineView : NSOutlineView
 {
+    Torrent * fTorrent;
+    
     NSColor * fHighPriorityColor, * fLowPriorityColor, * fMixedPriorityColor;
     
@@ -32 +36 @@
 }
 
+- (void) setTorrent: (Torrent *) torrent;
+- (Torrent *) torrent;
+
 - (void) setHoverRowForEvent: (NSEvent *) event;
 - (int) hoverRow;

trunk/macosx/FileOutlineView.m

@@ -26 +26 @@
 #import "FileNameCell.h"
 #import "FilePriorityCell.h"
-#import "InfoWindowController.h"
 #import "Torrent.h"
 
@@ -58 +57 @@
     
     [super dealloc];
+}
+
+- (void) setTorrent: (Torrent *) torrent
+{
+    fTorrent = torrent;
+}
+
+- (Torrent *) torrent
+{
+    return fTorrent;
 }
 
@@ -111 +120 @@
     {
         NSDictionary * item = [self itemAtRow: row];
-        Torrent * torrent = [(InfoWindowController *)[[self window] windowController] selectedTorrent];
         NSIndexSet * indexes = [item objectForKey: @"Indexes"];
         
-        if ([torrent checkForFiles: indexes] != NSOffState)
+        if ([fTorrent checkForFiles: indexes] != NSOffState)
         {
-            NSSet * priorities = [torrent filePrioritiesForIndexes: indexes];
+            NSSet * priorities = [fTorrent filePrioritiesForIndexes: indexes];
             int count = [priorities count];
             if (count > 0)

trunk/macosx/FilePriorityCell.m

@@ -24 +24 @@
 
 #import "FilePriorityCell.h"
-#import "InfoWindowController.h"
+#import "FileOutlineView.h"
 #import "Torrent.h"
 
@@ -52 +52 @@
     
     //only for when clicking manually
-    Torrent * torrent = [[[[self controlView] window] windowController] selectedTorrent];
-    
     int priority;
     if (segment == 0)
@@ -62 +60 @@
         priority = TR_PRI_NORMAL;
     
+    Torrent * torrent = [(FileOutlineView *)[self controlView] torrent];
     [torrent setFilePriority: priority forIndexes: [[self representedObject] objectForKey: @"Indexes"]];
     [(FileOutlineView *)[self controlView] reloadData];
@@ -68 +67 @@
 - (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
 {
-    Torrent * torrent = [(InfoWindowController *)[[[self controlView] window] windowController] selectedTorrent];
+    Torrent * torrent = [(FileOutlineView *)[self controlView] torrent];
     NSDictionary * dict = [self representedObject];
     NSSet * priorities = [torrent filePrioritiesForIndexes: [dict objectForKey: @"Indexes"]];

trunk/macosx/InfoWindowController.h

@@ -71 +71 @@
 
 - (void) updateInfoForTorrents: (NSArray *) torrents;
-- (Torrent *) selectedTorrent;
 - (void) updateInfoStats;
 

trunk/macosx/InfoWindowController.m

@@ -229 +229 @@
         }
         
+        [fFileOutline setTorrent: nil];
+        
         [fImageView setImage: fAppIcon];
         
@@ -302 +304 @@
     {    
         Torrent * torrent = [fTorrents objectAtIndex: 0];
+        
+        [fFileOutline setTorrent: torrent];
         
         NSImage * icon = [[torrent icon] copy];
@@ -379 +383 @@
     [fFileOutline deselectAll: nil];
     [fFileOutline reloadData];
-}
-
-- (Torrent *) selectedTorrent
-{
-    return fTorrents && [fTorrents count] == 1 ? [fTorrents objectAtIndex: 0] : nil;
 }
 

trunk/macosx/TransmissionHelp/html/FAQ.html

@@ -61 +61 @@
                         </div>
                                 <p>Growl is a notification system. Lots of applications can interface with it.<br>
-                                <a href="http://growl.info">http://growl.info</a> 
+                                <a href="http://growl.info/">http://growl.info/</a> 
                                 <p>
                         <div id="pagetitle">