Changeset 4

Timestamp:

Jan 12, 2006, 6:30:10 PM (16 years ago)

Author:

root

Message:

Update 2005-11-18

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• Jamrules (modified) (1 diff)
• NEWS (modified) (1 diff)
• macosx/Controller.h (modified) (1 diff)
• macosx/Controller.m (modified) (7 diffs)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• macosx/ProgressCell.m (modified) (2 diffs)

trunk/AUTHORS

@@ -13 +13 @@
  + OS X toolbar icons
 
-Michael, Omar and Adrien
+Omar and Adrien
  + Beta testing
+
+Michael Demars
+ + Beta testing
+ + OS X UI patches
 
 Various people

trunk/Jamrules

@@ -7 +7 @@
 
 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)

trunk/NEWS

@@ -1 +1 @@
 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)

trunk/macosx/Controller.h

@@ -42 +42 @@
 
     IBOutlet NSMenuItem          * fAdvancedBarItem;
+    IBOutlet NSMenuItem          * fPauseResumeItem;
+    IBOutlet NSMenuItem          * fRemoveItem;
 
     IBOutlet NSWindow            * fWindow;

trunk/macosx/Controller.m

@@ -49 +49 @@
 @implementation Controller
 
-- (void) updateToolbar
+- (void) updateBars
 {
     NSArray * items;
@@ -57 +57 @@
     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 +70 @@
             [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: )];
     }
 }
@@ -543 +563 @@
 
     /* Must we do this? Can't remember */
-    [self updateToolbar];
+    [self updateBars];
 }
 
@@ -636 +656 @@
     int row = [fTableView selectedRow];
 
-    [self updateToolbar];
+    [self updateBars];
 
     if( row < 0 )
@@ -689 +709 @@
         [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] )
@@ -773 +793 @@
                 }
             }
-            [self updateToolbar];
+            [self updateBars];
             break;
     }

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

@@ -31 +31 @@
                 fInfoTracker = NSTextField; 
                 fInfoUploaded = NSTextField; 
+                fPauseResumeItem = NSMenuItem; 
                 fPrefsController = PrefsController; 
-                fTableView = NSTableView; 
+                fRemoveItem = NSMenuItem; 
+                fTableView = TorrentTableView; 
                 fTotalDLField = NSTextField; 
                 fTotalULField = NSTextField; 

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

@@ -4 +4 @@
 <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>
@@ -18 +18 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>29</integer>
                 <integer>456</integer>
-                <integer>21</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/ProgressCell.m

@@ -141 +141 @@
         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 +164 @@
     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++ )