Changeset 2318 for trunk/macosx/FileOutlineView.m

Timestamp:

Jul 10, 2007, 3:30:25 AM (15 years ago)

Author:

livings124

Message:

compile with charles_ last set of changes...currently file selection doesn't apply

File:

• trunk/macosx/FileOutlineView.m (modified) (3 diffs)

trunk/macosx/FileOutlineView.m

@@ -104 +104 @@
     {
         NSDictionary * item = [self itemAtRow: row];
+        Torrent * torrent = [(InfoWindowController *)[[self window] windowController] selectedTorrent];
+        
         if ([[item objectForKey: @"IsFolder"] boolValue]
-                || ![[(InfoWindowController *)[[self window] windowController] selectedTorrent]
-                        canChangeDownloadCheckForFiles: [item objectForKey: @"Indexes"]])
+                || ![torrent canChangeDownloadCheckForFiles: [item objectForKey: @"Indexes"]])
             [fNormalColor set];
         else
         {
-            int priority = [[item objectForKey: @"Priority"] intValue];
-            if (priority == PRIORITY_HIGH)
+            NSIndexSet * indexSet = [item objectForKey: @"Indexes"];
+            if ([torrent hasFilePriority: TR_PRI_HIGH forIndexes: indexSet])
                 [fHighPriorityColor set];
-            else if (priority == PRIORITY_LOW)
+            else if ([torrent hasFilePriority: TR_PRI_LOW forIndexes: indexSet])
                 [fLowPriorityColor set];
             else
@@ -133 +134 @@
 
     NSDictionary * item;
+    NSIndexSet * indexSet;
     int i, priority;
     Torrent * torrent = [(InfoWindowController *)[[self window] windowController] selectedTorrent];
@@ -140 +142 @@
         {
             item = [self itemAtRow: i];
-            if (![[item objectForKey: @"IsFolder"] boolValue]
-                && [torrent canChangeDownloadCheckForFiles: [item objectForKey: @"Indexes"]])
+            if ([[item objectForKey: @"IsFolder"] boolValue])
+                continue;
+            
+            indexSet = [item objectForKey: @"Indexes"];
+            if ([torrent canChangeDownloadCheckForFiles: indexSet])
             {
-                priority = [[item objectForKey: @"Priority"] intValue];
-                if (priority == PRIORITY_HIGH)
+                if ([torrent hasFilePriority: TR_PRI_HIGH forIndexes: indexSet])
                     [fHighPriorityColor set];
-                else if (priority == PRIORITY_LOW)
+                else if ([torrent hasFilePriority: TR_PRI_LOW forIndexes: indexSet])
                     [fLowPriorityColor set];
                 else