Changeset 256

Timestamp:

May 25, 2006, 12:22:19 PM (17 years ago)

Author:

titer

Message:

Merged Mitchell's changes, this includes:
Adds stop at ratio,
Adds sorting by name, date or state,
Seperates Info window into its own nib,
Adds option to enable or disabled autostarting downloads,
Seperates Network / Transfers in the Preferences

Location:

trunk/macosx

Files:

• Badger.h (modified) (1 diff)
• Badger.m (modified) (3 diffs)
• Controller.h (modified) (6 diffs)
• Controller.m (modified) (61 diffs)
• Defaults.plist (modified) (3 diffs)
• English.lproj/InfoWindow.nib (added)
• English.lproj/InfoWindow.nib/classes.nib (added)
• English.lproj/InfoWindow.nib/info.nib (added)
• English.lproj/InfoWindow.nib/keyedobjects.nib (added)
• English.lproj/MainMenu.nib/classes.nib (modified) (7 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• Images/StatusBorder.tiff (added)
• Images/StatusSep.png (added)
• InfoWindowController.h (added)
• InfoWindowController.m (added)
• MenuButton.m (modified) (1 diff)
• PrefsController.h (modified) (4 diffs)
• PrefsController.m (modified) (17 diffs)
• Torrent.h (modified) (4 diffs)
• Torrent.m (modified) (8 diffs)
• TorrentTableView.m (modified) (2 diffs)

trunk/macosx/Badger.h

@@ -13 +13 @@
 @interface Badger : NSObject {
 
-    NSImage             * fDockIcon, * fBadgedDockIcon,
-                        * fBadge, * fUploadBadge, * fDownloadBadge;
+    NSImage         * fDockIcon, * fBadgedDockIcon,
+                    * fBadge, * fUploadBadge, * fDownloadBadge;
                     
-    NSMutableDictionary * fAttributes;
+    NSDictionary    * fAttributes;
     
-    int                 fCompleted;
-    BOOL                fSpeedShown;
+    int             fCompleted;
+    BOOL            fSpeedShown;
 }
 

trunk/macosx/Badger.m

@@ -43 +43 @@
         fDownloadBadge = [NSImage imageNamed: @"DownloadBadge"];
         
-        
-        fAttributes = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
+        NSShadow * stringShadow = [[NSShadow alloc] init];
+        [stringShadow setShadowOffset: NSMakeSize(2, -2)];
+        [stringShadow setShadowBlurRadius: 4];
+        
+        fAttributes = [[NSDictionary dictionaryWithObjectsAndKeys:
             [NSColor whiteColor], NSForegroundColorAttributeName,
             [NSFont fontWithName: @"Helvetica-Bold" size: 28], NSFontAttributeName,
+            stringShadow, NSShadowAttributeName,
             nil] retain];
-
-        if( OSX_VERSION >= 10.3 )
-        {
-            NSShadow * stringShadow = [[NSShadow alloc] init];
-            [stringShadow setShadowOffset: NSMakeSize(2, -2)];
-            [stringShadow setShadowBlurRadius: 4];
-            [fAttributes setObject: stringShadow
-                forKey: NSShadowAttributeName];
-            [stringShadow release];
-        }
+        
+        [stringShadow release];
         
         fCompleted = 0;
@@ -83 +79 @@
     NSSize iconSize = [fDockIcon size];
 
-    //set seeding and downloading badges if there was a change
-    if (completed != fCompleted)
+    //set completed badge
+    if (fCompleted != completed)
     {
         fCompleted = completed;
@@ -120 +116 @@
     }
 
-    //display upload and download rates
-    BOOL speedShown = NO;
-    if (uploadRate || downloadRate)
-    {
-        speedShown = YES;
-    
+    //set upload and download rate badges
+    BOOL speedShown = uploadRate || downloadRate;
+    if (speedShown)
+    {
         NSRect badgeRect, stringRect;
         badgeRect.size = [fUploadBadge size];

trunk/macosx/Controller.h

@@ -27 +27 @@
 #import <transmission.h>
 #import "PrefsController.h"
+#import "InfoWindowController.h"
 #import "Badger.h"
 
@@ -36 +37 @@
     int                         fCompleted;
     NSMutableArray              * fTorrents;
+    
+    InfoWindowController        * fInfoController;
 
     NSToolbar                   * fToolbar;
@@ -56 +59 @@
     IBOutlet NSBox              * fStats;
     BOOL                        fStatusBar;
-
-    IBOutlet NSPanel            * fInfoPanel;
-    IBOutlet NSImageView        * fInfoImageView;
-    IBOutlet NSTextField        * fInfoName;
-    IBOutlet NSTextField        * fInfoSize;
-    IBOutlet NSTextField        * fInfoTracker;
-    IBOutlet NSTextField        * fInfoAnnounce;
-    IBOutlet NSTextField        * fInfoPieceSize;
-    IBOutlet NSTextField        * fInfoPieces;
-    IBOutlet NSTextField        * fInfoHash1;
-    IBOutlet NSTextField        * fInfoHash2;
-    IBOutlet NSTextField        * fInfoSeeders;
-    IBOutlet NSTextField        * fInfoLeechers;
-    IBOutlet NSTextField        * fInfoDownloaded;
-    IBOutlet NSTextField        * fInfoUploaded;
-    NSImage                     * fAppIcon;
+    
+    IBOutlet NSButton           * fActionButton;
+    
+    NSString                    * fSortType;
+    IBOutlet NSMenuItem         * fNameSortItem,
+                                * fStateSortItem,
+                                * fDateSortItem;
+    NSMenuItem                  * fCurrentSortItem;
 
     io_connect_t                fRootPort;
@@ -91 +86 @@
                         contextInfo: (void *) info;
 
-- (void) quitSheetDidEnd:   (NSWindow *)sheet returnCode:(int)returnCode
-                            contextInfo:(void *)contextInfo;
-                        
+- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
+                            contextInfo: (void *) contextInfo;
+
+- (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet;
+- (void) torrentNumberChanged;
+
 - (void) resumeTorrent:             (id) sender;
 - (void) resumeAllTorrents:         (id) sender;
@@ -109 +107 @@
                 deleteData:         (BOOL) deleteData;
                 
-- (void) removeSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode
-                        contextInfo:(NSDictionary *)dict;
-- (void) confirmRemoveTorrentWithIndex: (NSIndexSet *) indexSet
+- (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
+                        contextInfo: (NSDictionary *) dict;
+- (void) confirmRemoveTorrents: (NSArray *) torrents
             deleteTorrent: (BOOL) deleteTorrent
             deleteData: (BOOL) deleteData;
+
+- (void) revealTorrent: (id) sender;
                      
 - (void) showInfo:        (id) sender;
+- (void) updateInfo;
+- (void) updateInfoStats;
 
 - (void) updateUI:        (NSTimer *) timer;
 - (void) updateTorrentHistory;
+
+- (void) sortTorrents;
+- (void) setSort: (id) sender;
+
 - (void) sleepCallBack:   (natural_t) messageType argument:
                         (void *) messageArgument;
 
-- (void) runCustomizationPalette: (id) sender;
-- (void) showHideToolbar: (id) sender;
 - (void) toggleStatusBar: (id) sender;
 
@@ -132 +136 @@
 - (void) linkForums:        (id) sender;
 - (void) notifyGrowl:       (NSString *) file;
-- (void) revealFromMenu:    (id) sender;
 - (void) growlRegister:     (id) sender;
 

trunk/macosx/Controller.m

@@ -56 +56 @@
 - (id) init
 {
-    fLib      = tr_init();
-    fTorrents = [[NSMutableArray alloc] initWithCapacity: 10];
+    if ((self = [super init]))
+    {
+        fLib = tr_init();
+        fTorrents = [[NSMutableArray alloc] initWithCapacity: 10];
+    }
     return self;
 }
@@ -64 +67 @@
 {
     [fTorrents release];
+    
+    [fInfoController release];
+    
     tr_close( fLib );
-    [fAppIcon release];
     [super dealloc];
 }
@@ -71 +76 @@
 - (void) awakeFromNib
 {
-    fAppIcon = [[NSApp applicationIconImage] copy];
-
     [fPrefsController setPrefsWindow: fLib];
     fDefaults = [NSUserDefaults standardUserDefaults];
 
-    //check advanced bar menu item
+    fInfoController = [[InfoWindowController alloc] initWithWindowNibName: @"InfoWindow"];
+    
     [fAdvancedBarItem setState: [fDefaults
-        boolForKey:@"UseAdvancedBar"] ? NSOnState : NSOffState];
+        boolForKey: @"UseAdvancedBar"] ? NSOnState : NSOffState];
 
     fToolbar = [[NSToolbar alloc] initWithIdentifier: @"Transmission Toolbar"];
@@ -90 +94 @@
     if (![fDefaults boolForKey: @"StatusBar"])
         [self toggleStatusBar: nil];
+    
+    [fActionButton setToolTip: @"Shortcuts for performing special actions."];
 
     [fTableView setTorrents: fTorrents];
@@ -95 +101 @@
         [[TorrentCell alloc] init]];
 
-    [fTableView registerForDraggedTypes: [NSArray arrayWithObjects:
-        NSFilenamesPboardType, NULL]];
+    [fTableView registerForDraggedTypes:
+        [NSArray arrayWithObject: NSFilenamesPboardType]];
 
     //Register for sleep notifications
-    IONotificationPortRef  notify;
-    io_object_t            anIterator;
-
-    fRootPort = IORegisterForSystemPower( self, & notify, sleepCallBack,
-                                          & anIterator);
-    if (fRootPort)
+    IONotificationPortRef notify;
+    io_object_t anIterator;
+    if (fRootPort= IORegisterForSystemPower(self, & notify,
+                                sleepCallBack, & anIterator))
     {
         CFRunLoopAddSource( CFRunLoopGetCurrent(),
@@ -113 +117 @@
         NSLog( @"Could not IORegisterForSystemPower" );
 
-    NSString * torrentPath, * downloadFolder, * paused;
-    NSDate * date;
-    NSDictionary * dic;
-
+    //load torrents from history
     Torrent * torrent;
+    NSDictionary * historyItem;
     NSEnumerator * enumerator = [[fDefaults arrayForKey: @"History"] objectEnumerator];
-    while ((dic = [enumerator nextObject]))
-    {
-        torrentPath    = [dic objectForKey: @"TorrentPath"];
-        downloadFolder = [dic objectForKey: @"DownloadFolder"];
-        paused         = [dic objectForKey: @"Paused"];
-
-        if (!torrentPath || !downloadFolder || !paused)
-            continue;
-
-        if ((date = [dic objectForKey: @"Date"]))
-            torrent = [[Torrent alloc] initWithPath: torrentPath lib: fLib date: date];
-        else
-            torrent = [[Torrent alloc] initWithPath: torrentPath lib: fLib];
-            
-        if( !torrent )
-            continue;
-
-        [fTorrents addObject: torrent];
-
-        [torrent setFolder: downloadFolder];
-
-        if ([paused isEqualToString: @"NO"])
-            [torrent start];
-    }
+    while ((historyItem = [enumerator nextObject]))
+        if ((torrent = [[Torrent alloc] initWithHistory: historyItem lib: fLib]))
+        {
+            [fTorrents addObject: torrent];
+            [torrent release];
+        }
+    
+    [self torrentNumberChanged];
+    
+    //set sort
+    fSortType = [fDefaults stringForKey: @"Sort"];
+    if ([fSortType isEqualToString: @"Name"])
+        fCurrentSortItem = fNameSortItem;
+    else if ([fSortType isEqualToString: @"State"])
+        fCurrentSortItem = fStateSortItem;
+    else
+        fCurrentSortItem = fDateSortItem;
+    [fCurrentSortItem setState: NSOnState];
 
     //check and register Growl if it is installed for this user or all users
@@ -154 +150 @@
     fBadger = [[Badger alloc] init];
 
-    //update the interface every 500 ms
+    //timer to update the interface
     fCompleted = 0;
     [self updateUI: nil];
@@ -164 +160 @@
         forMode: NSEventTrackingRunLoopMode];
 
+    //timer to check for updates
     [self checkForUpdateTimer: nil];
     fUpdateTimer = [NSTimer scheduledTimerWithTimeInterval: 60.0
         target: self selector: @selector( checkForUpdateTimer: )
         userInfo: nil repeats: YES];
+    
+    [self sortTorrents];
+    
+    //show windows
+    [fWindow makeKeyAndOrderFront: nil];
+    if ([fDefaults boolForKey: @"InfoVisible"])
+        [self showInfo: nil];
 }
 
@@ -176 +180 @@
 }
 
-- (void) windowDidResize: (NSNotification *) n
-{
-    [fTableView sizeToFit];
-}
-
-- (BOOL) windowShouldClose: (id) sender
-{
-    [fWindow orderOut: nil];
-    return NO;
-}
-
 - (BOOL) applicationShouldHandleReopen: (NSApplication *) app
     hasVisibleWindows: (BOOL) flag
@@ -194 +187 @@
 }
 
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+- (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication *) sender
 {
     int active = 0;
@@ -200 +193 @@
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     while( ( torrent = [enumerator nextObject] ) )
-    {
         if( [torrent isActive] )
-        {
             active++;
-        }
-    }
 
     if (active > 0 && [fDefaults boolForKey: @"CheckQuit"])
@@ -226 +215 @@
 }
 
-- (void) quitSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode
-                        contextInfo:(void  *)contextInfo
+- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
+                        contextInfo: (void *) contextInfo
 {
     [NSApp stopModal];
@@ -236 +225 @@
 - (void) applicationWillTerminate: (NSNotification *) notification
 {
-    NSEnumerator * enumerator;
-    Torrent * torrent;
-
     // Stop updating the interface
     [fTimer invalidate];
@@ -246 +232 @@
     [fBadger clearBadge];
     [fBadger release];
-
-    // Save history
+    
+    //remember info window state
+    [fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"];
+
+    //save history
     [self updateTorrentHistory];
 
     // Stop running torrents
-    enumerator = [fTorrents objectEnumerator];
-    while( ( torrent = [enumerator nextObject] ) )
-    {
-        [torrent stop];
-    }
+    [fTorrents makeObjectsPerformSelector: @selector(stop)];
 
     // Wait for torrents to stop (5 seconds timeout)
     NSDate * start = [NSDate date];
-    while( [fTorrents count] )
+    Torrent * torrent;
+    while ([fTorrents count] > 0)
     {
         torrent = [fTorrents objectAtIndex: 0];
@@ -269 +255 @@
         }
         [fTorrents removeObject: torrent];
-        [torrent release];
     }
 }
@@ -275 +260 @@
 - (void) showPreferenceWindow: (id) sender
 {
-    //place the window if not open
     if (![fPrefsWindow isVisible])
-    {
         [fPrefsWindow center];
-    }
-
-    [fPrefsWindow makeKeyAndOrderFront:NULL];
+
+    [fPrefsWindow makeKeyAndOrderFront: nil];
 }
 
@@ -289 +271 @@
     if (code == NSOKButton)
     {
+        [torrent setFolder: [[s filenames] objectAtIndex: 0]];
+        if ([fDefaults boolForKey: @"AutoStartDownload"])
+            [torrent start];
         [fTorrents addObject: torrent];
-        [torrent setFolder: [[s filenames] objectAtIndex: 0]];
-        [torrent start];
-    }
-    else
-    {
-        [torrent release];
-    }
+        
+        [self torrentNumberChanged];
+    }
+    
     [NSApp stopModal];
 }
