Changeset 721 for trunk/macosx

Timestamp:

Aug 6, 2006, 5:06:05 PM (16 years ago)

Author:

livings124

Message:

validate open menu item

Location:

trunk/macosx

Files:

• BarButton.m (modified) (2 diffs)
• Controller.h (modified) (1 diff)
• Controller.m (modified) (32 diffs)

trunk/macosx/BarButton.m

@@ -36 +36 @@
 - (id) initWithCoder: (NSCoder *) coder
 {
-        if ((self = [super initWithCoder: coder]))
+    if ((self = [super initWithCoder: coder]))
     {
         fEnabled = NO;
@@ -56 +56 @@
         [nc addObserver: self selector: @selector(resetBounds:)
                     name: NSViewBoundsDidChangeNotification object: nil];
-        }
-        return self;
+    }
+    return self;
 }
 

trunk/macosx/Controller.h

@@ -43 +43 @@
     int                             fCompleted;
     
-    NSMutableArray                  * fTorrents, * fFilteredTorrents;
+    NSMutableArray                  * fTorrents, * fDisplayedTorrents;
     
     PrefsController                 * fPrefsController;

trunk/macosx/Controller.m

@@ -70 +70 @@
         
         fTorrents = [[NSMutableArray alloc] initWithCapacity: 10];
-        fFilteredTorrents = [[NSMutableArray alloc] initWithCapacity: 10];
+        fDisplayedTorrents = [[NSMutableArray alloc] initWithCapacity: 10];
         
         fDefaults = [NSUserDefaults standardUserDefaults];
@@ -89 +89 @@
 
     [fTorrents release];
-    [fFilteredTorrents release];
+    [fDisplayedTorrents release];
     
     [fToolbar release];
@@ -184 +184 @@
     [fSpeedLimitButton setToolTip: @"Speed Limit overrides the total bandwidth limits with its own limits."];
 
-    [fTableView setTorrents: fFilteredTorrents];
+    [fTableView setTorrents: fDisplayedTorrents];
     [[fTableView tableColumnWithIdentifier: @"Torrent"] setDataCell: [[TorrentCell alloc] init]];
 
@@ -433 +433 @@
 - (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet
 {
-    if ([fFilteredTorrents respondsToSelector: @selector(objectsAtIndexes:)])
-        return [fFilteredTorrents objectsAtIndexes: indexSet];
+    if ([fDisplayedTorrents respondsToSelector: @selector(objectsAtIndexes:)])
+        return [fDisplayedTorrents objectsAtIndexes: indexSet];
     else
     {
@@ -440 +440 @@
         unsigned int i;
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-            [torrents addObject: [fFilteredTorrents objectAtIndex: i]];
+            [torrents addObject: [fDisplayedTorrents objectAtIndex: i]];
 
         return torrents;
     }
-}
-
-- (void) folderChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code
-    contextInfo: (Torrent *) torrent
-{
-    if (code == NSOKButton)
-    {
-        [torrent setDownloadFolder: [[openPanel filenames] objectAtIndex: 0]];
-        [torrent update];
-        [self attemptToStartAuto: torrent];
-        
-        [fTorrents addObject: torrent];
-    }
-    
-    [NSApp stopModal];
 }
 
@@ -519 +504 @@
 }
 
+- (void) folderChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code
+    contextInfo: (Torrent *) torrent
+{
+    if (code == NSOKButton)
+    {
+        [torrent setDownloadFolder: [[openPanel filenames] objectAtIndex: 0]];
+        [torrent update];
+        [self attemptToStartAuto: torrent];
+        
+        [fTorrents addObject: torrent];
+    }
+    
+    [NSApp stopModal];
+}
+
 //called on by applescript
 - (void) open: (NSArray *) files
@@ -652 +652 @@
             {
                 title = [NSString stringWithFormat: @"Comfirm Removal of \"%@\"",
-                            [[fFilteredTorrents objectAtIndex: [fTableView selectedRow]] name]];
+                            [[fDisplayedTorrents objectAtIndex: [fTableView selectedRow]] name]];
                 message = @"This transfer is active."
                             " Once removed, continuing the transfer will require the torrent file."
@@ -721 +721 @@
         
         [fTorrents removeObject: torrent];
-        [fFilteredTorrents removeObject: torrent];
+        [fDisplayedTorrents removeObject: torrent];
     }
     [torrents release];
@@ -834 +834 @@
     unsigned int i;
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        [[fFilteredTorrents objectAtIndex: i] revealData];
+        [[fDisplayedTorrents objectAtIndex: i] revealData];
 }
 
@@ -931 +931 @@
     NSArray * selectedTorrents = nil;
     int numSelected = [fTableView numberOfSelectedRows];
-    if (numSelected > 0 && numSelected < [fFilteredTorrents count])
+    if (numSelected > 0 && numSelected < [fDisplayedTorrents count])
         selectedTorrents = [self torrentsAtIndexes: [fTableView selectedRowIndexes]];
 
@@ -943 +943 @@
         NSMutableIndexSet * indexSet = [[NSMutableIndexSet alloc] init];
         while ((torrent = [enumerator nextObject]))
-            [indexSet addIndex: [fFilteredTorrents indexOfObject: torrent]];
+            [indexSet addIndex: [fDisplayedTorrents indexOfObject: torrent]];
         
         [fTableView selectRowIndexes: indexSet byExtendingSelection: NO];
@@ -987 +987 @@
         descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
 
-    [fFilteredTorrents sortUsingDescriptors: descriptors];
+    [fDisplayedTorrents sortUsingDescriptors: descriptors];
     [descriptors release];
     
@@ -1120 +1120 @@
     }
     
