Changeset 1996

Timestamp:

Jun 1, 2007, 12:33:31 AM (15 years ago)

Author:

livings124

Message:

when dragging torrents for folders or multiple torrents, show the total file count

File:

• trunk/macosx/DragOverlayWindow.m (modified) (3 diffs)

trunk/macosx/DragOverlayWindow.m

@@ -77 +77 @@
     NSString * name;
     BOOL folder;
+    int fileCount = 0;
     
     NSString * file;
@@ -91 +92 @@
             count++;
             size += info->totalSize;
+            fileCount += info->fileCount;
             
             //only useful when one torrent
@@ -103 +105 @@
     }
     
+    if (count <= 0)
+        return;
+    
+    //set strings and icon
     NSImage * icon = nil;
-    NSString * sizeString = [NSString stringForFileSize: size];
+    NSString * secondString = [NSString stringForFileSize: size];
+    if (count > 1 || folder)
+    {
+        NSString * fileString;
+        if (fileCount == 1)
+            fileString = NSLocalizedString(@"1 File, ", "Drag overlay -> drag files");
+        else
+            fileString= [NSString stringWithFormat: NSLocalizedString(@"%d Files, ", "Drag overlay -> drag files"), fileCount];
+         secondString = [fileString stringByAppendingString: secondString];
+    }
+    
     if (count == 1)
         icon = [[NSWorkspace sharedWorkspace] iconForFileType: folder ? NSFileTypeForHFSTypeCode('fldr') : [name pathExtension]];
     else
     {
-        name = [NSString stringWithFormat: NSLocalizedString(@"%d Torrent Files", "Drag overlay -> multiple drag files"), count];
-        sizeString = [sizeString stringByAppendingString: @" Total"];
+        name = [NSString stringWithFormat: NSLocalizedString(@"%d Torrent Files", "Drag overlay -> drag files"), count];
+        secondString = [secondString stringByAppendingString: @" Total"];
     }
     
-    [[self contentView] setOverlay: icon mainLine: name subLine: sizeString];
+    [[self contentView] setOverlay: icon mainLine: name subLine: secondString];
     
     //stop other animation and set to same progress