From 271badba8b2af9d49249445be2f950756f8394bf Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Thu, 18 Jan 2007 22:00:24 +0000 Subject: [PATCH] file table rows for files are now larger with the size displayed under it --- .../InfoWindow.nib/keyedobjects.nib | Bin 41793 -> 41500 bytes macosx/FileBrowserCell.m | 67 +++++++++++++----- macosx/InfoWindowController.m | 28 +++++--- 3 files changed, 68 insertions(+), 27 deletions(-) diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib index 992f5184976c51c5b827567bc9674535e4ca1725..4052345a627a702b4781cab41ce64dde8e4175c7 100644 GIT binary patch delta 17634 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 diff --git a/macosx/FileBrowserCell.m b/macosx/FileBrowserCell.m index ef529775a..dc56db1bb 100644 --- a/macosx/FileBrowserCell.m +++ b/macosx/FileBrowserCell.m @@ -12,37 +12,68 @@ - (void) setImage: (NSImage *) image { [image setFlipped: YES]; + [image setScalesWhenResized: YES]; [super setImage: image]; } - (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView { //image - NSImage * icon = [self image]; - NSSize iconSize = [icon size]; - NSRect imageRect = NSMakeRect(cellFrame.origin.x + 2.0 * SPACE, cellFrame.origin.y, iconSize.width, iconSize.height); + float imageHeight = cellFrame.size.height - 2.0; - [icon drawInRect: imageRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0]; + NSImage * image = [self image]; + [image setSize: NSMakeSize(imageHeight, imageHeight)]; + NSRect imageRect = NSMakeRect(cellFrame.origin.x + 2.0 * SPACE, + cellFrame.origin.y + (cellFrame.size.height - imageHeight) / 2.0, + imageHeight, imageHeight); + + [image drawInRect: imageRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0]; //text - NSRect textRect = NSMakeRect(NSMaxX(imageRect) + SPACE, cellFrame.origin.y, - cellFrame.size.width - 4.0 * SPACE, cellFrame.size.height); + NSArray * strings = [[self stringValue] componentsSeparatedByString: @"\n"]; - if ([self isHighlighted] && [[self highlightColorWithFrame: cellFrame inView: controlView] - isEqual: [NSColor alternateSelectedControlColor]]) + NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail]; + + BOOL highlighted = [self isHighlighted] && [[self highlightColorWithFrame: cellFrame inView: controlView] + isEqual: [NSColor alternateSelectedControlColor]]; + NSDictionary * nameAttributes = [[NSDictionary alloc] initWithObjectsAndKeys: + highlighted ? [NSColor whiteColor] : [NSColor controlTextColor], NSForegroundColorAttributeName, + [NSFont messageFontOfSize: 12.0], NSFontAttributeName, + paragraphStyle, NSParagraphStyleAttributeName, nil]; + + float textHeight = [(NSTableView *)controlView rowHeight]; + NSRect textRect = NSMakeRect(NSMaxX(imageRect) + SPACE, cellFrame.origin.y + 2.0, + NSMaxX(cellFrame) - NSMaxX(imageRect) - 2.0 * SPACE, textHeight); + + NSAttributedString * text = [[NSAttributedString alloc] initWithString: [strings objectAtIndex: 0] + attributes: nameAttributes]; + [text drawInRect: textRect]; + [text release]; + + //bottomText + if ([strings count] > 1) { - NSMutableAttributedString * text = [[self attributedStringValue] mutableCopy]; - NSDictionary * attributes = [[NSDictionary alloc] initWithObjectsAndKeys: - [NSColor whiteColor], NSForegroundColorAttributeName, nil]; - [text addAttributes: attributes range: NSMakeRange(0, [text length])]; - [text drawInRect: textRect]; + NSDictionary * statusAttributes = [[NSDictionary alloc] initWithObjectsAndKeys: + highlighted ? [NSColor whiteColor] : [NSColor darkGrayColor], NSForegroundColorAttributeName, + [NSFont messageFontOfSize: 9.0], NSFontAttributeName, + paragraphStyle, NSParagraphStyleAttributeName, nil]; - [attributes release]; - [text release]; + NSRect bottomTextRect = textRect; + bottomTextRect.origin.y += textHeight; + bottomTextRect.size.height = cellFrame.size.height - textHeight; + + NSMutableAttributedString * bottomText = [[NSMutableAttributedString alloc] initWithString: [strings objectAtIndex: 1] + attributes: statusAttributes]; + + [bottomText drawInRect: bottomTextRect]; + [bottomText release]; + + [statusAttributes release]; } - else - [[self attributedStringValue] drawInRect: textRect]; - + + [paragraphStyle release]; + [nameAttributes release]; } @end diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index fbde719ac..8dee19379 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -676,13 +676,16 @@ - (id) outlineView: (NSOutlineView *) outlineView objectValueForTableColumn: (NSTableColumn *) tableColumn byItem: (id) item { - if ([[tableColumn identifier] isEqualToString: @"Size"]) - return ![[item objectForKey: @"IsFolder"] boolValue] - ? [NSString stringForFileSize: [[item objectForKey: @"Size"] unsignedLongLongValue]] : @""; - else if ([[tableColumn identifier] isEqualToString: @"Check"]) + if ([[tableColumn identifier] isEqualToString: @"Check"]) return [item objectForKey: @"Check"]; else - return [item objectForKey: @"Name"]; + { + if ([[item objectForKey: @"IsFolder"] boolValue]) + return [item objectForKey: @"Name"]; + else + return [NSString stringWithFormat: @"%@\n%@", [item objectForKey: @"Name"], + [NSString stringForFileSize: [[item objectForKey: @"Size"] unsignedLongLongValue]]]; + } } - (void) outlineView: (NSOutlineView *) outlineView setObjectValue: (id) object @@ -752,8 +755,6 @@ { NSImage * icon = [[NSWorkspace sharedWorkspace] iconForFileType: ![[item objectForKey: @"IsFolder"] boolValue] ? [[item objectForKey: @"Name"] pathExtension] : NSFileTypeForHFSTypeCode('fldr')]; - [icon setScalesWhenResized: YES]; - [icon setSize: NSMakeSize(16.0, 16.0)]; [cell setImage: icon]; } else if ([[tableColumn identifier] isEqualToString: @"Check"]) @@ -768,16 +769,25 @@ tableColumn: (NSTableColumn *) tableColumn item: (id) item mouseLocation: (NSPoint) mouseLocation { NSString * ident = [tableColumn identifier]; - if ([ident isEqualToString: @"Size"]) + #warning change + /*if ([ident isEqualToString: @"Size"]) return ![[item objectForKey: @"IsFolder"] boolValue] ? [[[item objectForKey: @"Size"] stringValue] stringByAppendingString: NSLocalizedString(@" bytes", "Inspector -> Files tab -> table row tooltip")] : nil; - else if ([ident isEqualToString: @"Name"]) + else*/ if ([ident isEqualToString: @"Name"]) return [[[fTorrents objectAtIndex: 0] downloadFolder] stringByAppendingPathComponent: [item objectForKey: @"Path"]]; else return nil; } +- (float) outlineView: (NSOutlineView *) outlineView heightOfRowByItem: (id) item +{ + float height = [outlineView rowHeight]; + if (![[item objectForKey: @"IsFolder"] boolValue]) + height = 34.0; + return height; +} + - (NSArray *) peerSortDescriptors { NSMutableArray * descriptors = [NSMutableArray array];