Changeset 784 for trunk/macosx

Timestamp:

Aug 15, 2006, 2:28:38 AM (16 years ago)

Author:

livings124

Message:

Status in peers tab.

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/classes.nib (modified) (1 diff)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.h (modified) (1 diff)
• InfoWindowController.m (modified) (4 diffs)

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

@@ -31 +31 @@
                 fNameField = NSTextField; 
                 fPeerTable = NSTableView; 
+                fPeerTableStatusField = NSTextField; 
                 fPieceSizeField = NSTextField; 
                 fPiecesField = NSTextField; 

trunk/macosx/InfoWindowController.h

@@ -47 +47 @@
                         * fConnectedPeersField, * fDownloadingFromField, * fUploadingToField;
 
-    IBOutlet NSTableView * fPeerTable, * fFileTable;
+    IBOutlet NSTableView * fPeerTable;
+    IBOutlet NSTextField * fPeerTableStatusField;
+    
+    IBOutlet NSTableView * fFileTable;
     
     IBOutlet NSMatrix * fRatioMatrix;

trunk/macosx/InfoWindowController.m

@@ -42 +42 @@
 #define TAB_INFO_HEIGHT 182.0
 #define TAB_ACTIVITY_HEIGHT 214.0
-#define TAB_PEERS_HEIGHT 250.0
-#define TAB_FILES_HEIGHT 250.0
+#define TAB_PEERS_HEIGHT 255.0
+#define TAB_FILES_HEIGHT 255.0
 #define TAB_OPTIONS_HEIGHT 116.0
 
@@ -108 +108 @@
         if (numberSelected > 0)
         {
-            [fNameField setStringValue: [NSString stringWithFormat:
-                            @"%d Torrents Selected", numberSelected]];
+            [fNameField setStringValue: [NSString stringWithFormat: @"%d Torrents Selected", numberSelected]];
         
             uint64_t size = 0;
@@ -167 +166 @@
         [fDownloadingFromField setStringValue: @""];
         [fUploadingToField setStringValue: @""];
+        
+        [fPeers removeAllObjects];
+        [fPeerTable reloadData];
+        [fPeerTableStatusField setStringValue: @"info not available"];
     }
     else
@@ -223 +226 @@
 {
     int numberSelected = [fTorrents count];
-    if (numberSelected > 0)
-    {
-        float downloadedValid = 0;
-        uint64_t downloadedTotal = 0, uploadedTotal = 0;
-        Torrent * torrent;
-        NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while ((torrent = [enumerator nextObject]))
-        {
-            downloadedValid += [torrent downloadedValid];
-            downloadedTotal += [torrent downloadedTotal];
-            uploadedTotal += [torrent uploadedTotal];
-        }
-
-        [fDownloadedValidField setStringValue: [NSString stringForFileSize: downloadedValid]];
-        [fDownloadedTotalField setStringValue: [NSString stringForFileSize: downloadedTotal]];
-        [fUploadedTotalField setStringValue: [NSString stringForFileSize: uploadedTotal]];
-    
-        if (numberSelected == 1)
-        {
-            torrent = [fTorrents objectAtIndex: 0];
-
-            [fStateField setStringValue: [torrent stateString]];
+    if (numberSelected == 0)
+        return;
+    
+    float downloadedValid = 0;
+    uint64_t downloadedTotal = 0, uploadedTotal = 0;
+    Torrent * torrent;
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+    while ((torrent = [enumerator nextObject]))
+    {
+        downloadedValid += [torrent downloadedValid];
+        downloadedTotal += [torrent downloadedTotal];
+        uploadedTotal += [torrent uploadedTotal];
+    }
+
+    [fDownloadedValidField setStringValue: [NSString stringForFileSize: downloadedValid]];
+    [fDownloadedTotalField setStringValue: [NSString stringForFileSize: downloadedTotal]];
+    [fUploadedTotalField setStringValue: [NSString stringForFileSize: uploadedTotal]];
+
+    if (numberSelected == 1)
+    {
+        torrent = [fTorrents objectAtIndex: 0];
+
+        [fStateField setStringValue: [torrent stateString]];
 /*
-            [fPercentField setStringValue: [NSString stringWithFormat: @"%.2f%%", 100.0 * [torrent progress]]];
+        [fPercentField setStringValue: [NSString stringWithFormat: @"%.2f%%", 100.0 * [torrent progress]]];
 */
-            int seeders = [torrent seeders], leechers = [torrent leechers];
-            [fSeedersField setStringValue: seeders < 0 ?
-                @"" : [NSString stringWithInt: seeders]];
-            [fLeechersField setStringValue: leechers < 0 ?
-                @"" : [NSString stringWithInt: leechers]];
-            
-            BOOL active = [torrent isActive];
-            
-            [fConnectedPeersField setStringValue: active ? [NSString
-                    stringWithInt: [torrent totalPeers]] : @""];
-            [fDownloadingFromField setStringValue: active ? [NSString
-                    stringWithInt: [torrent peersUploading]] : @""];
-            [fUploadingToField setStringValue: active ? [NSString
-                    stringWithInt: [torrent peersDownloading]] : @""];
-            
-            [fRatioField setStringValue: [NSString stringForRatioWithDownload:
-                                        downloadedTotal upload: uploadedTotal]];
-        }
-    }
-    
-    //set peers table
-    if (numberSelected == 1)
-    {
-        [fPeers setArray: [[fTorrents objectAtIndex: 0] peers]];
+        int seeders = [torrent seeders], leechers = [torrent leechers];
+        [fSeedersField setStringValue: seeders < 0 ? @"" : [NSString stringWithInt: seeders]];
+        [fLeechersField setStringValue: leechers < 0 ? @"" : [NSString stringWithInt: leechers]];
+        
+        BOOL active = [torrent isActive];
+        
+        [fConnectedPeersField setStringValue: active ? [NSString
+                stringWithInt: [torrent totalPeers]] : @""];
+        [fDownloadingFromField setStringValue: active ? [NSString
+                stringWithInt: [torrent peersUploading]] : @""];
+        [fUploadingToField setStringValue: active ? [NSString
+                stringWithInt: [torrent peersDownloading]] : @""];
+        
+        [fRatioField setStringValue: [NSString stringForRatioWithDownload: downloadedTotal upload: uploadedTotal]];
+        
+        //set peers table
+        [fPeers setArray: [torrent peers]];
         [fPeers sortUsingDescriptors: [self peerSortDescriptors]];
-    }
-    else
-        [fPeers removeAllObjects];
-    
-    [fPeerTable deselectAll: nil];
-    [fPeerTable reloadData];
+    
+        [fPeerTable reloadData];
+        [fPeerTableStatusField setStringValue: [NSString stringWithFormat: @"%d of %d connected",
+                                                [torrent totalPeers], [fPeers count]]];
+    }
 }