Changeset 10711

Timestamp:

May 31, 2010, 2:06:54 PM (10 years ago)

Author:

livings124

Message:

#3216 Progress Percentage Should Round Down

Location:

trunk/macosx

Files:

• FileNameCell.m (modified) (2 diffs)
• InfoActivityViewController.m (modified) (1 diff)
• InfoPeersViewController.m (modified) (2 diffs)
• PeerProgressIndicatorCell.m (modified) (2 diffs)
• Torrent.m (modified) (7 diffs)

trunk/macosx/FileNameCell.m

@@ -30 +30 @@
 #import "NSStringAdditions.h"
 
+#import "transmission.h" // required by utils.h
+#import "utils.h"
+
 #define PADDING_HORIZONAL 2.0
 #define IMAGE_FOLDER_SIZE 16.0
@@ -204 +207 @@
     
     const CGFloat progress = [torrent fileProgress: node];
-    NSString * percentString = progress == 1.0 ? @"100%" : [NSString localizedStringWithFormat: @"%.2f%%", progress * 100.0];
+    NSString * percentString = progress == 1.0 ? @"100%"
+                                : [NSString localizedStringWithFormat: @"%.2f%%", tr_truncd(progress * 100.0, 2)];
     
     NSString * status = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@",

trunk/macosx/InfoActivityViewController.m

@@ -125 +125 @@
         [fStateField setStringValue: [torrent stateString]];
         
+        #warning simplify
         if ([torrent isFolder])
             [fProgressField setStringValue: [NSString localizedStringWithFormat: NSLocalizedString(@"%.2f%% (%.2f%% selected)",
-                "Inspector -> Activity tab -> progress"), 100.0 * [torrent progress], 100.0 * [torrent progressDone]]];
+                "Inspector -> Activity tab -> progress"), tr_truncd(100.0 * [torrent progress], 2),
+                tr_truncd(100.0 * [torrent progressDone], 2)]];
         else
-            [fProgressField setStringValue: [NSString localizedStringWithFormat: @"%.2f%%", 100.0 * [torrent progress]]];
+            [fProgressField setStringValue: [NSString localizedStringWithFormat: @"%.2f%%", tr_truncd(100.0 * [torrent progress], 2)]];
             
         [fRatioField setStringValue: [NSString stringForRatio: [torrent ratio]]];

trunk/macosx/InfoPeersViewController.m

@@ -29 +29 @@
 #import "Torrent.h"
 
+#import "transmission.h" // required by utils.h
+#import "utils.h"
+
 @interface InfoPeersViewController (Private)
 
@@ -357 +360 @@
         const CGFloat progress = [[peer objectForKey: @"Progress"] floatValue];
         NSString * progressString = [NSString localizedStringWithFormat: NSLocalizedString(@"Progress: %.1f%%",
-                                        "Inspector -> Peers tab -> table row tooltip"), progress * 100.0];
+                                        "Inspector -> Peers tab -> table row tooltip"), tr_truncd(progress * 100.0, 1)];
         if (progress < 1.0 && [[peer objectForKey: @"Seed"] boolValue])
             progressString = [progressString stringByAppendingFormat: @" (%@)", NSLocalizedString(@"Partial Seed",

trunk/macosx/PeerProgressIndicatorCell.m

@@ -25 +25 @@
 #import "PeerProgressIndicatorCell.h"
 #import "NSApplicationAdditions.h"
+
+#import "transmission.h" // required by utils.h
+#import "utils.h"
 
 @implementation PeerProgressIndicatorCell
@@ -61 +64 @@
         }
         
-        [[NSString localizedStringWithFormat: @"%.1f%%", [self floatValue] * 100.0] drawInRect: cellFrame withAttributes: fAttributes];
+        [[NSString localizedStringWithFormat: @"%.1f%%", tr_truncd([self floatValue] * 100.0, 1)] drawInRect: cellFrame
+            withAttributes: fAttributes];
     }
     else

trunk/macosx/Torrent.m

@@ -768 +768 @@
 - (CGFloat) progress
 {
-    return fStat->percentComplete;
+    return .9999999;//fStat->percentComplete;
 }
 
@@ -930 +930 @@
         NSString * progressString = fStat->metadataPercentComplete > 0.0
                     ? [NSString localizedStringWithFormat: NSLocalizedString(@"%.2f%% of torrent metadata retrieved",
-                        "Torrent -> progress string"), 100.0 * fStat->metadataPercentComplete]
+                        "Torrent -> progress string"), tr_truncd(100.0 * fStat->metadataPercentComplete, 2)]
                     : NSLocalizedString(@"torrent metadata needed", "Torrent -> progress string");
         
@@ -955 +955 @@
         }
         
-        string = [NSString localizedStringWithFormat: @"%@ (%.2f%%)", string, progress];
+        string = [NSString localizedStringWithFormat: @"%@ (%.2f%%)", string, tr_truncd(progress, 2)];
     }
     else
@@ -970 +970 @@
                                     [NSString stringForFileSize: [self haveTotal]], [NSString stringForFileSize: [self size]]];
                 
-                downloadString = [NSString localizedStringWithFormat: @"%@ (%.2f%%)", downloadString, 100.0 * [self progress]];
+                downloadString = [NSString localizedStringWithFormat: @"%@ (%.2f%%)",
+                                    downloadString, tr_truncd(100.0 * [self progress], 2)];
             }
         }
@@ -1031 +1032 @@
             case TR_STATUS_CHECK:
                 string = [NSString localizedStringWithFormat: @"%@ (%.2f%%)",
-                            NSLocalizedString(@"Checking existing data", "Torrent -> status string"), 100.0 * [self checkingProgress]];
+                            NSLocalizedString(@"Checking existing data", "Torrent -> status string"),
+                                tr_truncd(100.0 * [self checkingProgress], 2)];
                 break;
 
@@ -1110 +1112 @@
         case TR_STATUS_CHECK:
             string = [NSString localizedStringWithFormat: @"%@ (%.2f%%)",
-                        NSLocalizedString(@"Checking existing data", "Torrent -> status string"), 100.0 * [self checkingProgress]];
+                        NSLocalizedString(@"Checking existing data", "Torrent -> status string"),
+                            tr_truncd(100.0 * [self checkingProgress], 2)];
             break;
         
@@ -1163 +1166 @@
         case TR_STATUS_CHECK:
             return [NSString localizedStringWithFormat: @"%@ (%.2f%%)",
-                    NSLocalizedString(@"Checking existing data", "Torrent -> status string"), 100.0 * [self checkingProgress]];
+                    NSLocalizedString(@"Checking existing data", "Torrent -> status string"),
+                        tr_truncd(100.0 * [self checkingProgress], 2)];
 
         case TR_STATUS_DOWNLOAD: