Changeset 2080

Timestamp:

Jun 14, 2007, 9:50:38 PM (15 years ago)

Author:

livings124

Message:

merge in some changes to the mac gui...probably doesn't build

Location:

branches/file_selection/macosx

Files:

• Controller.m (modified) (1 diff)
• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (9 diffs)
• TorrentCell.m (modified) (1 diff)

branches/file_selection/macosx/Controller.m

@@ -2851 +2851 @@
     Torrent * torrent;
     while ((torrent = [enumerator nextObject]))
-        if ([torrent isActive])
-        {
-            if ([torrent allDownloaded])
-                seeding++;
-            else
-                downloading++;
-        }
+    {
+        if ([torrent isSeeding])
+            seeding++;
+        else if ([torrent isActive])
+            downloading++;
+    }
     
     NSMenuItem * seedingItem = [fDockMenu itemWithTag: DOCK_SEEDING_TAG],

branches/file_selection/macosx/Torrent.h

@@ -98 +98 @@
 - (void)        resetCache;
 
-- (BOOL)        allDownloaded;
-
 - (float)       ratio;
 - (int)         ratioSetting;
@@ -167 +165 @@
 - (BOOL) isWaitingToChecking;
 - (BOOL) isChecking;
+- (BOOL) allDownloaded;
 - (BOOL) isError;
 - (NSString *) errorMessage;

branches/file_selection/macosx/Torrent.m

@@ -367 +367 @@
                             [NSString stringForFileSize: [self downloadedValid]],
                             [NSString stringForFileSize: [self size]], 100.0 * [self progress]];
+    else if ([self progress] < 1.0)
+        [progressString appendFormat: NSLocalizedString(@"%@ of %@ (%.2f%%), uploaded %@ (Ratio: %@)",
+                "Torrent -> progress string"),
+                [NSString stringForFileSize: [self downloadedValid]], [NSString stringForFileSize: [self size]],
+                100.0 * [self progress], [NSString stringForFileSize: [self uploadedTotal]],
+                [NSString stringForRatio: [self ratio]]];
     else
         [progressString appendFormat: NSLocalizedString(@"%@, uploaded %@ (Ratio: %@)", "Torrent -> progress string"),
-                [NSString stringForFileSize: [self downloadedValid]],
-                            [NSString stringForFileSize: [self uploadedTotal]],
+                [NSString stringForFileSize: [self size]], [NSString stringForFileSize: [self uploadedTotal]],
                 [NSString stringForRatio: [self ratio]]];
 
@@ -462 +467 @@
 
         case TR_STATUS_SEED:
+        case TR_STATUS_DONE:
             [statusString setString: @""];
             if ([self totalPeers] != 1)
@@ -468 +474 @@
             else
                 [statusString appendFormat: NSLocalizedString(@"Seeding to %d of 1 peer", "Torrent -> status string"),
-                                                [self peersDownloading]];
-            
-            break;
-
-        case TR_STATUS_DONE:
-            [statusString setString: @""];
-            if ([self totalPeers] != 1)
-                [statusString appendFormat:@"Uploading to %d of %d peers",
-                                                [self peersDownloading], [self totalPeers]];
-            else
-                [statusString appendFormat: @"Uploading to %d of 1 peer",
                                                 [self peersDownloading]];
             
@@ -643 +638 @@
 {
     tr_torrentRemoveFastResume(fHandle);
-}
-
-- (BOOL) allDownloaded
-{
-    return [self progress] >= 1.0;
 }
 
@@ -1076 +1066 @@
 
         case TR_STATUS_SEED:
+        case TR_STATUS_DONE:
             return NSLocalizedString(@"Seeding", "Torrent -> status string");
             break;
@@ -1083 +1074 @@
             break;
         
-        case TR_STATUS_DONE:
-            return @"Uploading";
-            break;
-        
         default:
             return NSLocalizedString(@"N/A", "Torrent -> status string");
@@ -1094 +1081 @@
 - (float) progress
 {
-    return fStat->percentDone;
+    return fStat->percentComplete;
 }
 
@@ -1109 +1096 @@
 - (BOOL) isSeeding
 {
-    return (fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE);
-}
-
-- (BOOL) isDone
-{
-    return fStat->status == TR_STATUS_DONE;
+    return fStat->status == TR_STATUS_SEED || fStat->status == TR_STATUS_DONE;
 }
 
@@ -1130 +1112 @@
 {
     return fStat->status == TR_STATUS_CHECK;
+}
+
+- (BOOL) allDownloaded
+{
+    return fStat->cpStatus != TR_CP_INCOMPLETE;
 }
 

branches/file_selection/macosx/TorrentCell.m

@@ -82 +82 @@
     completeBounds = barBounds;
     
+    float progress = [[info objectForKey: @"Progress"] floatValue];
+    completeBounds.size.width = progress * width;
+    
     if ([[info objectForKey: @"Seeding"] boolValue])
     {
-        completeBounds.size.width = width * [[info objectForKey: @"ProgressStopRatio"] floatValue];
+        NSRect ratioBounds = completeBounds;
+        ratioBounds.size.width *= [[info objectForKey: @"ProgressStopRatio"] floatValue];
         
         if (completeBounds.size.width < barBounds.size.width)
-            [fLightGreenGradient fillRect: barBounds angle: -90];
-        [fGreenGradient fillRect: completeBounds angle: -90];
+            [fWhiteGradient fillRect: barBounds angle: -90];
+        if (ratioBounds.size.width < completeBounds.size.width)
+            [fLightGreenGradient fillRect: completeBounds angle: -90];
+        [fGreenGradient fillRect: ratioBounds angle: -90];
     }
     else
     {
-        completeBounds.size.width = [[info objectForKey: @"Progress"] floatValue] * width;
         if (completeBounds.size.width < barBounds.size.width)
             [fWhiteGradient fillRect: barBounds angle: -90];