add "failed hash" field to activity tab

Transmission.xcodeproj/project.pbxproj

@@ -74,7 +74,6 @@
 		A20B6F8C0C4D90980034AB1D /* PriorityMixed.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F8B0C4D90980034AB1D /* PriorityMixed.png */; };
 		A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FA40C4D97840034AB1D /* PriorityNone.png */; };
 		A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */; };
-		A21282A70CA6C66800EAEE0F /* StatusBarView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A21282A50CA6C66800EAEE0F /* StatusBarView.h */; };
 		A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; };
 		A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A21567EB0A9A5034004DECD6 /* MessageWindow.nib */; };
 		A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; };
@@ -282,7 +281,6 @@
 			files = (
 				A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
 				A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
-				A21282A70CA6C66800EAEE0F /* StatusBarView.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

macosx/InfoWindowController.h

@@ -44,7 +44,7 @@
                         * fDateAddedField, * fDateCompletedField, * fDateActivityField,
                         * fCreatorField, * fDateCreatedField,
                         * fStateField, * fProgressField,
-                        * fHaveField, * fDownloadedTotalField, * fUploadedTotalField,
+                        * fHaveField, * fDownloadedTotalField, * fUploadedTotalField, * fFailedHashField,
                         * fRatioField, * fSwarmSpeedField;
     IBOutlet NSTextView * fCommentView;
     IBOutlet NSButton * fRevealDataButton, * fRevealTorrentButton;

macosx/InfoWindowController.m

@@ -35,7 +35,7 @@
 
 //15 spacing at the bottom of each tab
 #define TAB_INFO_HEIGHT 268.0
-#define TAB_ACTIVITY_HEIGHT 274.0
+#define TAB_ACTIVITY_HEIGHT 290.0
 #define TAB_OPTIONS_HEIGHT 158.0
 #define TAB_RESIZABLE_MIN_HEIGHT 279.0
 
@@ -157,6 +157,7 @@
             [fHaveField setStringValue: @""];
             [fDownloadedTotalField setStringValue: @""];
             [fUploadedTotalField setStringValue: @""];
+            [fFailedHashField setStringValue: @""];
             
             //options fields
             [fUploadLimitPopUp setEnabled: NO];
@@ -374,7 +375,7 @@
     if (numberSelected == 0)
         return;
     
-    uint64_t have = 0, haveVerified = 0, downloadedTotal = 0, uploadedTotal = 0;
+    uint64_t have = 0, haveVerified = 0, downloadedTotal = 0, uploadedTotal = 0, failedHash = 0;
     Torrent * torrent;
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
@@ -383,6 +384,7 @@
         haveVerified += [torrent haveVerified];
         downloadedTotal += [torrent downloadedTotal];
         uploadedTotal += [torrent uploadedTotal];
+        failedHash += [torrent failedHash];
     }
     
     if (have == 0)
@@ -396,6 +398,7 @@
     
     [fDownloadedTotalField setStringValue: [NSString stringForFileSize: downloadedTotal]];
     [fUploadedTotalField setStringValue: [NSString stringForFileSize: uploadedTotal]];
+    [fFailedHashField setStringValue: [NSString stringForFileSize: failedHash]];
     
     if (numberSelected == 1)
     {

macosx/Torrent.h

@@ -190,8 +190,9 @@ typedef enum
 - (float) uploadRate;
 - (uint64_t) haveVerified;
 - (uint64_t) haveTotal;
-- (uint64_t) downloadedTotal;
 - (uint64_t) uploadedTotal;
+- (uint64_t) downloadedTotal;
+- (uint64_t) failedHash;
 - (float) swarmSpeed;
 
 - (BOOL) pex;

macosx/Torrent.m

@@ -1160,14 +1160,19 @@ static int static_lastid = 0;
     return [self haveVerified] + fStat->haveUnchecked;
 }
 
+- (uint64_t) uploadedTotal
+{
+    return fStat->uploadedEver;
+}
+
 - (uint64_t) downloadedTotal
 {
     return fStat->downloadedEver;
 }
 
-- (uint64_t) uploadedTotal
+- (uint64_t) failedHash
 {
-    return fStat->uploadedEver;
+    return fStat->corruptEver;
 }
 
 - (float) swarmSpeed

macosx/TorrentCell.m

@@ -332,10 +332,6 @@ static uint32_t kRed    = BE(0xFF6450FF), //255, 100, 80
             }
             else if ([torrent isSeeding])
             {
-                #warning integer-ize!
-                /*NSRect ratioRect = completeRect;
-                ratioRect.size.width *= [torrent progressStopRatio];*/
-                
                 int ratioLeftWidth = leftWidth * (1.0 - [torrent progressStopRatio]);
                 leftWidth -= ratioLeftWidth;
                 

macosx/en.lproj/InfoWindow.nib/classes.nib

@@ -35,6 +35,7 @@
                 fDownloadedTotalField = NSTextField; 
                 fDownloadingFromField = NSTextField; 
                 fErrorMessageView = NSTextView; 
+                fFailedHashField = NSTextField; 
                 fFileCheckItem = NSMenuItem; 
                 fFileOutline = FileOutlineView; 
                 fFilePriorityHigh = NSMenuItem;