@@ -303 +285 @@
          openFiles: (NSArray *) filenames
 {
-    NSString * downloadChoice, * downloadFolder, * torrentPath;
+    BOOL autoStart = [fDefaults boolForKey: @"AutoStartDownload"];
+    
+    NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
+    NSString * torrentPath;
     Torrent * torrent;
-
-    downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
-    downloadFolder = [fDefaults stringForKey: @"DownloadFolder"];
-
     NSEnumerator * enumerator = [filenames objectEnumerator];
     while ((torrentPath = [enumerator nextObject]))
     {
-        torrent = [[Torrent alloc] initWithPath: torrentPath lib: fLib];
-        if( !torrent )
+        if (!(torrent = [[Torrent alloc] initWithPath: torrentPath lib: fLib]))
             continue;
 
@@ -320 +300 @@
             noteNewRecentDocumentURL: [NSURL fileURLWithPath: torrentPath]];
 
-        if( [downloadChoice isEqualToString: @"Constant"] )
-        {
-            [fTorrents addObject: torrent];
-            [torrent setFolder: [downloadFolder stringByExpandingTildeInPath]];
-            [torrent start];
-        }
-        else if( [downloadChoice isEqualToString: @"Torrent"] )
-        {
-            [fTorrents addObject: torrent];
-            [torrent setFolder: [torrentPath stringByDeletingLastPathComponent]];
-            [torrent start];
-        }
-        else
+        if ([downloadChoice isEqualToString: @"Ask"])
         {
             NSOpenPanel * panel = [NSOpenPanel openPanel];
@@ -341 +309 @@
             [panel setCanChooseDirectories: YES];
 
-            if( [panel respondsToSelector: @selector(setMessage:)] )
-                /* >= 10.3 */
-                [panel setMessage: [NSString stringWithFormat:
-                                    @"Select the download folder for %@",
-                                    [torrentPath lastPathComponent]]];
-
-            [panel beginSheetForDirectory: NULL file: NULL types: NULL
+            [panel setMessage: [NSString stringWithFormat:
+                                @"Select the download folder for %@",
+                                [torrentPath lastPathComponent]]];
+
+            [panel beginSheetForDirectory: nil file: nil types: nil
                 modalForWindow: fWindow modalDelegate: self didEndSelector:
                 @selector( folderChoiceClosed:returnCode:contextInfo: )
@@ -353 +319 @@
             [NSApp runModalForWindow: panel];
         }
-    }
+        else
+        {
+            NSString * folder = [downloadChoice isEqualToString: @"Constant"]
+                                ? [[fDefaults stringForKey: @"DownloadFolder"]
+                                        stringByExpandingTildeInPath]
+                                : [torrentPath stringByDeletingLastPathComponent];
+
+            [torrent setFolder: folder];
+            if (autoStart)
+                [torrent start];
+            [fTorrents addObject: torrent];
+        }
+        
+        [torrent release];
+    }
+
+    [self torrentNumberChanged];
 
     [self updateUI: nil];
+    [self sortTorrents];
     [self updateTorrentHistory];
 }
 
