Changeset 6885

Timestamp:

Oct 12, 2008, 1:22:13 PM (14 years ago)

Author:

livings124

Message:

In the file inspector tab, show progress and size for folders

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• macosx/FileNameCell.m (modified) (6 diffs)
• macosx/InfoWindowController.m (modified) (1 diff)
• macosx/Torrent.h (modified) (2 diffs)
• macosx/Torrent.m (modified) (1 diff)

trunk/NEWS

@@ -10 +10 @@
 - Mac
    + Option to automatically update the blocklist weekly
+   + In the file inspector tab, show progress and size for folders
    + Sparkle updated to 1.5
 - GTK+

trunk/macosx/FileNameCell.m

@@ -36 +36 @@
 #define PADDING_ABOVE_TITLE_FILE 2.0
 #define PADDING_BELOW_STATUS_FILE 2.0
+#define PADDING_BETWEEN_NAME_AND_FOLDER_STATUS 4.0
 
 @interface FileNameCell (Private)
 
 - (NSRect) rectForTitleWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
-- (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
+- (NSRect) rectForStatusWithString: (NSAttributedString *) string withTitleRect: (NSRect) titleRect inBounds: (NSRect) bounds;
 
 - (NSAttributedString *) attributedTitleWithColor: (NSColor *) color;
@@ -130 +131 @@
 - (NSRect) statusRectForBounds: (NSRect) bounds
 {
-    return [self rectForStatusWithString: [self attributedStatusWithColor: nil] inBounds: bounds];
+    return [self rectForStatusWithString: [self attributedStatusWithColor: nil]
+            withTitleRect: [(FileListNode *)[self objectValue] isFolder] ? [self titleRectForBounds: bounds] : NSZeroRect
+            inBounds: bounds];
 }
 
@@ -143 +146 @@
             && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
         specialColor = [NSColor whiteColor];
-    else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles:
-                [(FileListNode *)[self objectValue] indexes]] == NSOffState)
+    else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles: [(FileListNode *)[self objectValue] indexes]] == NSOffState)
         specialColor = [NSColor disabledControlTextColor];
     else;
@@ -153 +155 @@
     
     //status
-    if (![(FileListNode *)[self objectValue] isFolder])
-    {
-        NSAttributedString * statusString = [self attributedStatusWithColor: specialColor ? specialColor : [NSColor darkGrayColor]];
-        NSRect statusRect = [self rectForStatusWithString: statusString inBounds: cellFrame];
-        [statusString drawInRect: statusRect];
-    }
+    NSAttributedString * statusString = [self attributedStatusWithColor: specialColor ? specialColor : [NSColor darkGrayColor]];
+    NSRect statusRect = [self rectForStatusWithString: statusString withTitleRect: titleRect inBounds: cellFrame];
+    [statusString drawInRect: statusRect];
 }
 
@@ -187 +186 @@
 }
 
-- (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds
-{
-    if ([(FileListNode *)[self objectValue] isFolder])
-        return NSZeroRect;
-    
+- (NSRect) rectForStatusWithString: (NSAttributedString *) string withTitleRect: (NSRect) titleRect inBounds: (NSRect) bounds;
+{
     NSSize statusSize = [string size];
     
-    NSRect result = bounds;
-    
-    result.origin.x += PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
-    result.origin.y += result.size.height - PADDING_BELOW_STATUS_FILE - statusSize.height;
-    
+    NSRect result;
+    
+    if (![(FileListNode *)[self objectValue] isFolder])
+    {
+        result = bounds;
+        result.origin.x += PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
+        result.origin.y += result.size.height - PADDING_BELOW_STATUS_FILE - statusSize.height;
+    }
+    else
+    {
+        result.origin.x = NSMaxX(titleRect) + PADDING_BETWEEN_NAME_AND_FOLDER_STATUS;
+        result.origin.y = NSMaxY(titleRect) - statusSize.height - 1.0;
+    }
+        
     result.size = statusSize;
     result.size.width = MIN(result.size.width, NSMaxX(bounds) - result.origin.x - PADDING_HORIZONAL);
@@ -221 +226 @@
     Torrent * torrent = [(FileOutlineView *)[self controlView] torrent];
     FileListNode * node = (FileListNode *)[self objectValue];
-    float percent = [torrent fileProgress: [[node indexes] firstIndex]] * 100.0;
-    
-    NSString * status = [NSString localizedStringWithFormat: NSLocalizedString(@"%.2f%% of %@",
-                            "Inspector -> Files tab -> file status string"), percent, [NSString stringForFileSize: [node size]]];
+    
+    NSString * percentString;
+    float progress = [torrent fileProgress: node];
+    percentString = progress == 1.0 ? @"100%" : [NSString localizedStringWithFormat: @"%.2f%%", progress * 100.0];
+    
+    
+    NSString * status = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@",
+                            "Inspector -> Files tab -> file status string"), percentString, [NSString stringForFileSize: [node size]]];
     
     return [[[NSAttributedString alloc] initWithString: status attributes: fStatusAttributes] autorelease];

trunk/macosx/InfoWindowController.m

@@ -1632 +1632 @@
         return NO;
     
-    return [item isFolder] || [torrent fileProgress: [[item indexes] firstIndex]] == 1.0;
+    return [item isFolder] || [torrent fileProgress: item] == 1.0;
 }
 

trunk/macosx/Torrent.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 #import <transmission.h>
+
+@class FileListNode;
 
 #define INVALID -99
@@ -241 +243 @@
 
 //methods require fileStats to have been updated recently to be accurate
-- (float) fileProgress: (int) index;
+- (float) fileProgress: (FileListNode *) node;
 - (BOOL) canChangeDownloadCheckForFile: (int) index;
 - (BOOL) canChangeDownloadCheckForFiles: (NSIndexSet *) indexSet;

trunk/macosx/Torrent.m

@@ -1436 +1436 @@
 }
 
-- (float) fileProgress: (int) index
-{
+- (float) fileProgress: (FileListNode *) node
+{
+    if ([self isComplete])
+        return 1.0;
+    
     if (!fFileStat)
         [self updateFileStat];
-        
-    return fFileStat[index].progress;
+    
+    NSIndexSet * indexSet = [node indexes];
+    
+    if (![node isFolder])
+        return fFileStat[[indexSet firstIndex]].progress;
+    
+    uint64_t have = 0;
+    int index;
+    for (index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
+        have += fFileStat[index].bytesCompleted;
+    
+    return (float)have / [node size];
 }