Update 2005-11-18

AUTHORS

@@ -12,9 +12,13 @@ vi@nwr.jp
 Mike Matas <http://www.mikematas.com/>
  + OS X toolbar icons
 
-Michael, Omar and Adrien
+Omar and Adrien
  + Beta testing
 
+Michael Demars
+ + Beta testing
+ + OS X UI patches
+
 Various people
  + Writing http://wiki.theory.org/BitTorrentSpecification
 

Jamrules

@@ -6,9 +6,9 @@ if ! $(DEFINES)
 }
 
 VERSION_MAJOR  = 0 ;
-VERSION_MINOR  = 3 ;
+VERSION_MINOR  = 4 ;
 # VERSION_STRING = $(VERSION_MAJOR).$(VERSION_MINOR) ;
-VERSION_STRING = 0.4-cvs ;
+VERSION_STRING = 0.5-cvs ;
 
 DEFINES += VERSION_MAJOR=$(VERSION_MAJOR)
            VERSION_MINOR=$(VERSION_MINOR)

NEWS

@@ -1,5 +1,22 @@
 NEWS file for Transmission <http://transmission.m0k.org/>
 
+0.4 (2005/11/18)
+ - Uses less CPU downloading torrents with many pieces
+ - The UI could freeze when the hard drive was having a hard time - fixed
+ - Fixes for difficult trackers, which require a 'key' parameter or a
+     User Agent field
+ - OS X: Cleaner look, unified toolbar
+ - OS X: Added a document icon for torrent files
+ - OS X: Added a Pause/Resume button for each torrent, and a
+    "Reveal in Finder" button
+ - OS X: Added a contextual menu
+ - OS X: Sometimes torrents kept "Stopping..." forever - fixed
+ - OS X: Several minor improvements or fixes: allows column reordering,
+    fixed resizing on Panther, remember the position of the window,
+    fixed display of Unicode filenames, added menubar items and
+    keyboard shortcuts, made the simple progress bar switch to green
+    when seeding
+
 0.3 (2005/10/19)
  - Fixed "Sometimes sends incorrect messages and looses peers"
  - Fixed "Crashes with many torrents or torrents with many files"

macosx/Controller.h

@@ -41,6 +41,8 @@
     IBOutlet PrefsController     * fPrefsController;
 
     IBOutlet NSMenuItem          * fAdvancedBarItem;
+    IBOutlet NSMenuItem          * fPauseResumeItem;
+    IBOutlet NSMenuItem          * fRemoveItem;
 
     IBOutlet NSWindow            * fWindow;
     IBOutlet TorrentTableView    * fTableView;

macosx/Controller.m

@@ -48,7 +48,7 @@ static void sleepCallBack( void * controller, io_service_t y,
 
 @implementation Controller
 
-- (void) updateToolbar
+- (void) updateBars
 {
     NSArray * items;
     NSToolbarItem * item;
@@ -56,10 +56,11 @@ static void sleepCallBack( void * controller, io_service_t y,
     int row;
     unsigned i;
 
-    row    = [fTableView selectedRow];
+    row = [fTableView selectedRow];
+
+    /* Can we remove it ? */
     enable = ( row >= 0 ) && ( fStat[row].status &
                 ( TR_STATUS_STOPPING | TR_STATUS_PAUSE ) );
-
     items = [fToolbar items];
     for( i = 0; i < [items count]; i++ )
     {
@@ -69,6 +70,25 @@ static void sleepCallBack( void * controller, io_service_t y,
             [item setAction: enable ? @selector( removeTorrent: ) : NULL];
         }
     }
+    [fRemoveItem setAction: enable ? @selector( removeTorrent: ) : NULL];
+
+    /* Can we pause or resume it ? */
+    [fPauseResumeItem setTitle: @"Pause"];
+    [fPauseResumeItem setAction: NULL];
+    if( row < 0 )
+    {
+        return;
+    }
+    if( fStat[row].status & TR_STATUS_PAUSE )
+    {
+        [fPauseResumeItem setTitle: @"Resume"];
+        [fPauseResumeItem setAction: @selector( resumeTorrent: )];
+    }
+    else if( fStat[row].status & ( TR_STATUS_CHECK |
+                TR_STATUS_DOWNLOAD | TR_STATUS_SEED ) )
+    {
+        [fPauseResumeItem setAction: @selector( stopTorrent: )];
+    }
 }
 
 - (void) awakeFromNib
@@ -542,7 +562,7 @@ static void sleepCallBack( void * controller, io_service_t y,
     }
 
     /* Must we do this? Can't remember */
-    [self updateToolbar];
+    [self updateBars];
 }
 
 
@@ -635,7 +655,7 @@ static void sleepCallBack( void * controller, io_service_t y,
 {
     int row = [fTableView selectedRow];
 
-    [self updateToolbar];
+    [self updateBars];
 
     if( row < 0 )
     {
@@ -688,7 +708,7 @@ static void sleepCallBack( void * controller, io_service_t y,
         [item setToolTip: @"Remove torrent from list"];
         [item setImage: [NSImage imageNamed: @"Remove.png"]];
         [item setTarget: self];
-        /* We set the selector in updateToolbar: */
+        /* We set the selector in updateBars: */
     }
     else if( [ident isEqualToString: TOOLBAR_PREFS] )
     {
@@ -772,7 +792,7 @@ static void sleepCallBack( void * controller, io_service_t y,
                     tr_torrentStart( fHandle, i );
                 }
             }
-            [self updateToolbar];
+            [self updateBars];
             break;
     }
 }

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

@@ -30,8 +30,10 @@
                 fInfoTitle = NSTextField; 
                 fInfoTracker = NSTextField; 
                 fInfoUploaded = NSTextField; 
+                fPauseResumeItem = NSMenuItem; 
                 fPrefsController = PrefsController; 
-                fTableView = NSTableView; 
+                fRemoveItem = NSMenuItem; 
+                fTableView = TorrentTableView; 
                 fTotalDLField = NSTextField; 
                 fTotalULField = NSTextField; 
                 fWindow = NSWindow; 

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>188 334 361 432 0 0 1280 832 </string>
+	<string>185 138 361 432 0 0 1280 832 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
@@ -17,8 +17,8 @@
 	<integer>3</integer>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>29</integer>
 		<integer>456</integer>
-		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8F46</string>

macosx/ProgressCell.m

@@ -140,7 +140,14 @@ static uint32_t kGreen[] =
 
         for( w = 0; w < 120; w++ )
         {
-            *p = kBlue2[h];
+            if( fStat->status & TR_STATUS_SEED )
+            {
+                *p = kGreen[h];
+            }
+            else
+            {
+                *p = kBlue2[h];
+            }
 
             if( w >= (int) ( fStat->progress * 120 ) )
             {
@@ -157,15 +164,6 @@ static uint32_t kGreen[] =
     int        h, w;
     uint32_t * p;
 
-    if( fStat->status & TR_STATUS_SEED )
-    {
-        for( h = 0; h < 2; h++ )
-        {
-            p = (uint32_t *) ( [fBmp bitmapData] +
-                    h * [fBmp bytesPerRow] ) + 2;
-        }
-    }
-
     for( h = 0; h < 14; h++ )
     {
         p = (uint32_t *) ( [fBmp bitmapData] +