+- (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet
+{
+    NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [indexSet count]];
+    unsigned int i;
+    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
+        [torrents addObject: [fTorrents objectAtIndex: i]];
+
+    return torrents;
+}
+
+- (void) torrentNumberChanged
+{
+    int count = [fTorrents count];
+    [fTotalTorrentsField setStringValue: [NSString stringWithFormat:
+                @"%d Torrent%s", count, count == 1 ? "" : "s"]];
+}
+
 - (void) advancedChanged: (id) sender
 {
     [fAdvancedBarItem setState: ![fAdvancedBarItem state]];
-    [fDefaults setObject: [fAdvancedBarItem state] == NSOffState ? @"NO" : @"YES"
-                forKey:@"UseAdvancedBar"];
+    [fDefaults setBool: [fAdvancedBarItem state] forKey: @"UseAdvancedBar"];
 
     [fTableView display];
@@ -377 +376 @@
 - (void) openShowSheet: (id) sender
 {
-    NSOpenPanel * panel;
-    NSArray     * fileTypes;
-
-    panel     = [NSOpenPanel openPanel];
-    fileTypes = [NSArray arrayWithObject: @"torrent"];
+    NSOpenPanel * panel = [NSOpenPanel openPanel];
+    NSArray * fileTypes = [NSArray arrayWithObject: @"torrent"];
 
     [panel setAllowsMultipleSelection: YES];
-    [panel setCanChooseFiles:          YES];
-    [panel setCanChooseDirectories:    NO];
-
-    [panel beginSheetForDirectory: NULL file: NULL types: fileTypes
+    [panel setCanChooseFiles: YES];
+    [panel setCanChooseDirectories: NO];
+
+    [panel beginSheetForDirectory: nil file: nil types: fileTypes
         modalForWindow: fWindow modalDelegate: self didEndSelector:
         @selector( openSheetClosed:returnCode:contextInfo: )
-        contextInfo: NULL];
+        contextInfo: nil];
 }
 
@@ -398 +394 @@
 }
 
-- (void) openSheetClosed: (NSOpenPanel *) s returnCode: (int) code
+- (void) openSheetClosed: (NSOpenPanel *) panel returnCode: (int) code
     contextInfo: (void *) info
 {
     if( code == NSOKButton )
         [self performSelectorOnMainThread: @selector(cantFindAName:)
-                    withObject: [s filenames] waitUntilDone: NO];
+                    withObject: [panel filenames] waitUntilDone: NO];
 }
 
@@ -421 +417 @@
     Torrent * torrent;
     unsigned int i;
-    
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
     {
@@ -429 +424 @@
     
     [self updateUI: nil];
+    [self sortTorrents];
     [self updateTorrentHistory];
 }
@@ -447 +443 @@
     Torrent * torrent;
     unsigned int i;
-    
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
     {
@@ -455 +450 @@
     
     [self updateUI: nil];
+    [self sortTorrents];
     [self updateTorrentHistory];
 }
