Changeset 3955

Timestamp:

Nov 25, 2007, 4:06:26 AM (15 years ago)

Author:

livings124

Message:

display file count in inspector next to total size, instead of under the file table

Location:

trunk/macosx

Files:

• DragOverlayWindow.m (modified) (1 diff)
• English.lproj/InfoWindow.nib/classes.nib (modified) (3 diffs)
• English.lproj/InfoWindow.nib/info.nib (modified) (1 diff)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.h (modified) (2 diffs)
• InfoWindowController.m (modified) (5 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (3 diffs)

trunk/macosx/DragOverlayWindow.m

@@ -116 +116 @@
         else
             fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Drag overlay -> torrents"), fileCount];
-         secondString = [fileString stringByAppendingString: secondString];
+        secondString = [fileString stringByAppendingString: secondString];
     }
     

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

@@ -121 +121 @@
                                 <key>fActivityView</key>
                                 <string>NSView</string>
+                                <key>fBasicInfoField</key>
+                                <string>NSTextField</string>
                                 <key>fCommentView</key>
                                 <string>NSTextView</string>
@@ -163 +165 @@
                                 <key>fFilePriorityNormal</key>
                                 <string>NSMenuItem</string>
-                                <key>fFileTableStatusField</key>
-                                <string>NSTextField</string>
                                 <key>fFileUncheckItem</key>
                                 <string>NSMenuItem</string>
@@ -213 +213 @@
                                 <key>fSeedersField</key>
                                 <string>NSTextField</string>
-                                <key>fSizeField</key>
-                                <string>NSTextField</string>
                                 <key>fStateField</key>
                                 <string>NSTextField</string>

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

@@ -11 +11 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>995</integer>
+                <integer>6</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/InfoWindowController.h

@@ -38 +38 @@
 
     IBOutlet NSImageView * fImageView;
-    IBOutlet NSTextField * fNameField, * fSizeField, * fTrackerField,
-                        * fPiecesField, * fHashField, * fSecureField,
+    IBOutlet NSTextField * fNameField, * fBasicInfoField;
+    
+    IBOutlet NSTextField * fTrackerField, * fPiecesField, * fHashField, * fSecureField,
                         * fTorrentLocationField, * fDataLocationField,
                         * fDateAddedField, * fDateCompletedField, * fDateActivityField,
@@ -57 +58 @@
     
     IBOutlet FileOutlineView * fFileOutline;
-    IBOutlet NSTextField * fFileTableStatusField;
     IBOutlet NSMenuItem * fFileCheckItem, * fFileUncheckItem,
                         * fFilePriorityNormal, * fFilePriorityHigh, * fFilePriorityLow;

trunk/macosx/InfoWindowController.m

@@ -196 +196 @@
         
             uint64_t size = 0;
+            int fileCount = 0;
             NSEnumerator * enumerator = [torrents objectEnumerator];
             Torrent * torrent;
             while ((torrent = [enumerator nextObject]))
+            {
                 size += [torrent size];
+                fileCount += [torrent fileCount];
+            }
             
-            [fSizeField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ Total",
-                "Inspector -> above tabs -> total size (several torrents selected)"), [NSString stringForFileSize: size]]];
+            [fBasicInfoField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d Files, %@ Total",
+                                                "Inspector -> torrents"), fileCount, [NSString stringForFileSize: size]]];
         }
         else
@@ -209 +213 @@
             
             [fNameField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> above tabs -> selected torrents")];
-            [fSizeField setStringValue: @""];
+            [fBasicInfoField setStringValue: @""];
     
             [fHaveField setStringValue: @""];
@@ -306 +310 @@
             fFiles = nil;
         }
-        [fFileTableStatusField setStringValue: NSLocalizedString(@"info not available",
-                                        "Inspector -> Files tab -> bottom text (number of files)")];
     }
     else
@@ -323 +325 @@
         [fNameField setStringValue: name];
         [fNameField setToolTip: name];
-        [fSizeField setStringValue: [NSString stringForFileSize: [torrent size]]];
+        
+        NSString * basicString = [NSString stringForFileSize: [torrent size]];
+        if ([torrent folder])
+        {
+            NSString * fileString;
+            int fileCount = [torrent fileCount];
+            if (fileCount == 1)
+                fileString = NSLocalizedString(@"1 File, ", "Inspector -> above tabs -> selected torrents");
+            else
+                fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ",
+                                "Inspector -> above tabs -> selected torrents"), fileCount];
+            basicString = [fileString stringByAppendingString: basicString];
+        }
+        [fBasicInfoField setStringValue: basicString];
         
         NSArray * allTrackers = [torrent allTrackers], * subTrackers;
@@ -382 +397 @@
         [fFiles release];
         fFiles = [[torrent fileList] retain];
-        
-        int fileCount = [torrent fileCount];
-        if (fileCount != 1)
-            [fFileTableStatusField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d files total",
-                                "Inspector -> Files tab -> bottom text (number of files)"), fileCount]];
-        else
-            [fFileTableStatusField setStringValue: NSLocalizedString(@"1 file total",
-                                "Inspector -> Files tab -> bottom text (number of files)")];
     }
     

trunk/macosx/Torrent.h

@@ -130 +130 @@
 
 - (NSString *) name;
+- (BOOL) folder;
 - (uint64_t) size;
 - (uint64_t) sizeLeft;

trunk/macosx/Torrent.m

@@ -594 +594 @@
     if (!fIcon)
     {
-        fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: fInfo->isMultifile ? NSFileTypeForHFSTypeCode('fldr')
+        fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self folder] ? NSFileTypeForHFSTypeCode('fldr')
                                                 : [[self name] pathExtension]] retain];
         [fIcon setFlipped: YES];
@@ -604 +604 @@
 {
     return [NSString stringWithUTF8String: fInfo->name];
+}
+
+- (BOOL) folder
+{
+    return fInfo->isMultifile;
 }
 
@@ -1516 +1521 @@
         
         pathComponents = [[[NSString stringWithUTF8String: file->name] pathComponents] mutableCopy];
-        if (fInfo->isMultifile)
+        if ([self folder])
         {
             path = [pathComponents objectAtIndex: 0];