Changeset 1575

Timestamp:

Mar 22, 2007, 4:30:08 AM (14 years ago)

Author:

livings124

Message:

seeding bar shows progress towards ratio

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/Images/ProgressBarLightGreen.png (added)
• macosx/Torrent.h (modified) (2 diffs)
• macosx/Torrent.m (modified) (4 diffs)
• macosx/TorrentCell.h (modified) (1 diff)
• macosx/TorrentCell.m (modified) (4 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -143 +143 @@
                 A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; };
                 A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */; };
+                A28FF34E0BB23A4E001F5010 /* ProgressBarLightGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = A28FF34D0BB23A4E001F5010 /* ProgressBarLightGreen.png */; };
                 A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; };
                 A291DAAF0AC8BEB6003385E9 /* PiecesView.m in Sources */ = {isa = PBXBuildFile; fileRef = A291DAAD0AC8BEB6003385E9 /* PiecesView.m */; };
@@ -354 +355 @@
                 A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ButtonBorder.png; path = macosx/Images/ButtonBorder.png; sourceTree = "<group>"; };
                 A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButton.png; path = macosx/Images/ActionButton.png; sourceTree = "<group>"; };
+                A28FF34D0BB23A4E001F5010 /* ProgressBarLightGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarLightGreen.png; path = macosx/Images/ProgressBarLightGreen.png; sourceTree = "<group>"; };
                 A2912C530A2956E80097A0CA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/PrefsWindow.nib; sourceTree = "<group>"; };
                 A291DAAC0AC8BEB6003385E9 /* PiecesView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PiecesView.h; path = macosx/PiecesView.h; sourceTree = "<group>"; };
@@ -518 +520 @@
                                 A2305A7E0A3DC9E400AB2D77 /* ProgressBarGray.png */,
                                 A2305A7F0A3DC9E400AB2D77 /* ProgressBarGreen.png */,
+                                A28FF34D0BB23A4E001F5010 /* ProgressBarLightGreen.png */,
                                 A260C9AB0AA3B8D700FDC1B7 /* Error.tiff */,
                                 A29C8B320ACC6E93000ED9F9 /* YellowDot.tiff */,
@@ -858 +861 @@
                                 A22A8D560AEEAFA5007E9CB9 /* Localizable.strings in Resources */,
                                 A24103070AF80E390001C8D0 /* FilterButtonPressedLeft.png in Resources */,
