mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-22 06:00:41 +00:00
Code Issues Releases Wiki Activity

miscellany

Browse source
This commit is contained in:
Mitchell Livingston 2009-12-20 21:02:58 +00:00
parent c5b73408ab
commit c14571561d
3 changed files with 62 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macosx/GroupsPrefsController.m
View file

@ -224,7 +224,7 @@
[[GroupsController groups] setUsesCustomDownloadLocation: NO forIndex: index]; [[GroupsController groups] setUsesCustomDownloadLocation: NO forIndex: index];
} }
[self refreshCustomLocation]; [self refreshCustomLocationWithSingleGroup];
[fCustomLocationPopUp selectItemAtIndex: 0]; [fCustomLocationPopUp selectItemAtIndex: 0];
} }

124
macosx/TorrentCell.m
View file

@ -30,35 +30,35 @@
#import "Torrent.h" #import "Torrent.h"
#import "TorrentTableView.h" #import "TorrentTableView.h"
#define BAR_HEIGHT 12.0f #define BAR_HEIGHT 12.0
#define IMAGE_SIZE_REG 32.0f #define IMAGE_SIZE_REG 32.0
#define IMAGE_SIZE_MIN 16.0f #define IMAGE_SIZE_MIN 16.0
#define ERROR_IMAGE_SIZE 20.0f #define ERROR_IMAGE_SIZE 20.0
#define NORMAL_BUTTON_WIDTH 14.0f #define NORMAL_BUTTON_WIDTH 14.0
#define ACTION_BUTTON_WIDTH 16.0f #define ACTION_BUTTON_WIDTH 16.0
#define PRIORITY_ICON_WIDTH 14.0f #define PRIORITY_ICON_WIDTH 14.0
#define PRIORITY_ICON_HEIGHT 14.0f #define PRIORITY_ICON_HEIGHT 14.0
//ends up being larger than font height //ends up being larger than font height
#define HEIGHT_TITLE 16.0f #define HEIGHT_TITLE 16.0
#define HEIGHT_STATUS 12.0f #define HEIGHT_STATUS 12.0
#define PADDING_HORIZONTAL 3.0f #define PADDING_HORIZONTAL 3.0
#define PADDING_BETWEEN_IMAGE_AND_TITLE 5.0f #define PADDING_BETWEEN_IMAGE_AND_TITLE 5.0
#define PADDING_BETWEEN_IMAGE_AND_BAR 7.0f #define PADDING_BETWEEN_IMAGE_AND_BAR 7.0
#define PADDING_BETWEEN_TITLE_AND_PRIORITY 4.0f #define PADDING_BETWEEN_TITLE_AND_PRIORITY 4.0
#define PADDING_ABOVE_TITLE 4.0f #define PADDING_ABOVE_TITLE 4.0
#define PADDING_ABOVE_MIN_STATUS 4.0f #define PADDING_ABOVE_MIN_STATUS 4.0
#define PADDING_BETWEEN_TITLE_AND_MIN_STATUS 2.0f #define PADDING_BETWEEN_TITLE_AND_MIN_STATUS 2.0
#define PADDING_BETWEEN_TITLE_AND_PROGRESS 1.0f #define PADDING_BETWEEN_TITLE_AND_PROGRESS 1.0
#define PADDING_BETWEEN_PROGRESS_AND_BAR 2.0f #define PADDING_BETWEEN_PROGRESS_AND_BAR 2.0
#define PADDING_BETWEEN_TITLE_AND_BAR_MIN 3.0f #define PADDING_BETWEEN_TITLE_AND_BAR_MIN 3.0
#define PADDING_BETWEEN_BAR_AND_STATUS 2.0f #define PADDING_BETWEEN_BAR_AND_STATUS 2.0
#define PIECES_TOTAL_PERCENT 0.6f #define PIECES_TOTAL_PERCENT 0.6
#define MAX_PIECES (18*18) #define MAX_PIECES (18*18)
@ -101,16 +101,18 @@
NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail]; [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
fTitleAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys: fTitleAttributes = [[NSMutableDictionary alloc] initWithCapacity: 3];
[NSFont messageFontOfSize: 12.0f], NSFontAttributeName, [fTitleAttributes setObject: [NSFont messageFontOfSize: 12.0] forKey: NSFontAttributeName];
paragraphStyle, NSParagraphStyleAttributeName, nil]; [fTitleAttributes setObject: paragraphStyle forKey: NSParagraphStyleAttributeName];
fStatusAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
[NSFont messageFontOfSize: 9.0f], NSFontAttributeName, fStatusAttributes = [[NSMutableDictionary alloc] initWithCapacity: 3];
paragraphStyle, NSParagraphStyleAttributeName, nil]; [fStatusAttributes setObject: [NSFont messageFontOfSize: 9.0] forKey: NSFontAttributeName];
[fStatusAttributes setObject: paragraphStyle forKey: NSParagraphStyleAttributeName];
[paragraphStyle release]; [paragraphStyle release];
fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0f green: 0.4f blue: 0.8f alpha: 1.0f] retain]; fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0 green: 0.4 blue: 0.8 alpha: 1.0] retain];
fBarBorderColor = [[NSColor colorWithCalibratedWhite: 0.0f alpha: 0.2f] retain]; fBarBorderColor = [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.2] retain];
} }
return self; return self;
} }
@ -119,12 +121,8 @@
{ {
const CGFloat imageSize = [fDefaults boolForKey: @"SmallView"] ? IMAGE_SIZE_MIN : IMAGE_SIZE_REG; const CGFloat imageSize = [fDefaults boolForKey: @"SmallView"] ? IMAGE_SIZE_MIN : IMAGE_SIZE_REG;
NSRect result = bounds; return NSMakeRect(NSMinX(bounds) + PADDING_HORIZONTAL, floor(NSMidY(bounds) - imageSize * 0.5),
result.origin.x += PADDING_HORIZONTAL; imageSize, imageSize);
result.origin.y += floor((result.size.height - imageSize) * 0.5);
result.size = NSMakeSize(imageSize, imageSize);
return result;
} }
- (NSUInteger) hitTestForEvent: (NSEvent *) event inRect: (NSRect) cellFrame ofView: (NSView *) controlView - (NSUInteger) hitTestForEvent: (NSEvent *) event inRect: (NSRect) cellFrame ofView: (NSView *) controlView
@ -237,7 +235,7 @@
if (NSMouseInRect(mouseLocation, controlButtonRect, [controlView isFlipped])) if (NSMouseInRect(mouseLocation, controlButtonRect, [controlView isFlipped]))
{ {
controlOptions |= NSTrackingAssumeInside; controlOptions |= NSTrackingAssumeInside;
[(TorrentTableView *)controlView setControlButtonHover: [[userInfo objectForKey: @"Row"] intValue]]; [(TorrentTableView *)controlView setControlButtonHover: [[userInfo objectForKey: @"Row"] integerValue]];
} }
NSMutableDictionary * controlInfo = [userInfo mutableCopy]; NSMutableDictionary * controlInfo = [userInfo mutableCopy];
@ -254,7 +252,7 @@
if (NSMouseInRect(mouseLocation, revealButtonRect, [controlView isFlipped])) if (NSMouseInRect(mouseLocation, revealButtonRect, [controlView isFlipped]))
{ {
revealOptions |= NSTrackingAssumeInside; revealOptions |= NSTrackingAssumeInside;
[(TorrentTableView *)controlView setRevealButtonHover: [[userInfo objectForKey: @"Row"] intValue]]; [(TorrentTableView *)controlView setRevealButtonHover: [[userInfo objectForKey: @"Row"] integerValue]];
} }
NSMutableDictionary * revealInfo = [userInfo mutableCopy]; NSMutableDictionary * revealInfo = [userInfo mutableCopy];
@ -270,7 +268,7 @@
if (NSMouseInRect(mouseLocation, actionButtonRect, [controlView isFlipped])) if (NSMouseInRect(mouseLocation, actionButtonRect, [controlView isFlipped]))
{ {
actionOptions |= NSTrackingAssumeInside; actionOptions |= NSTrackingAssumeInside;
[(TorrentTableView *)controlView setActionButtonHover: [[userInfo objectForKey: @"Row"] intValue]]; [(TorrentTableView *)controlView setActionButtonHover: [[userInfo objectForKey: @"Row"] integerValue]];
} }
NSMutableDictionary * actionInfo = [userInfo mutableCopy]; NSMutableDictionary * actionInfo = [userInfo mutableCopy];
@ -308,33 +306,33 @@
const BOOL minimal = [fDefaults boolForKey: @"SmallView"]; const BOOL minimal = [fDefaults boolForKey: @"SmallView"];
//group coloring //group coloring
NSRect iconRect = [self iconRectForBounds: cellFrame]; const NSRect iconRect = [self iconRectForBounds: cellFrame];
NSInteger groupValue = [torrent groupValue]; const NSInteger groupValue = [torrent groupValue];
if (groupValue != -1) if (groupValue != -1)
{ {
NSRect groupRect = NSInsetRect(iconRect, -1.0f, -2.0f); NSRect groupRect = NSInsetRect(iconRect, -1.0, -2.0);
if (!minimal) if (!minimal)
{ {
groupRect.size.height -= 1.0f; groupRect.size.height -= 1.0;
groupRect.origin.y -= 1.0f; groupRect.origin.y -= 1.0;
} }
const CGFloat radius = minimal ? 3.0f : 6.0f; const CGFloat radius = minimal ? 3.0 : 6.0;
NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue], NSColor * groupColor = [[GroupsController groups] colorForIndex: groupValue],
* darkGroupColor = [groupColor blendedColorWithFraction: 0.2f ofColor: [NSColor whiteColor]]; * darkGroupColor = [groupColor blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]];
//border //border
NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius]; NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius];
[darkGroupColor set]; [darkGroupColor set];
[bp setLineWidth: 2.0f]; [bp setLineWidth: 2.0];
[bp stroke]; [bp stroke];
//inside //inside
bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius]; bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius];
NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [groupColor blendedColorWithFraction: 0.7f NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [groupColor blendedColorWithFraction: 0.7
ofColor: [NSColor whiteColor]] endingColor: darkGroupColor]; ofColor: [NSColor whiteColor]] endingColor: darkGroupColor];
[gradient drawInBezierPath: bp angle: 90.0f]; [gradient drawInBezierPath: bp angle: 90.0];
[gradient release]; [gradient release];
} }
@ -389,11 +387,12 @@
{ {
NSImage * priorityImage = [torrent priority] == TR_PRI_HIGH ? [NSImage imageNamed: @"PriorityHigh.png"] NSImage * priorityImage = [torrent priority] == TR_PRI_HIGH ? [NSImage imageNamed: @"PriorityHigh.png"]
: [NSImage imageNamed: @"PriorityLow.png"]; : [NSImage imageNamed: @"PriorityLow.png"];
priorityImage = [NSApp isOnSnowLeopardOrBetter] ? [priorityImage retain] : [priorityImage copy]; //take line out completely when 10.6-only //take line out completely when 10.6-only
priorityImage = [NSApp isOnSnowLeopardOrBetter] ? [priorityImage retain] : [priorityImage copy];
NSRect priorityRect = NSMakeRect(NSMaxX(titleRect) + PADDING_BETWEEN_TITLE_AND_PRIORITY, NSRect priorityRect = NSMakeRect(NSMaxX(titleRect) + PADDING_BETWEEN_TITLE_AND_PRIORITY,
titleRect.origin.y - (PRIORITY_ICON_HEIGHT - titleRect.size.height) / 2.0, NSMidY(titleRect) - PRIORITY_ICON_HEIGHT * 0.5,
PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT); PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT);
[self drawImage: priorityImage inRect: priorityRect]; [self drawImage: priorityImage inRect: priorityRect];
[priorityImage release]; [priorityImage release];
@ -637,7 +636,7 @@
if ([[self representedObject] priority] != TR_PRI_NORMAL) if ([[self representedObject] priority] != TR_PRI_NORMAL)
{ {
result.size.width -= PRIORITY_ICON_WIDTH + PADDING_BETWEEN_TITLE_AND_PRIORITY; result.size.width -= PRIORITY_ICON_WIDTH + PADDING_BETWEEN_TITLE_AND_PRIORITY;
result.size.width = MIN(result.size.width, [string size].width); //only need to force it smaller for the priority icon result.size.width = MIN(NSWidth(result), [string size].width); //only need to force it smaller for the priority icon
} }
return result; return result;
@ -692,9 +691,9 @@
NSRect result; NSRect result;
result.size.height = NORMAL_BUTTON_WIDTH; result.size.height = NORMAL_BUTTON_WIDTH;
result.size.width = NORMAL_BUTTON_WIDTH; result.size.width = NORMAL_BUTTON_WIDTH;
result.origin.x = NSMaxX(bounds) - 2.0f * (PADDING_HORIZONTAL + NORMAL_BUTTON_WIDTH); result.origin.x = NSMaxX(bounds) - 2.0 * (PADDING_HORIZONTAL + NORMAL_BUTTON_WIDTH);
result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5f; result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5;
if ([fDefaults boolForKey: @"SmallView"]) if ([fDefaults boolForKey: @"SmallView"])
result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN; result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN;
else else
@ -710,7 +709,7 @@
result.size.width = NORMAL_BUTTON_WIDTH; result.size.width = NORMAL_BUTTON_WIDTH;
result.origin.x = NSMaxX(bounds) - (PADDING_HORIZONTAL + NORMAL_BUTTON_WIDTH); result.origin.x = NSMaxX(bounds) - (PADDING_HORIZONTAL + NORMAL_BUTTON_WIDTH);
result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5f; result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE + HEIGHT_TITLE - (NORMAL_BUTTON_WIDTH - BAR_HEIGHT) * 0.5;
if ([fDefaults boolForKey: @"SmallView"]) if ([fDefaults boolForKey: @"SmallView"])
result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN; result.origin.y += PADDING_BETWEEN_TITLE_AND_BAR_MIN;
else else
@ -721,16 +720,11 @@
- (NSRect) actionButtonRectForBounds: (NSRect) bounds - (NSRect) actionButtonRectForBounds: (NSRect) bounds
{ {
NSRect result = [self iconRectForBounds: bounds]; const NSRect iconRect = [self iconRectForBounds: bounds];
if (![fDefaults boolForKey: @"SmallView"])
{
result.origin.x += (result.size.width - ACTION_BUTTON_WIDTH) * 0.5f;
result.origin.y += (result.size.height - ACTION_BUTTON_WIDTH) * 0.5f;
result.size.width = ACTION_BUTTON_WIDTH;
result.size.height = ACTION_BUTTON_WIDTH;
}
return result; //in minimal view the rect will be the icon rect, but avoid the extra defaults lookup with some cheap math
return NSMakeRect(NSMidX(iconRect) - ACTION_BUTTON_WIDTH * 0.5, NSMidY(iconRect) - ACTION_BUTTON_WIDTH * 0.5,
ACTION_BUTTON_WIDTH, ACTION_BUTTON_WIDTH);
} }
- (NSAttributedString *) attributedTitle - (NSAttributedString *) attributedTitle

2
macosx/TorrentTableView.m
View file

@ -240,7 +240,7 @@
if (![[self itemAtRow: row] isKindOfClass: [Torrent class]]) if (![[self itemAtRow: row] isKindOfClass: [Torrent class]])
continue; continue;
NSDictionary * userInfo = [NSDictionary dictionaryWithObject: [NSNumber numberWithInt: row] forKey: @"Row"]; NSDictionary * userInfo = [NSDictionary dictionaryWithObject: [NSNumber numberWithUnsignedInteger: row] forKey: @"Row"];
TorrentCell * cell = (TorrentCell *)[self preparedCellAtColumn: -1 row: row]; TorrentCell * cell = (TorrentCell *)[self preparedCellAtColumn: -1 row: row];
[cell addTrackingAreasForView: self inRect: [self rectOfRow: row] withUserInfo: userInfo mouseLocation: mouseLocation]; [cell addTrackingAreasForView: self inRect: [self rectOfRow: row] withUserInfo: userInfo mouseLocation: mouseLocation];
} }