Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 09:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

adjust priority colors, and show a priority color for folders

Browse Source
This commit is contained in:
Mitchell Livingston
2007-07-15 23:42:35 +00:00
parent fb4173157e
commit 76ad605726
4 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
macosx/FileOutlineView.h
+1 -1
View File
@@ -26,7 +26,7 @@
@interface FileOutlineView : NSOutlineView
{
NSColor * fNormalColor, * fHighPriorityColor, * fLowPriorityColor;
NSColor * fNormalColor, * fHighPriorityColor, * fLowPriorityColor, * fMixedPriorityColor;
int fHoverRow;
}
macosx/FileOutlineView.m
+41 -40
View File
@@ -38,8 +38,9 @@
[self setIndentationPerLevel: 14.0];
fNormalColor = [self backgroundColor];
fHighPriorityColor = [[NSColor colorWithCalibratedRed: 0.678 green: 0.937 blue: 0.451 alpha: 1.0] retain];
fLowPriorityColor = [[NSColor colorWithCalibratedRed: 0.984 green: 0.878 blue: 0.431 alpha: 1.0] retain];
fHighPriorityColor = [[NSColor colorWithCalibratedRed: 0.8588 green: 0.9961 blue: 0.8311 alpha: 1.0] retain];
fLowPriorityColor = [[NSColor colorWithCalibratedRed: 1.0 green: 0.9529 blue: 0.8078 alpha: 1.0] retain];
fMixedPriorityColor = [[NSColor colorWithCalibratedRed: 0.9216 green: 0.9059 blue: 1.0 alpha: 1.0] retain];
fHoverRow = -1;
}
@@ -48,6 +49,7 @@
{
[fHighPriorityColor release];
[fLowPriorityColor release];
[fMixedPriorityColor release];
[super dealloc];
}
@@ -105,23 +107,22 @@
NSDictionary * item = [self itemAtRow: row];
Torrent * torrent = [(InfoWindowController *)[[self window] windowController] selectedTorrent];
if ([[item objectForKey: @"IsFolder"] boolValue])
NSSet * priorities = [torrent filePrioritiesForIndexes: [item objectForKey: @"Indexes"]];
int count = [priorities count];
if (count == 0)
[fNormalColor set];
else if (count > 1)
[fMixedPriorityColor set];
else
{
NSSet * priorities = [torrent filePrioritiesForIndexes: [item objectForKey: @"Indexes"]];
if ([priorities count] == 0)
[fNormalColor set];
int priority = [[priorities anyObject] intValue];
if (priority == TR_PRI_LOW)
[fLowPriorityColor set];
else if (priority == TR_PRI_HIGH)
[fHighPriorityColor set];
else
{
int priority = [[priorities anyObject] intValue];
if (priority == TR_PRI_LOW)
[fLowPriorityColor set];
else if (priority == TR_PRI_HIGH)
[fHighPriorityColor set];
else
[fNormalColor set];
}
[fNormalColor set];
}
NSRect rect = [self rectOfRow: row];
@@ -136,39 +137,39 @@
- (void) drawRect: (NSRect) r
{
[super drawRect: r];
NSDictionary * item;
NSIndexSet * indexSet;
int i, priority;
int i, count, priority;
Torrent * torrent = [(InfoWindowController *)[[self window] windowController] selectedTorrent];
for (i = 0; i < [self numberOfRows]; i++)
{
if ([self isRowSelected: i])
{
item = [self itemAtRow: i];
if (![[item objectForKey: @"IsFolder"] boolValue])
{
NSSet * priorities = [torrent filePrioritiesForIndexes: [item objectForKey: @"Indexes"]];
if ([priorities count] == 1)
{
int priority = [[priorities anyObject] intValue];
if (priority == TR_PRI_LOW)
[fLowPriorityColor set];
else if (priority == TR_PRI_HIGH)
[fHighPriorityColor set];
else
continue;
NSRect rect = [self rectOfRow: i];
float width = 14.0;
rect.origin.y += (rect.size.height - width) * 0.5;
rect.origin.x += 3.0;
rect.size.width = width;
rect.size.height = width;
[[NSBezierPath bezierPathWithOvalInRect: rect] fill];
}
}
if ([[item objectForKey: @"IsFolder"] boolValue])
continue;
NSSet * priorities = [torrent filePrioritiesForIndexes: [item objectForKey: @"Indexes"]];
if ([priorities count] != 1)
continue;
priority = [[priorities anyObject] intValue];
if (priority == TR_PRI_LOW)
[fLowPriorityColor set];
else if (priority == TR_PRI_HIGH)
[fHighPriorityColor set];
else
continue;
NSRect rect = [self rectOfRow: i];
float width = 14.0;
rect.origin.y += (rect.size.height - width) * 0.5;
rect.origin.x += 3.0;
rect.size.width = width;
rect.size.height = width;
[[NSBezierPath bezierPathWithOvalInRect: rect] fill];
}
}
}
macosx/FilePriorityCell.m
-2
View File
@@ -34,8 +34,6 @@
//only for when clicking manually
Torrent * torrent = [[[[self controlView] window] windowController] selectedTorrent];
NSIndexSet * indexes = [fItem objectForKey: @"Indexes"];
if (![torrent canChangeDownloadCheckForFiles: indexes])
return;
int priority;
if (segment == 0)
macosx/Torrent.m
+3
View File
@@ -1303,6 +1303,9 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
- (BOOL) canChangeDownloadCheckForFile: (int) index
{
if (!fileStat)
[self updateFileStat];
return [self fileCount] > 1 && fileStat[index].completionStatus != TR_CP_COMPLETE;
}