@@ -462 +458 @@
                      deleteData: (BOOL) deleteData
 {
+    NSArray * torrents = [[self torrentsAtIndexes: indexSet] retain];
     int active = 0;
-    unsigned int i;
-    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        if ([[fTorrents objectAtIndex: i] isActive])
+
+    Torrent * torrent;
+    NSEnumerator * enumerator = [torrents objectEnumerator];
+    while ((torrent = [enumerator nextObject]))
+        if ([torrent isActive])
             active++;
 
@@ -471 +470 @@
     {
         NSDictionary * dict = [NSDictionary dictionaryWithObjectsAndKeys:
-            [fTableView selectedRowIndexes], @"Index",
+            torrents, @"Torrents",
             [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent",
             [NSNumber numberWithBool: deleteData], @"DeleteData",
@@ -504 +503 @@
     else
     {
-        [self confirmRemoveTorrentWithIndex: indexSet
+        [self confirmRemoveTorrents: torrents
                 deleteTorrent: deleteTorrent
                 deleteData: deleteData];
@@ -510 +509 @@
 }
 
-- (void) removeSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode
-                        contextInfo:(NSDictionary *)dict
+- (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode
+                        contextInfo: (NSDictionary *) dict
 {
     [NSApp stopModal];
 
-    if( returnCode == NSAlertDefaultReturn )
-    {
-        [self confirmRemoveTorrentWithIndex: [dict objectForKey:@"Index"]
-            deleteTorrent: [[dict objectForKey:@"DeleteTorrent"] boolValue]
-            deleteData: [[dict objectForKey:@"DeleteData"] boolValue]];
-    }
-
+    NSArray * torrents = [dict objectForKey: @"Torrents"];
+    BOOL deleteTorrent = [[dict objectForKey: @"DeleteTorrent"] boolValue];
+    BOOL deleteData = [[dict objectForKey: @"DeleteData"] boolValue];
     [dict release];
-}
-
-- (void) confirmRemoveTorrentWithIndex: (NSIndexSet *) indexSet
+    
+    if (returnCode == NSAlertDefaultReturn)
+    {
+        [self confirmRemoveTorrents: torrents
+            deleteTorrent: deleteTorrent
+            deleteData: deleteData];
+    }
+    else
+        [torrents release];
+}
+
+- (void) confirmRemoveTorrents: (NSArray *) torrents
             deleteTorrent: (BOOL) deleteTorrent
             deleteData: (BOOL) deleteData
 {
     Torrent * torrent;
-    unsigned int i;
-    
-    for (i = [indexSet lastIndex]; i != NSNotFound; i = [indexSet indexLessThanIndex: i])
-    {
-        torrent = [fTorrents objectAtIndex: i];
-    
+    NSEnumerator * enumerator = [torrents objectEnumerator];
+    while ((torrent = [enumerator nextObject]))
+    {
         [torrent stop];
 
@@ -543 +544 @@
         if( deleteTorrent )
             [torrent trashTorrent];
-        
+
         [fTorrents removeObject: torrent];
-        [torrent release];
-    }
-
+    }
+    [torrents release];
+    
+    [self torrentNumberChanged];
+
+    [fTableView deselectAll: nil];
     [self updateUI: nil];
     [self updateTorrentHistory];
@@ -554 +558 @@
 - (void) removeTorrent: (id) sender
 {
-    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteTorrent: NO deleteData: NO ];
+    [self removeTorrentWithIndex: [fTableView selectedRowIndexes] deleteTorrent: NO deleteData: NO];
 }
 
@@ -572 +576 @@
 }
 
-- (void) showInfo: (id) sender
-{
-    if( [fInfoPanel isVisible] )
-    {
-        [fInfoPanel close];
-    }
-    else
-    {
-        [fInfoPanel orderFront: sender];
-    }
-}
-
-- (void) updateInfoPanel
-{
-    int numberSelected = [fTableView numberOfSelectedRows];
-    if( numberSelected != 1 )
-    {
-        [fInfoImageView setImage: fAppIcon];
-        
-        [fInfoName setStringValue: numberSelected == 0
-                ? @"No Torrent Selected"
-                : [[NSString stringWithInt: numberSelected]
-                    stringByAppendingString: @" Torrents Selected"]];
-                    
-        [fInfoSize setStringValue: @""];
-        [fInfoTracker setStringValue: @""];
-        [fInfoAnnounce setStringValue: @""];
-        [fInfoPieceSize setStringValue: @""];
-        [fInfoPieces setStringValue: @""];
-        [fInfoHash1 setStringValue: @""];
-        [fInfoHash2 setStringValue: @""];
-        [fInfoSeeders setStringValue: @""];
-        [fInfoLeechers setStringValue: @""];
-        [fInfoDownloaded setStringValue: @""];
-        [fInfoUploaded setStringValue: @""];
-        return;
-    }
-    
-    int row = [fTableView selectedRow];
-
-    Torrent * torrent = [fTorrents objectAtIndex: row];
-    [fInfoImageView setImage: [torrent iconNonFlipped]];
-    [fInfoName setStringValue: [torrent name]];
-    [fInfoSize setStringValue: [NSString
-        stringForFileSize: [torrent size]]];
-    [fInfoTracker setStringValue: [torrent tracker]];
-    [fInfoAnnounce setStringValue: [torrent announce]];
-    [fInfoPieceSize setStringValue: [NSString
-        stringForFileSize: [torrent pieceSize]]];
-    [fInfoPieces setIntValue: [torrent pieceCount]];
-    [fInfoHash1 setStringValue: [torrent hash1]];
-    [fInfoHash2 setStringValue: [torrent hash2]];
-    int seeders = [torrent seeders], leechers = [torrent leechers];
-    [fInfoSeeders setStringValue: seeders < 0 ?
-        @"?" : [NSString stringWithInt: seeders]];
-    [fInfoLeechers setStringValue: leechers < 0 ?
-        @"?" : [NSString stringWithInt: leechers]];
-    [fInfoDownloaded setStringValue: [NSString
-        stringForFileSize: [torrent downloaded]]];
-    [fInfoUploaded setStringValue: [NSString
-        stringForFileSize: [torrent uploaded]]];
+- (void) revealTorrent: (id) sender
+{
+    Torrent * torrent;
+    NSIndexSet * indexSet = [fTableView selectedRowIndexes];
+    unsigned int i;
+    
+    for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
+    {
+        torrent = [fTorrents objectAtIndex: i];
+        [torrent reveal];
+    }
 }
 
 - (void) updateUI: (NSTimer *) t
 {
-    float dl, ul;
-    NSEnumerator * enumerator;
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;
-
-    /* Update the TableView */
-    enumerator = [fTorrents objectEnumerator];
     while( ( torrent = [enumerator nextObject] ) )
     {
@@ -652 +602 @@
             [self notifyGrowl: [torrent name]];
             if( ![fWindow isKeyWindow] )
-            {
                 fCompleted++;
-            }
-        }
-    }
+                
+            [self sortTorrents];
+        }
+    }
+    
     [fTableView reloadData];
-
+    
     //Update the global DL/UL rates
+    float dl, ul;
     tr_torrentRates( fLib, &dl, &ul );
     NSString * downloadRate = [NSString stringForSpeed: dl];
@@ -665 +617 @@
     [fTotalDLField setStringValue: downloadRate];
     [fTotalULField setStringValue: uploadRate];
-    
-    int count = [fTorrents count];
-    [fTotalTorrentsField setStringValue: [NSString stringWithFormat:
-            @"%d Torrent%s", count, count == 1 ? "" : "s"]];
-
-    [self updateInfoPanel];
+
+    [self updateInfoStats];
 
     //badge dock
@@ -688 +636 @@
     Torrent * torrent;
     while( ( torrent = [enumerator nextObject] ) )
-    {
-        [history addObject: [NSDictionary dictionaryWithObjectsAndKeys:
-            [torrent path],                      @"TorrentPath",
-            [torrent getFolder],                 @"DownloadFolder",
-            [torrent isActive] ? @"NO" : @"YES", @"Paused",
-            [torrent date],                      @"Date",
-            nil]];
-    }
+        [history addObject: [torrent history]];
 
     [fDefaults setObject: history forKey: @"History"];
 }
 
+- (void) showInfo: (id) sender
+{
+    if ([[fInfoController window] isVisible])
+        [[fInfoController window] performClose: nil];
+    else
+    {
+        [fInfoController updateInfoForTorrents: [self torrentsAtIndexes:
+                                            [fTableView selectedRowIndexes]]];
+        [[fInfoController window] orderFront: nil];
+    }
+}
+
+- (void) updateInfo
+{
+    if ([[fInfoController window] isVisible])
+        [fInfoController updateInfoForTorrents: [self torrentsAtIndexes:
+                                            [fTableView selectedRowIndexes]]];
+}
+
+- (void) updateInfoStats
+{
+    if ([[fInfoController window] isVisible])
+        [fInfoController updateInfoStatsForTorrents: [self torrentsAtIndexes:
+                                            [fTableView selectedRowIndexes]]];
+}
+
+- (void) sortTorrents
+{
+    //remember selected rows if needed
+    NSArray * selectedTorrents = nil;
+    int numSelected = [fTableView numberOfSelectedRows];
+    if (numSelected > 0 && numSelected < [fTorrents count])
+        selectedTorrents = [self torrentsAtIndexes: [fTableView selectedRowIndexes]];
+
+    NSSortDescriptor * nameDescriptor = [[[NSSortDescriptor alloc] initWithKey:
+                                            @"name" ascending: YES] autorelease],
+                    * dateDescriptor = [[[NSSortDescriptor alloc] initWithKey:
+                                            @"date" ascending: YES] autorelease];
+
+    NSArray * descriptors;
+    if ([fSortType isEqualToString: @"Name"])
+        descriptors = [[NSArray alloc] initWithObjects: nameDescriptor, dateDescriptor, nil];
+    else if ([fSortType isEqualToString: @"State"])
+    {
+        NSSortDescriptor * stateDescriptor = [[[NSSortDescriptor alloc] initWithKey:
+                                                @"stateSortKey" ascending: NO] autorelease];
+        descriptors = [[NSArray alloc] initWithObjects: stateDescriptor, nameDescriptor, dateDescriptor, nil];
+    }
+    else
+        descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, nameDescriptor, nil];
+
+    [fTorrents sortUsingDescriptors: descriptors];
+    [descriptors release];
+    
+    [fTableView reloadData];
+    
+    //set selected rows if needed
+    if (selectedTorrents)
+    {
+        [fTableView deselectAll: nil];
+        
+        Torrent * torrent;
+        NSEnumerator * enumerator = [selectedTorrents objectEnumerator];
+        while ((torrent = [enumerator nextObject]))
+            [fTableView selectRow: [fTorrents indexOfObject: torrent] byExtendingSelection: YES];
+    }
+}
+
+- (void) setSort: (id) sender
+{
+    [fCurrentSortItem setState: NSOffState];
+    fCurrentSortItem = sender;
+    [sender setState: NSOnState];
+
+    if (sender == fNameSortItem)
+        fSortType = @"Name";
+    else if (sender == fStateSortItem)
+        fSortType = @"State";
+    else
+        fSortType = @"Date";
+       
+    [fDefaults setObject: fSortType forKey: @"Sort"];
+
+    [self sortTorrents];
+}
+
 - (int) numberOfRowsInTableView: (NSTableView *) t
 {
     return [fTorrents count];
-}
-
-- (id) tableView: (NSTableView *) t objectValueForTableColumn:
-    (NSTableColumn *) tableColumn row: (int) rowIndex
-{
-    return nil;
 }
 
@@ -716 +737 @@
     [cell setTorrent: [fTorrents objectAtIndex: rowIndex]];
 
-    if( OSX_VERSION >= 10.3 && [fWindow isKeyWindow] &&
-                    [fTableView isRowSelected: rowIndex] )
+    if( [fWindow isKeyWindow] && [fTableView isRowSelected: rowIndex] )
         [cell setTextColor: [NSColor whiteColor]];
     else
@@ -745 +765 @@
         return NSDragOperationNone;
 
-    [fTableView setDropRow: [fTorrents count]
+    [fTableView setDropRow: [fTableView numberOfRows]
         dropOperation: NSTableViewDropAbove];
     return NSDragOperationGeneric;
@@ -752 +772 @@
 - (void) tableViewSelectionDidChange: (NSNotification *) n
 {
-    [self updateInfoPanel];
+    [self updateInfo];
 }
 
@@ -764 +784 @@
         [item setLabel: @"Open"];
         [item setPaletteLabel: [item label]];
-        [item setToolTip: @"Open a torrent"];
+        [item setToolTip: @"Open torrent files"];
         [item setImage: [NSImage imageNamed: @"Open.png"]];
         [item setTarget: self];
@@ -773 +793 @@
         [item setLabel: @"Remove"];
         [item setPaletteLabel: [item label]];
-        [item setToolTip: @"Remove torrent from list"];
+        [item setToolTip: @"Remove selected torrents"];
         [item setImage: [NSImage imageNamed: @"Remove.png"]];
         [item setTarget: self];
@@ -782 +802 @@
         [item setLabel: @"Info"];
         [item setPaletteLabel: [item label]];
-        [item setToolTip: @"Information"];
+        [item setToolTip: @"Display torrent info"];
         [item setImage: [NSImage imageNamed: @"Info.png"]];
         [item setTarget: self];
@@ -818 +838 @@
     return [NSArray arrayWithObjects:
             TOOLBAR_OPEN, TOOLBAR_REMOVE,
-            TOOLBAR_RESUME_ALL, TOOLBAR_PAUSE_ALL,
+            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL,
             TOOLBAR_INFO,
             NSToolbarSeparatorItemIdentifier,
             NSToolbarSpaceItemIdentifier,
             NSToolbarFlexibleSpaceItemIdentifier,
-            NSToolbarCustomizeToolbarItemIdentifier,
-            NULL];
+            NSToolbarCustomizeToolbarItemIdentifier, nil];
 }
 
@@ -832 +851 @@
             TOOLBAR_OPEN, TOOLBAR_REMOVE,
             NSToolbarSeparatorItemIdentifier,
-            TOOLBAR_RESUME_ALL, TOOLBAR_PAUSE_ALL,
+            TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL,
             NSToolbarFlexibleSpaceItemIdentifier,
-            TOOLBAR_INFO,
-            NULL];
-}
-
-- (void) runCustomizationPalette: (id) sender
-{
-    [fToolbar runCustomizationPalette:sender];
-}
-
-- (void) showHideToolbar: (id) sender
-{
-    [fWindow toggleToolbarShown:sender];
+            TOOLBAR_INFO, nil];
 }
 
@@ -866 +874 @@
 }
 
-- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem
+- (BOOL) validateToolbarItem: (NSToolbarItem *) toolbarItem
 {
     SEL action = [toolbarItem action];
@@ -900 +908 @@
 }
 
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+- (BOOL) validateMenuItem: (NSMenuItem *) menuItem
 {
     SEL action = [menuItem action];
 
-    //disable menus if customize sheet is active
-    if ([fToolbar customizationPaletteIsRunning])
-        return NO;
-
-    //enable customize toolbar item
-    if (action == @selector(showHideToolbar:))
-    {
-        [menuItem setTitle: [fToolbar isVisible] ? @"Hide Toolbar" : @"Show Toolbar"];
-        return YES;
-    }
+    //only enable some menus if window is useable
+    BOOL canUseWindow = [fWindow isKeyWindow] && ![fToolbar customizationPaletteIsRunning];
 
     //enable show info
     if (action == @selector(showInfo:))
     {
-        [menuItem setTitle: [fInfoPanel isVisible] ? @"Hide Info" : @"Show Info"];
+        [menuItem setTitle: [[fInfoController window] isVisible] ? @"Hide Info" : @"Show Info"];
         return YES;
     }
@@ -926 +926 @@
     {
         [menuItem setTitle: fStatusBar ? @"Hide Status Bar" : @"Show Status Bar"];
-        return YES;
+        return canUseWindow;
     }
 
@@ -951 +951 @@
     }
 
