Changeset 3190

Timestamp:

Sep 26, 2007, 6:32:32 PM (15 years ago)

Author:

livings124

Message:

add "failed hash" field to activity tab

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (2 diffs)
• macosx/InfoWindowController.h (modified) (1 diff)
• macosx/InfoWindowController.m (modified) (5 diffs)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (2 diffs)
• macosx/TorrentCell.m (modified) (1 diff)
• macosx/en.lproj/InfoWindow.nib/classes.nib (modified) (1 diff)
• macosx/en.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -75 +75 @@
                 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 */; };
@@ -283 +282 @@
                                 A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
                                 A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
-                                A21282A70CA6C66800EAEE0F /* StatusBarView.h in CopyFiles */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/InfoWindowController.h

@@ -45 +45 @@
                         * fCreatorField, * fDateCreatedField,
                         * fStateField, * fProgressField,
-                        * fHaveField, * fDownloadedTotalField, * fUploadedTotalField,
+                        * fHaveField, * fDownloadedTotalField, * fUploadedTotalField, * fFailedHashField,
                         * fRatioField, * fSwarmSpeedField;
     IBOutlet NSTextView * fCommentView;

trunk/macosx/InfoWindowController.m

@@ -36 +36 @@
 //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
@@ -158 +158 @@
             [fDownloadedTotalField setStringValue: @""];
             [fUploadedTotalField setStringValue: @""];
+            [fFailedHashField setStringValue: @""];
             
             //options fields
@@ -375 +376 @@
         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];
@@ -384 +385 @@
         downloadedTotal += [torrent downloadedTotal];
         uploadedTotal += [torrent uploadedTotal];
+        failedHash += [torrent failedHash];
     }
     
@@ -397 +399 @@
     [fDownloadedTotalField setStringValue: [NSString stringForFileSize: downloadedTotal]];
     [fUploadedTotalField setStringValue: [NSString stringForFileSize: uploadedTotal]];
+    [fFailedHashField setStringValue: [NSString stringForFileSize: failedHash]];
     
     if (numberSelected == 1)

trunk/macosx/Torrent.h

@@ -191 +191 @@
 - (uint64_t) haveVerified;
 - (uint64_t) haveTotal;
+- (uint64_t) uploadedTotal;
 - (uint64_t) downloadedTotal;
-- (uint64_t) uploadedTotal;
+- (uint64_t) failedHash;
 - (float) swarmSpeed;
 

trunk/macosx/Torrent.m

@@ -1161 +1161 @@
 }
 
+- (uint64_t) uploadedTotal
+{
+    return fStat->uploadedEver;
+}
+
 - (uint64_t) downloadedTotal
 {
@@ -1166 +1171 @@
 }
 
-- (uint64_t) uploadedTotal
-{
-    return fStat->uploadedEver;
+- (uint64_t) failedHash
+{
+    return fStat->corruptEver;
 }
 

trunk/macosx/TorrentCell.m

@@ -333 +333 @@
             else if ([torrent isSeeding])
             {
-                #warning integer-ize!
-                /*NSRect ratioRect = completeRect;
-                ratioRect.size.width *= [torrent progressStopRatio];*/
-                
                 int ratioLeftWidth = leftWidth * (1.0 - [torrent progressStopRatio]);
                 leftWidth -= ratioLeftWidth;

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

@@ -36 +36 @@
                 fDownloadingFromField = NSTextField; 
                 fErrorMessageView = NSTextView; 
+                fFailedHashField = NSTextField; 
                 fFileCheckItem = NSMenuItem; 
                 fFileOutline = FileOutlineView;