-    [fFilteredTorrents setArray: tempTorrents];
+    [fDisplayedTorrents setArray: tempTorrents];
     [tempTorrents release];
     
@@ -1133 +1133 @@
         unsigned index;
         while ((torrent = [enumerator nextObject]))
-            if ((index = [fFilteredTorrents indexOfObject: torrent]) != NSNotFound)
+            if ((index = [fDisplayedTorrents indexOfObject: torrent]) != NSNotFound)
                 [indexSet addIndex: index];
         
@@ -1143 +1143 @@
     NSMutableString * totalTorrentsString = [NSMutableString stringWithString: @""];
     if (filtering)
-        [totalTorrentsString appendFormat: @"%d/", [fFilteredTorrents count]];
+        [totalTorrentsString appendFormat: @"%d/", [fDisplayedTorrents count]];
     
     int totalCount = [fTorrents count];
@@ -1466 +1466 @@
 - (int) numberOfRowsInTableView: (NSTableView *) t
 {
-    return [fFilteredTorrents count];
+    return [fDisplayedTorrents count];
 }
 
@@ -1472 +1472 @@
     forTableColumn: (NSTableColumn *) tableColumn row: (int) row
 {
-    [cell setTorrent: [fFilteredTorrents objectAtIndex: row]];
+    [cell setTorrent: [fDisplayedTorrents objectAtIndex: row]];
 }
 
@@ -1511 +1511 @@
         return NSDragOperationGeneric;
     }
-    else;
-    
-    return NSDragOperationNone;
+    else
+        return NSDragOperationNone;
 }
 
@@ -1538 +1537 @@
         NSArray * selectedTorrents = nil;
         int numSelected = [fTableView numberOfSelectedRows];
-        if (numSelected > 0 && numSelected < [fFilteredTorrents count])
+        if (numSelected > 0 && numSelected < [fDisplayedTorrents count])
             selectedTorrents = [self torrentsAtIndexes: [fTableView selectedRowIndexes]];
     
@@ -1546 +1545 @@
         //move torrent in array 
         NSArray * movingTorrents = [[self torrentsAtIndexes: indexes] retain];
-        [fFilteredTorrents removeObjectsInArray: movingTorrents];
+        [fDisplayedTorrents removeObjectsInArray: movingTorrents];
         
         //determine the insertion index now that transfers to move have been removed
@@ -1555 +1554 @@
         //insert objects at new location
         for (i = 0; i < [movingTorrents count]; i++)
-            [fFilteredTorrents insertObject: [movingTorrents objectAtIndex: i] atIndex: newRow - decrease + i];
+            [fDisplayedTorrents insertObject: [movingTorrents objectAtIndex: i] atIndex: newRow - decrease + i];
         
         [movingTorrents release];
@@ -1568 +1567 @@
         
         for (i = low; i <= high; i++)
-            [[fFilteredTorrents objectAtIndex: i] setOrderValue: i];
+            [[fDisplayedTorrents objectAtIndex: i] setOrderValue: i];
         
         [fTableView reloadData];
@@ -1579 +1578 @@
             NSMutableIndexSet * indexSet = [[NSMutableIndexSet alloc] init];
             while ((torrent = [enumerator nextObject]))
-                [indexSet addIndex: [fFilteredTorrents indexOfObject: torrent]];
+                [indexSet addIndex: [fDisplayedTorrents indexOfObject: torrent]];
             
             [fTableView selectRowIndexes: indexSet byExtendingSelection: NO];
@@ -1636 +1635 @@
 - (void) showStatusBar: (BOOL) show animate: (BOOL) animate
 {
-    if (show == ![fStatusBar isHidden])
+    if (show != [fStatusBar isHidden])
         return;
 
@@ -1697 +1696 @@
 - (void) showFilterBar: (BOOL) show animate: (BOOL) animate
 {
-    if (show == ![fFilterBar isHidden])
+    if (show != [fFilterBar isHidden])
         return;
 
@@ -1896 +1895 @@
         
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-            if ([[fFilteredTorrents objectAtIndex: i] isActive])
+            if ([[fDisplayedTorrents objectAtIndex: i] isActive])
                 return YES;
         return NO;
@@ -1908 +1907 @@
         
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-            if ([[fFilteredTorrents objectAtIndex: i] isPaused])
+            if ([[fDisplayedTorrents objectAtIndex: i] isPaused])
                 return YES;
         return NO;
@@ -1922 +1921 @@
     //only enable some items if it is in a context menu or the window is useable 
     BOOL canUseMenu = [fWindow isKeyWindow] || [[[menuItem menu] title] isEqualToString: @"Context"];
+
+    //enable open items
+    if (action == @selector(openShowSheet:))
+        return [fWindow attachedSheet] == nil;
 
     //enable show info
@@ -1974 +1977 @@
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
         {
-            torrent = [fFilteredTorrents objectAtIndex: i];
+            torrent = [fDisplayedTorrents objectAtIndex: i];
             if (!warning && [torrent isActive])
             {
@@ -2053 +2056 @@
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
         {
-            torrent = [fFilteredTorrents objectAtIndex: i];
+            torrent = [fDisplayedTorrents objectAtIndex: i];
             if ([torrent isActive])
                 return YES;
@@ -2072 +2075 @@
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
         {
-            torrent = [fFilteredTorrents objectAtIndex: i];
+            torrent = [fDisplayedTorrents objectAtIndex: i];
             if ([torrent isPaused])
                 return YES;
@@ -2172 +2175 @@
     NSRect frame = [fWindow frame];
     float newHeight = frame.size.height - [fScrollView frame].size.height
-        + [fFilteredTorrents count] * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
+        + [fDisplayedTorrents count] * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
 
     float minHeight = [fWindow minSize].height;