-    if (action == @selector(revealFromMenu:))
-    {
-        return [fTableView numberOfSelectedRows] > 0;
+    if (action == @selector(revealTorrent:))
+    {
+        return canUseWindow && [fTableView numberOfSelectedRows] > 0;
     }
 
@@ -978 +978 @@
     
         //append or remove ellipsis when needed
-        if( active && [fDefaults boolForKey: @"CheckRemove"] )
-        {
-            if (![[menuItem title] hasSuffix:NS_ELLIPSIS])
-                [menuItem setTitle:[[menuItem title] stringByAppendingString:NS_ELLIPSIS]];
+        NSString * title = [menuItem title];
+        if (active && [fDefaults boolForKey: @"CheckRemove"])
+        {
+            if (![title hasSuffix: NS_ELLIPSIS])
+                [menuItem setTitle: [title stringByAppendingString: NS_ELLIPSIS]];
         }
         else
         {
-            if ([[menuItem title] hasSuffix:NS_ELLIPSIS])
-                [menuItem setTitle:[[menuItem title] substringToIndex:[[menuItem title] length]-[NS_ELLIPSIS length]]];
-        }
-        return [fTableView numberOfSelectedRows] > 0;
+            if ([title hasSuffix: NS_ELLIPSIS])
+                [menuItem setTitle:[title substringToIndex:
+                            [title rangeOfString: NS_ELLIPSIS].location]];
+        }
+        return canUseWindow && [fTableView numberOfSelectedRows] > 0;
     }
 
@@ -994 +996 @@
     if( action == @selector(stopTorrent:) )
     {
+        if (!canUseWindow)
+            return NO;
+    
         Torrent * torrent;
         NSIndexSet * indexSet = [fTableView selectedRowIndexes];
@@ -1010 +1015 @@
     if( action == @selector(resumeTorrent:) )
     {
+        if (!canUseWindow)
+            return NO;
+    
         Torrent * torrent;
         NSIndexSet * indexSet = [fTableView selectedRowIndexes];
@@ -1022 +1030 @@
         return NO;
     }
+    
+    //enable resume item
+    if (action == @selector(setSort:))
+        return canUseWindow;
 
     return YES;
@@ -1038 +1050 @@
             /* Close all connections before going to sleep and remember
                we should resume when we wake up */
-            enumerator = [fTorrents objectEnumerator];
-            while( ( torrent = [enumerator nextObject] ) )
-            {
-                [torrent sleep];
-            }
+            [fTorrents makeObjectsPerformSelector: @selector(sleep)];
 
             /* Wait for torrents to stop (5 seconds timeout) */
@@ -1076 +1084 @@
         case kIOMessageSystemHasPoweredOn:
             /* Resume download after we wake up */
-            enumerator = [fTorrents objectEnumerator];
-            while( ( torrent = [enumerator nextObject] ) )
-            {
-                [torrent wakeUp];
-            }
+            [fTorrents makeObjectsPerformSelector: @selector(wakeUp)];
             break;
     }
@@ -1088 +1092 @@
     defaultFrame: (NSRect) defaultFrame
 {
-    NSRect rectWin, rectView;
-    float  foo;
-
-    rectWin  = [fWindow frame];
-    rectView = [fScrollView frame];
-    foo      = 10.0 - rectView.size.height + MAX( 1U, [fTorrents count] ) *
-        ( [fTableView rowHeight] + [fTableView intercellSpacing].height );
-
-    rectWin.size.height += foo;
-    rectWin.origin.y    -= foo;
+    NSRect rectWin = [fWindow frame];
+    float newHeight = rectWin.size.height - [fScrollView frame].size.height
+            + [fTorrents count] * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
+
+    float minHeight = [fWindow minSize].height;
+    if (newHeight < minHeight)
+        newHeight = minHeight;
+
+    rectWin.origin.y -= (newHeight - rectWin.size.height);
+    rectWin.size.height = newHeight;
 
     return rectWin;
@@ -1176 +1180 @@
 }
 