+                                A28FF34E0BB23A4E001F5010 /* ProgressBarLightGreen.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Torrent.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 #import <transmission.h>
+
+#define INVALID -99
 
 @interface Torrent : NSObject
@@ -90 +92 @@
 - (float)       ratioLimit;
 - (void)        setRatioLimit: (float) limit;
+- (float)       actualStopRatio; //returns INVALID if will not stop
 
 - (int)     checkUpload;

trunk/macosx/Torrent.m

@@ -31 +31 @@
 #define BLANK_PIECE -99
 
-#define INVALID -99
-
 @interface Torrent (Private)
 
@@ -267 +265 @@
     
     //check to stop for ratio
-    if ([self isSeeding] && ((fRatioSetting == NSOnState && [self ratio] >= fRatioLimit)
-            || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"]
-                && [self ratio] >= [fDefaults floatForKey: @"RatioLimit"])))
+    float stopRatio;
+    if ([self isSeeding] && (stopRatio = [self actualStopRatio]) != INVALID && [self ratio] >= stopRatio)
     {
         [self stopTransfer];
@@ -437 +434 @@
                                     [NSNumber numberWithBool: [self isError]], @"Error", nil];
     
+    if ([self isSeeding])
+    {
+        [info setObject: [NSNumber numberWithFloat: [self ratio]] forKey: @"Ratio"];
+        [info setObject: [NSNumber numberWithFloat: [self actualStopRatio]] forKey: @"StopRatio"];
+    }
+    
     if (![fDefaults boolForKey: @"SmallView"])
     {
@@ -546 +549 @@
     if (limit >= 0)
         fRatioLimit = limit;
+}
+
+- (float) actualStopRatio
+{
+    if (fRatioSetting == NSOnState)
+        return fRatioLimit;
+    else if (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"])
+        return [fDefaults floatForKey: @"RatioLimit"];
+    else
+        return INVALID;
 }
 

trunk/macosx/TorrentCell.h

@@ -35 +35 @@
     NSImage * fProgressWhite, * fProgressBlue, * fProgressGray, * fProgressGreen,
                     * fProgressAdvanced, * fProgressEndWhite, * fProgressEndBlue,
-                    * fProgressEndGray, * fProgressEndGreen, * fProgressEndAdvanced,
-                    * fErrorImage;
+                    * fProgressEndGray, * fProgressEndGreen, * fProgressLightGreen,
+                    * fProgressEndAdvanced, * fErrorImage;
 
     NSUserDefaults * fDefaults;

trunk/macosx/TorrentCell.m

@@ -64 +64 @@
         [fProgressGreen setScalesWhenResized: YES];
         
+        fProgressLightGreen = [NSImage imageNamed: @"ProgressBarLightGreen.png"];
+        [fProgressLightGreen setScalesWhenResized: YES];
+        
         fProgressAdvanced = [NSImage imageNamed: @"ProgressBarAdvanced.png"];
         [fProgressAdvanced setScalesWhenResized: YES];
@@ -92 +95 @@
 
     width -= 2.0;
-    if ([[info objectForKey: @"Seeding"] boolValue])
-    {
-        [fProgressEndGreen compositeToPoint: point operation: NSCompositeSourceOver];
-        
-        point.x += 1.0;
-        [self placeBar: fProgressGreen width: width point: point];
-        
-        point.x += width;
-        [fProgressEndGreen compositeToPoint: point operation: NSCompositeSourceOver];
+    
+    BOOL seeding = [[info objectForKey: @"Seeding"] boolValue],
+        isActive = [[info objectForKey: @"Active"] boolValue];
+    float completedWidth, remainingWidth;
+    
+    //bar images
+    NSImage * barLeftEnd, * barRightEnd, * barComplete, * barRemaining;
+    if (seeding)
+    {
+        float stopRatio, ratio;
+        if ((stopRatio = [[info objectForKey: @"StopRatio"] floatValue]) != INVALID
+                && (ratio = [[info objectForKey: @"Ratio"] floatValue]) < stopRatio)
+            completedWidth = width * ratio / stopRatio;
+        else
+            completedWidth = width;
+        remainingWidth = width - completedWidth;
+        
+        barLeftEnd = fProgressEndGreen;
+        barRightEnd = fProgressEndGreen;
+        barComplete = fProgressGreen;
+        barRemaining = fProgressLightGreen;
     }
     else
     {
-        float completedWidth = [[info objectForKey: @"Progress"] floatValue] * width,
-                remainingWidth = width - completedWidth;
-        BOOL isActive = [[info objectForKey: @"Active"] boolValue];
-        
-        //left end
-        NSImage * barLeftEnd;
+        completedWidth = [[info objectForKey: @"Progress"] floatValue] * width;
+        remainingWidth = width - completedWidth;
+        
         if (remainingWidth == width)
             barLeftEnd = fProgressEndWhite;
@@ -117 +129 @@
             barLeftEnd = fProgressEndGray;
         
-        [barLeftEnd compositeToPoint: point operation: NSCompositeSourceOver];
-        
-        //active bar
-        point.x += 1.0;
-        [self placeBar: isActive ? fProgressBlue : fProgressGray width: completedWidth point: point];
-        
-        //remaining bar
-        point.x += completedWidth;
-        [self placeBar: fProgressWhite width: remainingWidth point: point];
-        
-        //right end
-        NSImage * barRightEnd;
         if (completedWidth < width)
             barRightEnd = fProgressEndWhite;
@@ -136 +136 @@
             barRightEnd = fProgressEndGray;
         
-        point.x += remainingWidth;
-        [barRightEnd compositeToPoint: point operation: NSCompositeSourceOver];
-    }
+        barComplete = isActive ? fProgressBlue : fProgressGray;
+        barRemaining = fProgressWhite;
+    }
+    
+    [barLeftEnd compositeToPoint: point operation: NSCompositeSourceOver];
+    
+    //active bar
+    point.x += 1.0;
+    [self placeBar: barComplete width: completedWidth point: point];
+    
+    //remaining bar
+    point.x += completedWidth;
+    [self placeBar: barRemaining width: remainingWidth point: point];
+    
+    point.x += remainingWidth;
+    [barRightEnd compositeToPoint: point operation: NSCompositeSourceOver];
 }