-- (void) revealFromMenu: (id) sender
-{
-    Torrent * torrent;
-    torrent = [fTorrents objectAtIndex: [fTableView selectedRow]];
-    [torrent reveal];
-}
-
 - (void) checkForUpdate: (id) sender
 {
@@ -1191 +1188 @@
 {
     NSString * check = [fDefaults stringForKey: @"VersionCheck"];
-    if( [check isEqualToString: @"Never"] )
-        return;
 
     NSTimeInterval interval;
@@ -1202 +1197 @@
         return;
 
-    id lastObject = [fDefaults objectForKey: @"VersionCheckLast"];
-    NSDate * lastDate = [lastObject isKindOfClass: [NSDate class]] ?
-        lastObject : nil;
+    NSDate * lastDate = [fDefaults objectForKey: @"VersionCheckLast"];
     if( lastDate )
     {
-        NSTimeInterval actualInterval =
-            [[NSDate date] timeIntervalSinceDate: lastDate];
+        NSTimeInterval actualInterval = [[NSDate date]
+                            timeIntervalSinceDate: lastDate];
         if( actualInterval > 0 && actualInterval < interval )
-        {
             return;
-        }
     }
 
@@ -1228 +1219 @@
 - (void) URLResourceDidFinishLoading: (NSURL *) sender
 {
+    //check if plist was actually found and contains a version
     NSDictionary * dict = [NSPropertyListSerialization
                             propertyListFromData: [sender resourceDataUsingCache: NO]
                             mutabilityOption: NSPropertyListImmutable
                             format: nil errorDescription: nil];
-
-    //check if plist was actually found and contains a version
-    NSString * webVersion = nil;
-    if (dict)
-        webVersion = [dict objectForKey: @"Version"];
-    if (!webVersion)
+    NSString * webVersion;
+    if (!dict || !(webVersion = [dict objectForKey: @"Version"]))
     {
         if (!fCheckIsAutomatic)
         {
-            if( OSX_VERSION >= 10.3 )
-            {
-                NSAlert * dialog = [[NSAlert alloc] init];
-                [dialog addButtonWithTitle: @"OK"];
-                [dialog setMessageText: @"Error checking for updates."];
-                [dialog setInformativeText:
-                        @"Transmission was not able to check the latest version available."];
-                [dialog setAlertStyle: NSInformationalAlertStyle];
-
-                [dialog runModal];
-                [dialog release];
-            }
-            else
-                /* XXX */;
+            NSAlert * dialog = [[NSAlert alloc] init];
+            [dialog addButtonWithTitle: @"OK"];
+            [dialog setMessageText: @"Error checking for updates."];
+            [dialog setInformativeText:
+                    @"Transmission was not able to check the latest version available."];
+            [dialog setAlertStyle: NSInformationalAlertStyle];
+
+            [dialog runModal];
+            [dialog release];
         }
         return;
@@ -1276 +1259 @@
         }
 
-        if( OSX_VERSION >= 10.3 )
-        {
-            result = [currentSub compare: webSub options: NSNumericSearch];
-            if (result != NSOrderedSame)
-            {
-                if (result == NSOrderedAscending)
-                    webGreater = YES;
-                break;
-            }
-        }
-        else
-            /* XXX */;
+        result = [currentSub compare: webSub options: NSNumericSearch];
+        if (result != NSOrderedSame)
+        {
+            if (result == NSOrderedAscending)
+                webGreater = YES;
+            break;
+        }
     }
 
     if (webGreater)
     {
-        if( OSX_VERSION >= 10.3 )
-        {
-            NSAlert * dialog = [[NSAlert alloc] init];
-            [dialog addButtonWithTitle: @"Go to Website"];
-            [dialog addButtonWithTitle:@"Cancel"];
-            [dialog setMessageText: @"New version is available!"];
-            [dialog setInformativeText: [NSString stringWithFormat:
-                @"A newer version (%@) is available for download from the Transmission website.", webVersion]];
-            [dialog setAlertStyle: NSInformationalAlertStyle];
-
-            if ([dialog runModal] == NSAlertFirstButtonReturn)
-                [self linkHomepage: nil];
-
-            [dialog release];
-        }
-        else
-            /* XXX */;
+        NSAlert * dialog = [[NSAlert alloc] init];
+        [dialog addButtonWithTitle: @"Go to Website"];
+        [dialog addButtonWithTitle:@"Cancel"];
+        [dialog setMessageText: @"New version is available!"];
+        [dialog setInformativeText: [NSString stringWithFormat:
+            @"A newer version (%@) is available for download from the Transmission website.", webVersion]];
+        [dialog setAlertStyle: NSInformationalAlertStyle];
+
+        if ([dialog runModal] == NSAlertFirstButtonReturn)
+            [self linkHomepage: nil];
+
+        [dialog release];
     }
     else if (!fCheckIsAutomatic)
     {
-        if( OSX_VERSION >= 10.3 )
-        {
-            NSAlert * dialog = [[NSAlert alloc] init];
-            [dialog addButtonWithTitle: @"OK"];
-            [dialog setMessageText: @"No new versions are available."];
-            [dialog setInformativeText: [NSString stringWithFormat:
-                @"You are running the most current version of Transmission (%@).", currentVersion]];
-            [dialog setAlertStyle: NSInformationalAlertStyle];
-
-            [dialog runModal];
-            [dialog release];
-        }
-        else
-            /* XXX */;
+        NSAlert * dialog = [[NSAlert alloc] init];
+        [dialog addButtonWithTitle: @"OK"];
+        [dialog setMessageText: @"No new versions are available."];
+        [dialog setInformativeText: [NSString stringWithFormat:
+            @"You are running the most current version of Transmission (%@).", currentVersion]];
+        [dialog setAlertStyle: NSInformationalAlertStyle];
+
+        [dialog runModal];
+        [dialog release];
     }
     else;

trunk/macosx/Defaults.plist

@@ -3 +3 @@
 <plist version="1.0">
 <dict>
+        <key>AutoStartDownload</key>
+        <true/>
         <key>BadgeDownloadRate</key>
         <false/>
@@ -23 +25 @@
         <key>DownloadLimit</key>
         <integer>100</integer>
+        <key>History</key>
+        <array/>
         <key>InfoVisible</key>
         <false/>
@@ -31 +35 @@
         <key>MoveFolder</key>
         <string>~/Desktop</string>
+        <key>RatioCheck</key>
+        <false/>
+        <key>RatioLimit</key>
+        <integer>2</integer>
         <key>ShowInspector</key>
         <false/>
+        <key>Sort</key>
+        <string>Date</string>
         <key>StatusBar</key>
         <true/>

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -15 +15 @@
                 resumeAllTorrents = id; 
                 resumeTorrent = id; 
-                revealFromMenu = id; 
-                runCustomizationPalette = id; 
-                showHideToolbar = id; 
+                revealTorrent = id; 
+                setSort = id; 
                 showInfo = id; 
                 showMainWindow = id; 
@@ -28 +27 @@
             LANGUAGE = ObjC; 
             OUTLETS = {
+                fActionButton = NSButton; 
                 fAdvancedBarItem = NSMenuItem; 
-                fInfoAnnounce = NSTextField; 
-                fInfoDownloaded = NSTextField; 
-                fInfoHash1 = NSTextField; 
-                fInfoHash2 = NSTextField; 
-                fInfoImageView = NSImageView; 
-                fInfoLeechers = NSTextField; 
-                fInfoName = NSTextField; 
-                fInfoPanel = NSPanel; 
-                fInfoPieceSize = NSTextField; 
-                fInfoPieces = NSTextField; 
-                fInfoSeeders = NSTextField; 
-                fInfoSize = NSTextField; 
-                fInfoTracker = NSTextField; 
-                fInfoUploaded = NSTextField; 
+                fDateSortItem = NSMenuItem; 
+                fNameSortItem = NSMenuItem; 
                 fPauseResumeItem = NSMenuItem; 
                 fPrefsController = PrefsController; 
@@ -53 +41 @@
                 fScrollView = NSScrollView; 
                 fShowHideToolbar = NSMenuItem; 
+                fStateSortItem = NSMenuItem; 
                 fStats = NSBox; 
                 fTableView = TorrentTableView; 
@@ -69 +58 @@
             ACTIONS = {
                 folderSheetShow = id; 
+                setAutoStart = id; 
                 setBadge = id; 
                 setDownloadLocation = id; 
@@ -75 +65 @@
                 setLimitMenu = id; 
                 setPort = id; 
+                setQuickRatio = id; 
                 setQuickSpeed = id; 
-                setQuitMessage = id; 
-                setRemoveMessage = id; 
+                setRatio = id; 
+                setRatioCheck = id; 
+                setRatioMenu = id; 
+                setShowMessage = id; 
                 setUpdate = id; 
             }; 
@@ -83 +76 @@
             LANGUAGE = ObjC; 
             OUTLETS = {
+                fAutoStartCheck = NSButton; 
                 fBadgeDownloadRateCheck = NSButton; 
                 fBadgeUploadRateCheck = NSButton; 
@@ -97 +91 @@
                 fPrefsWindow = NSPanel; 
                 fQuitCheck = NSButton; 
+                fRatioCheck = NSButton; 
+                fRatioField = NSTextField; 
+                fRatioNotSetItem = NSMenuItem; 
+                fRatioSetItem = NSMenuItem; 
                 fRemoveCheck = NSButton; 
+                fTransfersView = NSView; 
                 fUpdatePopUp = NSPopUpButton; 
                 fUploadCheck = NSButton; 

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>1041</key>
-                <string>344 478 204 68 0 0 1152 842 </string>
+                <string>344 478 208 99 0 0 1152 842 </string>
+                <key>1343</key>
+                <string>344 526 463 104 0 0 1152 842 </string>
                 <key>29</key>
-                <string>79 778 371 44 0 0 1152 842 </string>
+                <string>154 771 371 44 0 0 1152 842 </string>
                 <key>456</key>
-                <string>212 488 144 118 0 0 1152 842 </string>
+                <string>212 488 144 137 0 0 1152 842 </string>
                 <key>581</key>
                 <string>324 628 112 68 0 0 1152 842 </string>
@@ -18 +20 @@
                 <string>54 521 103 68 0 0 1152 842 </string>
                 <key>783</key>
-                <string>366 453 420 250 0 0 1152 842 </string>
+                <string>347 472 457 212 0 0 1152 842 </string>
                 <key>796</key>
-                <string>366 496 420 164 0 0 1152 842 </string>
+                <string>347 461 457 234 0 0 1152 842 </string>
                 <key>825</key>
-                <string>498 525 155 107 0 0 1152 842 </string>
+                <string>348 524 463 107 0 0 1152 842 </string>
         </dict>
         <key>IBFramework Version</key>
-        <string>443.0</string>
+        <string>446.1</string>
         <key>IBOldestOS</key>
         <integer>3</integer>
-        <key>IBOpenObjects</key>
-        <array>
-                <integer>21</integer>
-        </array>
         <key>IBSystem Version</key>
         <string>8I127</string>

trunk/macosx/MenuButton.m

@@ -8 +8 @@
    [self highlight: YES];
    
-   [NSMenu popUpContextMenu: [self menu] withEvent: event forView: self];
+   NSPoint location = NSMakePoint(3, -2);
+   
+   NSEvent * theEvent= [NSEvent mouseEventWithType: [event type]
+                        location: location
+                        modifierFlags: [event modifierFlags]
+                        timestamp: [event timestamp]
+                        windowNumber: [event windowNumber]
+                        context: [event context]
+                        eventNumber: [event eventNumber]
+                        clickCount: [event clickCount]
+                        pressure: [event pressure]];
+
+   [NSMenu popUpContextMenu: [self menu] withEvent: theEvent forView: self];
    
    [self setState: NSOffState];

trunk/macosx/PrefsController.h

@@ -31 +31 @@
     IBOutlet NSPanel        * fPrefsWindow;
     NSToolbar               * fToolbar;
-    IBOutlet NSView         * fGeneralView;
-    IBOutlet NSView         * fNetworkView;
-    IBOutlet NSView         * fBlankView;
+    IBOutlet NSView         * fGeneralView, * fTransfersView,
+                            * fNetworkView, * fBlankView;
     
     IBOutlet NSPopUpButton  * fFolderPopUp;
-    IBOutlet NSButton       * fQuitCheck;
-    IBOutlet NSButton       * fRemoveCheck;
-    IBOutlet NSButton       * fBadgeDownloadRateCheck;
-    IBOutlet NSButton       * fBadgeUploadRateCheck;                            
+    IBOutlet NSButton       * fQuitCheck, * fRemoveCheck,
+                            * fBadgeDownloadRateCheck, * fBadgeUploadRateCheck,
+                            * fAutoStartCheck;                           
     IBOutlet NSPopUpButton  * fUpdatePopUp;
 
@@ -47 +45 @@
     IBOutlet NSButton       * fDownloadCheck;
     IBOutlet NSTextField    * fDownloadField;
+    IBOutlet NSButton       * fRatioCheck;
+    IBOutlet NSTextField    * fRatioField;
     
     IBOutlet NSMenu         * fUploadMenu, * fDownloadMenu;
     IBOutlet NSMenuItem     * fUploadLimitItem, * fUploadNoLimitItem,
-                            * fDownloadLimitItem, * fDownloadNoLimitItem;
+                            * fDownloadLimitItem, * fDownloadNoLimitItem,
+                            * fRatioSetItem, * fRatioNotSetItem;
     
     IBOutlet NSWindow       * fWindow;
@@ -60 +61 @@
 - (void) setPrefsWindow: (tr_handle_t *) handle;
 
-- (void) setQuitMessage:        (id) sender;
-- (void) setRemoveMessage:      (id) sender;
+- (void) setShowMessage:        (id) sender;
 - (void) setBadge:              (id) sender;
 - (void) setUpdate:             (id) sender;
+- (void) setAutoStart:          (id) sender;
 - (void) setDownloadLocation:   (id) sender;
 - (void) folderSheetShow:       (id) sender;
@@ -73 +74 @@
 - (void) setQuickSpeed:         (id) sender;
 
+- (void) setRatio:              (id) sender;
+- (void) setRatioCheck:                 (id) sender;
+- (void) setRatioMenu:          (id) sender;
+- (void) setQuickRatio:         (id) sender;
+
 @end

trunk/macosx/PrefsController.m

@@ -25 +25 @@
 #import "Utils.h"
 
-#define MIN_PORT            1
-#define MAX_PORT            65535
-
 #define DOWNLOAD_FOLDER     0
 #define DOWNLOAD_TORRENT    2
@@ -37 +34 @@
 
 #define TOOLBAR_GENERAL     @"General"
+#define TOOLBAR_TRANSFERS    @"Transfers"
 #define TOOLBAR_NETWORK     @"Network"
 
@@ -42 +40 @@
 
 - (void) showGeneralPref: (id) sender;
+- (void) showTransfersPref: (id) sender;
 - (void) showNetworkPref: (id) sender;
 
@@ -62 +61 @@
 }
 
-- (void)dealloc
+- (void) dealloc
 {
     [fDownloadFolder release];
@@ -76 +75 @@
     [fToolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
     [fToolbar setSizeMode: NSToolbarSizeModeRegular];
-    [[fPrefsWindow standardWindowButton: NSWindowToolbarButton]
-        setFrame: NSZeroRect];
-
-    if( [fToolbar respondsToSelector: @selector(setSelectedItemIdentifier:) ] )
-        [fToolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
-    [self setPrefView: fGeneralView];
+
+    [fToolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
+    [self showGeneralPref: nil];
 
     fDefaults = [NSUserDefaults standardUserDefaults];
+    fHandle = handle;
     
     //set download folder
@@ -134 +131 @@
     tr_setUploadLimit( fHandle, checkUpload ? uploadLimit : -1 );
 
-    //set download limit
+        //set download limit
     BOOL checkDownload = [fDefaults boolForKey: @"CheckDownload"];
     int downloadLimit = [fDefaults integerForKey: @"DownloadLimit"];
@@ -150 +147 @@
     
     tr_setDownloadLimit( fHandle, checkDownload ? downloadLimit : -1 );
+    
+    //set ratio limit
+    BOOL ratioCheck = [fDefaults boolForKey: @"RatioCheck"];
+    float ratioLimit = [fDefaults floatForKey: @"RatioLimit"];
+
+    [fRatioCheck setState: ratioCheck ? NSOnState : NSOffState];
+    [fRatioField setEnabled: ratioCheck];
+    [fRatioField setFloatValue: ratioLimit];
+    
+    [fRatioSetItem setTitle: [NSString stringWithFormat: @"Stop at Ratio (%.1f)", ratioLimit]];
+    if (ratioCheck)
+        [fRatioSetItem setState: NSOnState];
+    else
+        [fRatioNotSetItem setState: NSOnState];
     
     //set remove and quit prompts
@@ -160 +171 @@
     [fBadgeDownloadRateCheck setState: [fDefaults boolForKey: @"BadgeDownloadRate"]];
     [fBadgeUploadRateCheck setState: [fDefaults boolForKey: @"BadgeUploadRate"]];
+    
+    //set auto start
+    [fAutoStartCheck setState: [fDefaults boolForKey: @"AutoStartDownload"]];
 
     /* Check for update */
@@ -189 +203 @@
         [item setAction: @selector( showGeneralPref: )];
     }
+    else if ([ident isEqualToString: TOOLBAR_TRANSFERS])
+    {
+        [item setLabel: TOOLBAR_TRANSFERS];
+        [item setImage: [NSImage imageNamed: @"Transfers.png"]];
+        [item setTarget: self];
+        [item setAction: @selector( showTransfersPref: )];
+    }
     else if ([ident isEqualToString: TOOLBAR_NETWORK])
     {
@@ -205 +226 @@
 }
 
-/* Only used on OS X >= 10.3 */
-- (NSArray *) toolbarSelectableItemIdentifiers: (NSToolbar *)toolbar
+- (NSArray *) toolbarSelectableItemIdentifiers: (NSToolbar *) toolbar
 {
     return [self toolbarDefaultItemIdentifiers: nil];
 }
 
-- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
+- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
 {
     return [self toolbarAllowedItemIdentifiers: nil];
 }
 
-- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
+- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
     return [NSArray arrayWithObjects:
-            TOOLBAR_GENERAL,
-            TOOLBAR_NETWORK,
-            nil];
+            TOOLBAR_GENERAL, TOOLBAR_TRANSFERS,
+            TOOLBAR_NETWORK, nil];
 }
 
@@ -228 +247 @@
     int bindPort = [fPortField intValue];
     
-    //if value entered is not an int or is not in range do not change
-    if (![[fPortField stringValue] isEqualToString:
-            [NSString stringWithInt: bindPort]] 
-            || bindPort < MIN_PORT
-            || bindPort > MAX_PORT)
-    {
-        NSBeep();
-        bindPort = [fDefaults integerForKey: @"BindPort"];
-        [fPortField setIntValue: bindPort];
-    }
-    else
-    {
-        tr_setBindPort( fHandle, bindPort );
-        [fDefaults setInteger: bindPort forKey: @"BindPort"];
-    }
+    tr_setBindPort( fHandle, bindPort );
+    [fDefaults setInteger: bindPort forKey: @"BindPort"];
 }
 
 - (void) setLimit: (id) sender
 {
-    int limit = [sender intValue];
-    
     NSString * key;
     NSMenuItem * menuItem;
@@ -262 +266 @@
     }
 
-    //if value entered is not an int or is less than 0 do not change
-    if (![[sender stringValue] isEqualToString:
-            [NSString stringWithInt: limit]] || limit < 0)
-    {
-        NSBeep();
-        limit = [fDefaults integerForKey: key];
-        [sender setIntValue: limit];
-    }
-    else
-    {
-        [menuItem setTitle: [NSString stringWithFormat: @"Limit (%d KB/s)", limit]];
-        [fDefaults setInteger: limit forKey: key];
-    }
+    int limit = [sender intValue];
+    [fDefaults setInteger: limit forKey: key];
+    
+    [menuItem setTitle: [NSString stringWithFormat: @"Limit (%d KB/s)", limit]];
 
     if( sender == fUploadField )
@@ -309 +304 @@
     
     [fDefaults setBool: check forKey: key];
-
+    
+    [field setIntValue: [field intValue]]; //set to valid value
     [self setLimit: field];
     
@@ -343 +339 @@
 }
 
-- (void) setQuitMessage: (id) sender
-{
-    [fDefaults setBool: ( [fQuitCheck state] == NSOnState )
-        forKey: @"CheckQuit"];
-}
-
-- (void) setRemoveMessage: (id) sender
-{
-    [fDefaults setBool: ( [fRemoveCheck state] == NSOnState )
-        forKey: @"CheckRemove"];
+- (void) setRatio: (id) sender
+{
+    float ratio = [sender floatValue];
+    [fDefaults setFloat: ratio forKey: @"RatioLimit"];
+    
+    [fRatioSetItem setTitle: [NSString stringWithFormat: @"Stop at Ratio (%.1f)", ratio]];
+}
+
+- (void) setRatioCheck: (id) sender
+{
+    BOOL check = [sender state] == NSOnState;
+    
+    [fDefaults setBool: check forKey: @"RatioCheck"];
+    
+    [fRatioField setFloatValue: [fRatioField floatValue]]; //set to valid value
+    [self setRatio: fRatioField];
+    
+    [fRatioField setEnabled: check];
+    
+    [fRatioSetItem setState: check ? NSOnState : NSOffState];
+    [fRatioNotSetItem setState: !check ? NSOnState : NSOffState];
+}
+
+- (void) setRatioMenu: (id) sender
+{
+    int state = sender == fRatioSetItem ? NSOnState : NSOffState;
+                
+    [fRatioCheck setState: state];
+    [self setRatioCheck: fRatioCheck];
+}
+
+- (void) setQuickRatio: (id) sender
+{
+    float limit = [[sender title] floatValue];
+
+    [fRatioField setFloatValue: limit];
+    [self setRatioMenu: fRatioSetItem];
+}
+
+- (void) setShowMessage: (id) sender
+{
+    if (sender == fQuitCheck)
+        [fDefaults setBool: [sender state] forKey: @"CheckQuit"];
+    else if (sender == fRemoveCheck)
+        [fDefaults setBool: [fRemoveCheck state] forKey: @"CheckRemove"];
+    else;
 }
 
 - (void) setBadge: (id) sender
 {   
-    BOOL state = [sender state];
-    
     if (sender == fBadgeDownloadRateCheck)
-        [fDefaults setBool: state forKey: @"BadgeDownloadRate"];
+        [fDefaults setBool: [sender state] forKey: @"BadgeDownloadRate"];
     else if (sender == fBadgeUploadRateCheck)
-        [fDefaults setBool: state forKey: @"BadgeUploadRate"];
+        [fDefaults setBool: [sender state] forKey: @"BadgeUploadRate"];
     else;
 }
@@ -382 +412 @@
 }
 
+- (void) setAutoStart: (id) sender
+{
+    [fDefaults setBool: [sender state] forKey: @"AutoStartDownload"];
+}
+
 - (void) setDownloadLocation: (id) sender
 {
@@ -423 +458 @@
 }
 
+- (void) showTransfersPref: (id) sender
+{
+    [self setPrefView: fTransfersView];
+}
+
 - (void) showNetworkPref: (id) sender
 {
@@ -436 +476 @@
     windowRect.size.height += difference;
     
-    if( [fToolbar respondsToSelector: @selector(selectedItemIdentifier) ] )
-        [fPrefsWindow setTitle: [fToolbar selectedItemIdentifier]];
+    [fPrefsWindow setTitle: [fToolbar selectedItemIdentifier]];
     [fPrefsWindow setContentView: fBlankView];
-    [fPrefsWindow setFrame:windowRect display: YES animate: YES];
+    [fPrefsWindow setFrame: windowRect display: YES animate: YES];
     [fPrefsWindow setContentView: view];
 }

trunk/macosx/Torrent.h

@@ -33 +33 @@
     NSDate       * fDate;
 
+    NSUserDefaults  * fDefaults;
+
     NSImage         * fIcon;
     NSImage         * fIconNonFlipped;
@@ -39 +41 @@
     NSMutableString * fDownloadString;
     NSMutableString * fUploadString;
+    
+    int     fStopRatioSetting;
+    float   fRatioLimit;
 }
 
-- (id)         initWithPath: (NSString *) path lib: (tr_handle_t *) lib;
-- (id)         initWithPath: (NSString *) path lib: (tr_handle_t *) lib
-                        date: (NSDate *) date;
+- (id)          initWithPath: (NSString *) path lib: (tr_handle_t *) lib;
+- (id)          initWithHistory: (NSDictionary *) history lib: (tr_handle_t *) lib;
+- (NSDictionary *) history;
+                    
 - (void)       setFolder: (NSString *) path;
 - (NSString *) getFolder;
@@ -53 +59 @@
 - (void)       sleep;
 - (void)       wakeUp;
+
+- (float)      ratio;
+- (int)        stopRatioSetting;
+- (void)       setStopRatioSetting: (int) setting;
+- (float)      ratioLimit;
+- (void)       setRatioLimit: (float) limit;
+
+- (NSNumber *) stateSortKey;
+
 - (void)       reveal;
 - (void)       trashTorrent;
@@ -66 +81 @@
 - (int)        pieceSize;
 - (int)        pieceCount;
-- (NSString *) hash1;
-- (NSString *) hash2;
+- (NSString *) hash;
 
 - (float)      progress;

trunk/macosx/Torrent.m

@@ -28 +28 @@
 
 - (void) trashPath: (NSString *) path;
+- (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib date: (NSDate *) date
+        stopRatioSetting: (NSNumber *) stopRatioSetting ratioLimit: (NSNumber *) ratioLimit;
 
 @end
@@ -34 +36 @@
 @implementation Torrent
 
-- (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib date: (NSDate *) date
-{
-    fLib = lib;
-
-    int error;
-    fHandle = tr_torrentInit( fLib, [path UTF8String], &error );
-    if( !fHandle )
-    {
-        [self release];
-        return nil;
-    }
-
-    fDate = [date retain];
-    fInfo = tr_torrentInfo( fHandle );
-
-    NSString * fileType = ( fInfo->fileCount > 1 ) ?
-        NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];
-    fIcon = [[NSWorkspace sharedWorkspace] iconForFileType: fileType];
-    [fIcon setFlipped: YES];
-    [fIcon retain];
-    fIconNonFlipped = [[NSWorkspace sharedWorkspace] iconForFileType: fileType];
-    [fIconNonFlipped retain];
-
-    fStatusString   = [[NSMutableString alloc] initWithCapacity: 50];
-    fInfoString     = [[NSMutableString alloc] initWithCapacity: 50];
-    fDownloadString = [[NSMutableString alloc] initWithCapacity: 10];
-    fUploadString   = [[NSMutableString alloc] initWithCapacity: 10];
-
-    [self update];
+- (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib
+{
+    return [self initWithPath: path lib: lib
+            date: nil stopRatioSetting: nil
+            ratioLimit: nil];
+}
+
+- (id) initWithHistory: (NSDictionary *) history lib: (tr_handle_t *) lib
+{
+    self = [self initWithPath: [history objectForKey: @"TorrentPath"]
+            lib: lib date: [history objectForKey: @"Date"]
+            stopRatioSetting: [history objectForKey: @"StopRatioSetting"]
+            ratioLimit: [history objectForKey: @"RatioLimit"]];
+            
+    if (self)
+    {
+        NSString * downloadFolder;
+        if (!(downloadFolder = [history objectForKey: @"DownloadFolder"]))
+            downloadFolder = [[fDefaults stringForKey: @"DownloadFolder"]
+                                stringByExpandingTildeInPath];
+        [self setFolder: downloadFolder];
+
+        NSString * paused;
+        if (!(paused = [history objectForKey: @"Paused"]) || [paused isEqualToString: @"NO"])
+            [self start];
+    }
+    
     return self;
 }
 
-- (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib
-{
-    return [self initWithPath: path lib: lib date: [NSDate date]];
+- (NSDictionary *) history
+{
+    return [NSDictionary dictionaryWithObjectsAndKeys:
+            [self path], @"TorrentPath",
+            [self getFolder], @"DownloadFolder",
+            [self isActive] ? @"NO" : @"YES", @"Paused",
+            [self date], @"Date",
+            [NSNumber numberWithInt: fStopRatioSetting], @"StopRatioSetting",
+            [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit", nil];
 }
 
@@ -76 +82 @@
     {
         tr_torrentClose( fLib, fHandle );
+        
         [fDate release];
         [fIcon release];
@@ -105 +112 @@
 {
     fStat = tr_torrentStat( fHandle );
+    
+    if ([self isSeeding]) 
+        if ((fStopRatioSetting == 1 && [self ratio] >= fRatioLimit)
+            || (fStopRatioSetting == -1 && [fDefaults boolForKey: @"RatioCheck"]
+                && [self ratio] >= [fDefaults floatForKey: @"RatioLimit"]))
+        {
+            [self stop];
+            [self setStopRatioSetting: 0];
+            
+            fStat = tr_torrentStat( fHandle );
+        }
 
     [fStatusString setString: @""];
-    [fInfoString   setString: @""];
+    [fInfoString setString: @""];
 
     switch( fStat->status )
@@ -208 +226 @@
 }
 
+- (float) ratio
+{
+    uint64_t downloaded = [self downloaded];
+    return downloaded > 0 ? [self uploaded] / downloaded : -1;
+}
+
+/*  1: Check ratio
+    0: Don't check ratio
+   -1: Use defaults */
+- (int) stopRatioSetting
+{
+        return fStopRatioSetting;
+}
+
+- (void) setStopRatioSetting: (int) setting
+{
+    fStopRatioSetting = setting;
+}
+
+- (float) ratioLimit
+{
+    return fRatioLimit;
+}
+
+- (void) setRatioLimit: (float) limit
+{
+    if (limit >= 0)
+        fRatioLimit = limit;
+}
+
 - (void) reveal
 {
@@ -272 +320 @@
 }
 
-- (NSString *) hash1
+- (NSString *) hash
 {
     NSMutableString * string = [NSMutableString
         stringWithCapacity: SHA_DIGEST_LENGTH];
     int i;
-    for( i = 0; i < SHA_DIGEST_LENGTH / 2; i++ )
+    for( i = 0; i < SHA_DIGEST_LENGTH; i++ )
     {
         [string appendFormat: @"%02x", fInfo->hash[i]];
@@ -283 +331 @@
     return string;
 }
-- (NSString *) hash2
-{
-    NSMutableString * string = [NSMutableString
-        stringWithCapacity: SHA_DIGEST_LENGTH];
-    int i;
-    for( i = SHA_DIGEST_LENGTH / 2; i < SHA_DIGEST_LENGTH; i++ )
-    {
-        [string appendFormat: @"%02x", fInfo->hash[i]];
-    }
-    return string;
-}
 
 - (float) progress
@@ -365 +402 @@
 }
 
+- (NSNumber *) stateSortKey
+{
+    if (fStat->status & TR_STATUS_INACTIVE)
+        return [NSNumber numberWithInt: 0];
+    else if (fStat->status == TR_STATUS_SEED)
+        return [NSNumber numberWithInt: 1];
+    else
+        return [NSNumber numberWithInt: 2];
+}
+
 @end
 
 
 @implementation Torrent (Private)
+
+- (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib date: (NSDate *) date
+        stopRatioSetting: (NSNumber *) stopRatioSetting ratioLimit: (NSNumber *) ratioLimit
+{
+    if (!(self = [super init]))
+        return nil;
+
+    fLib = lib;
+
+    int error;
+    if (!path || !(fHandle = tr_torrentInit(fLib, [path UTF8String], &error)))
+    {
+        [self release];
+        return nil;
+    }
+    
+    fInfo = tr_torrentInfo( fHandle );
+    
+    fDefaults = [NSUserDefaults standardUserDefaults];
+
+    fDate = date ? [date retain] : [[NSDate alloc] init];
+    fStopRatioSetting = stopRatioSetting ? [stopRatioSetting intValue] : -1;
+    fRatioLimit = ratioLimit ? [ratioLimit floatValue] : [fDefaults floatForKey: @"RatioLimit"];
+    
+    NSString * fileType = ( fInfo->fileCount > 1 ) ?
+        NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];
+    fIcon = [[NSWorkspace sharedWorkspace] iconForFileType: fileType];
+    [fIcon setFlipped: YES];
+    [fIcon retain];
+    fIconNonFlipped = [[NSWorkspace sharedWorkspace] iconForFileType: fileType];
+    [fIconNonFlipped retain];
+
+    fStatusString   = [[NSMutableString alloc] initWithCapacity: 50];
+    fInfoString     = [[NSMutableString alloc] initWithCapacity: 50];
+    fDownloadString = [[NSMutableString alloc] initWithCapacity: 10];
+    fUploadString   = [[NSMutableString alloc] initWithCapacity: 10];
+
+    [self update];
+    return self;
+}
 
 - (void) trashPath: (NSString *) path

trunk/macosx/TorrentTableView.m

@@ -71 +71 @@
 }
 
-
 - (void) mouseDown: (NSEvent *) e
 {
@@ -139 +138 @@
     {
         if (![self isRowSelected: row])
-        {
-            if( OSX_VERSION >= 10.3 )
-                [self selectRowIndexes: [NSIndexSet indexSetWithIndex: row]
-                    byExtendingSelection: NO];
-            else
-                [self selectRow: row byExtendingSelection: NO];
-        }
+            [self selectRowIndexes: [NSIndexSet indexSetWithIndex: row]
+                byExtendingSelection: NO];
+                
         return fContextRow;
     }