experimented with updated priority images

This commit is contained in:
Mitchell Livingston 2011-10-22 20:45:20 +00:00
parent 98b77e89a5
commit c264f9d366
17 changed files with 324 additions and 104 deletions

View File

@ -105,10 +105,9 @@
A209ECA2114319C3002B02D1 /* InfoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A209ECA1114319C3002B02D1 /* InfoWindow.xib */; }; A209ECA2114319C3002B02D1 /* InfoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A209ECA1114319C3002B02D1 /* InfoWindow.xib */; };
A209EE5C1144B51E002B02D1 /* history.c in Sources */ = {isa = PBXBuildFile; fileRef = A209EE5A1144B51E002B02D1 /* history.c */; }; A209EE5C1144B51E002B02D1 /* history.c in Sources */ = {isa = PBXBuildFile; fileRef = A209EE5A1144B51E002B02D1 /* history.c */; };
A209EE5D1144B51E002B02D1 /* history.h in Headers */ = {isa = PBXBuildFile; fileRef = A209EE5B1144B51E002B02D1 /* history.h */; }; A209EE5D1144B51E002B02D1 /* history.h in Headers */ = {isa = PBXBuildFile; fileRef = A209EE5B1144B51E002B02D1 /* history.h */; };
A20B6F6B0C4D842B0034AB1D /* PriorityLow.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */; }; A20B6F6B0C4D842B0034AB1D /* PriorityLowTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F6A0C4D842B0034AB1D /* PriorityLowTemplate.png */; };
A20B6F830C4D8A610034AB1D /* PriorityHigh.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F820C4D8A610034AB1D /* PriorityHigh.png */; }; A20B6F830C4D8A610034AB1D /* PriorityHighTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F820C4D8A610034AB1D /* PriorityHighTemplate.png */; };
A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FA40C4D97840034AB1D /* PriorityNone.png */; }; A20B6FAE0C4D9B040034AB1D /* PriorityNormalTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormalTemplate.png */; };
A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */; };
A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */; }; A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */; };
A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; }; A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; };
A215BF5C0F02EBB800350CDB /* GroupRules.xib in Resources */ = {isa = PBXBuildFile; fileRef = A215BF5B0F02EBB800350CDB /* GroupRules.xib */; }; A215BF5C0F02EBB800350CDB /* GroupRules.xib in Resources */ = {isa = PBXBuildFile; fileRef = A215BF5B0F02EBB800350CDB /* GroupRules.xib */; };
@ -155,6 +154,7 @@
A232F07E0EEA034A00041646 /* BonjourController.m in Sources */ = {isa = PBXBuildFile; fileRef = A232F07D0EEA034A00041646 /* BonjourController.m */; }; A232F07E0EEA034A00041646 /* BonjourController.m in Sources */ = {isa = PBXBuildFile; fileRef = A232F07D0EEA034A00041646 /* BonjourController.m */; };
A233BD330D8C6585007EE7B4 /* MessageWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD320D8C6585007EE7B4 /* MessageWindow.xib */; }; A233BD330D8C6585007EE7B4 /* MessageWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD320D8C6585007EE7B4 /* MessageWindow.xib */; };
A233BD690D8CF2C7007EE7B4 /* StatsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */; }; A233BD690D8CF2C7007EE7B4 /* StatsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */; };
A234EA541453563B000F3E97 /* NSImageAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A234EA531453563B000F3E97 /* NSImageAdditions.m */; };
A23547E211CD0B090046EAE6 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = A23547E011CD0B090046EAE6 /* cache.c */; }; A23547E211CD0B090046EAE6 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = A23547E011CD0B090046EAE6 /* cache.c */; };
A23547E311CD0B090046EAE6 /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = A23547E111CD0B090046EAE6 /* cache.h */; }; A23547E311CD0B090046EAE6 /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = A23547E111CD0B090046EAE6 /* cache.h */; };
A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */; }; A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */; };
@ -580,10 +580,9 @@
A209ECA1114319C3002B02D1 /* InfoWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = InfoWindow.xib; path = macosx/InfoWindow.xib; sourceTree = "<group>"; }; A209ECA1114319C3002B02D1 /* InfoWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = InfoWindow.xib; path = macosx/InfoWindow.xib; sourceTree = "<group>"; };
A209EE5A1144B51E002B02D1 /* history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = history.c; path = libtransmission/history.c; sourceTree = "<group>"; }; A209EE5A1144B51E002B02D1 /* history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = history.c; path = libtransmission/history.c; sourceTree = "<group>"; };
A209EE5B1144B51E002B02D1 /* history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = history.h; path = libtransmission/history.h; sourceTree = "<group>"; }; A209EE5B1144B51E002B02D1 /* history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = history.h; path = libtransmission/history.h; sourceTree = "<group>"; };
A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityLow.png; path = macosx/Images/PriorityLow.png; sourceTree = "<group>"; }; A20B6F6A0C4D842B0034AB1D /* PriorityLowTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityLowTemplate.png; path = macosx/Images/PriorityLowTemplate.png; sourceTree = "<group>"; };
A20B6F820C4D8A610034AB1D /* PriorityHigh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityHigh.png; path = macosx/Images/PriorityHigh.png; sourceTree = "<group>"; }; A20B6F820C4D8A610034AB1D /* PriorityHighTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityHighTemplate.png; path = macosx/Images/PriorityHighTemplate.png; sourceTree = "<group>"; };
A20B6FA40C4D97840034AB1D /* PriorityNone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNone.png; path = macosx/Images/PriorityNone.png; sourceTree = "<group>"; }; A20B6FAD0C4D9B040034AB1D /* PriorityNormalTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNormalTemplate.png; path = macosx/Images/PriorityNormalTemplate.png; sourceTree = "<group>"; };
A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNormal.png; path = macosx/Images/PriorityNormal.png; sourceTree = "<group>"; };
A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolbarSegmentedCell.h; path = macosx/ToolbarSegmentedCell.h; sourceTree = "<group>"; }; A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolbarSegmentedCell.h; path = macosx/ToolbarSegmentedCell.h; sourceTree = "<group>"; };
A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolbarSegmentedCell.m; path = macosx/ToolbarSegmentedCell.m; sourceTree = "<group>"; }; A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolbarSegmentedCell.m; path = macosx/ToolbarSegmentedCell.m; sourceTree = "<group>"; };
A21282A50CA6C66800EAEE0F /* StatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StatusBarView.h; path = macosx/StatusBarView.h; sourceTree = "<group>"; }; A21282A50CA6C66800EAEE0F /* StatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StatusBarView.h; path = macosx/StatusBarView.h; sourceTree = "<group>"; };
@ -659,6 +658,8 @@
A232F07D0EEA034A00041646 /* BonjourController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BonjourController.m; path = macosx/BonjourController.m; sourceTree = "<group>"; }; A232F07D0EEA034A00041646 /* BonjourController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BonjourController.m; path = macosx/BonjourController.m; sourceTree = "<group>"; };
A233BD320D8C6585007EE7B4 /* MessageWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MessageWindow.xib; path = macosx/MessageWindow.xib; sourceTree = "<group>"; }; A233BD320D8C6585007EE7B4 /* MessageWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MessageWindow.xib; path = macosx/MessageWindow.xib; sourceTree = "<group>"; };
A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = StatsWindow.xib; path = macosx/StatsWindow.xib; sourceTree = "<group>"; }; A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = StatsWindow.xib; path = macosx/StatsWindow.xib; sourceTree = "<group>"; };
A234EA521453563B000F3E97 /* NSImageAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSImageAdditions.h; path = macosx/NSImageAdditions.h; sourceTree = "<group>"; };
A234EA531453563B000F3E97 /* NSImageAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSImageAdditions.m; path = macosx/NSImageAdditions.m; sourceTree = "<group>"; };
A23547E011CD0B090046EAE6 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cache.c; path = libtransmission/cache.c; sourceTree = "<group>"; }; A23547E011CD0B090046EAE6 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cache.c; path = libtransmission/cache.c; sourceTree = "<group>"; };
A23547E111CD0B090046EAE6 /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache.h; path = libtransmission/cache.h; sourceTree = "<group>"; }; A23547E111CD0B090046EAE6 /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache.h; path = libtransmission/cache.h; sourceTree = "<group>"; };
A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayWindow.m; path = macosx/DragOverlayWindow.m; sourceTree = "<group>"; }; A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayWindow.m; path = macosx/DragOverlayWindow.m; sourceTree = "<group>"; };
@ -1252,10 +1253,9 @@
A209EBD81142F52B002B02D1 /* InfoFileView.xib */, A209EBD81142F52B002B02D1 /* InfoFileView.xib */,
A209EC11114301C6002B02D1 /* InfoOptionsView.xib */, A209EC11114301C6002B02D1 /* InfoOptionsView.xib */,
A220AF7913D7CC460035C512 /* GlobalOptionsPopover.xib */, A220AF7913D7CC460035C512 /* GlobalOptionsPopover.xib */,
A20B6FA40C4D97840034AB1D /* PriorityNone.png */, A20B6FAD0C4D9B040034AB1D /* PriorityNormalTemplate.png */,
A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */, A20B6F6A0C4D842B0034AB1D /* PriorityLowTemplate.png */,
A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */, A20B6F820C4D8A610034AB1D /* PriorityHighTemplate.png */,
A20B6F820C4D8A610034AB1D /* PriorityHigh.png */,
A2623B2C0D3DC2EF0045D19A /* PriorityControlNormal.png */, A2623B2C0D3DC2EF0045D19A /* PriorityControlNormal.png */,
A2623B2D0D3DC2EF0045D19A /* PriorityControlLow.png */, A2623B2D0D3DC2EF0045D19A /* PriorityControlLow.png */,
A2623B2E0D3DC2EF0045D19A /* PriorityControlHigh.png */, A2623B2E0D3DC2EF0045D19A /* PriorityControlHigh.png */,
@ -1504,6 +1504,8 @@
A29D84031049C25600D1987A /* NSApplicationAdditions.m */, A29D84031049C25600D1987A /* NSApplicationAdditions.m */,
A22BAE261388040500FB022F /* NSMutableArrayAdditions.h */, A22BAE261388040500FB022F /* NSMutableArrayAdditions.h */,
A22BAE271388040500FB022F /* NSMutableArrayAdditions.m */, A22BAE271388040500FB022F /* NSMutableArrayAdditions.m */,
A234EA521453563B000F3E97 /* NSImageAdditions.h */,
A234EA531453563B000F3E97 /* NSImageAdditions.m */,
); );
name = Additions; name = Additions;
sourceTree = "<group>"; sourceTree = "<group>";
@ -2084,10 +2086,9 @@
A241528B0C0261B8007DD3B4 /* Globe.png in Resources */, A241528B0C0261B8007DD3B4 /* Globe.png in Resources */,
A2E9AA760C249AF400085DCF /* ToolbarCreateTemplate.png in Resources */, A2E9AA760C249AF400085DCF /* ToolbarCreateTemplate.png in Resources */,
A2F011990C27418800576FC0 /* CreateLarge.png in Resources */, A2F011990C27418800576FC0 /* CreateLarge.png in Resources */,
A20B6F6B0C4D842B0034AB1D /* PriorityLow.png in Resources */, A20B6F6B0C4D842B0034AB1D /* PriorityLowTemplate.png in Resources */,
A20B6F830C4D8A610034AB1D /* PriorityHigh.png in Resources */, A20B6F830C4D8A610034AB1D /* PriorityHighTemplate.png in Resources */,
A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */, A20B6FAE0C4D9B040034AB1D /* PriorityNormalTemplate.png in Resources */,
A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */,
A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */, A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */,
A2EF7DEC0C96297400FA9811 /* PurpleDot.png in Resources */, A2EF7DEC0C96297400FA9811 /* PurpleDot.png in Resources */,
A2BC19850CA9AF5A00DD302A /* CompleteCheck.png in Resources */, A2BC19850CA9AF5A00DD302A /* CompleteCheck.png in Resources */,
@ -2345,6 +2346,7 @@
A2E57BA713109E6B00A7DAB1 /* FilterBarController.m in Sources */, A2E57BA713109E6B00A7DAB1 /* FilterBarController.m in Sources */,
A22BAE281388040500FB022F /* NSMutableArrayAdditions.m in Sources */, A22BAE281388040500FB022F /* NSMutableArrayAdditions.m in Sources */,
A2966E8713DAF74C007B52DF /* GlobalOptionsPopoverViewController.m in Sources */, A2966E8713DAF74C007B52DF /* GlobalOptionsPopoverViewController.m in Sources */,
A234EA541453563B000F3E97 /* NSImageAdditions.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

View File

@ -604,7 +604,7 @@ typedef enum
action: @selector(setPriority:) keyEquivalent: @""]; action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self]; [item setTarget: self];
[item setTag: FILE_PRIORITY_HIGH_TAG]; [item setTag: FILE_PRIORITY_HIGH_TAG];
[item setImage: [NSImage imageNamed: @"PriorityHigh.png"]]; [item setImage: [NSImage imageNamed: @"PriorityHighTemplate.png"]];
[priorityMenu addItem: item]; [priorityMenu addItem: item];
[item release]; [item release];
@ -612,7 +612,7 @@ typedef enum
action: @selector(setPriority:) keyEquivalent: @""]; action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self]; [item setTarget: self];
[item setTag: FILE_PRIORITY_NORMAL_TAG]; [item setTag: FILE_PRIORITY_NORMAL_TAG];
[item setImage: [NSImage imageNamed: @"PriorityNormal.png"]]; [item setImage: [NSImage imageNamed: @"PriorityNormalTemplate.png"]];
[priorityMenu addItem: item]; [priorityMenu addItem: item];
[item release]; [item release];
@ -620,7 +620,7 @@ typedef enum
action: @selector(setPriority:) keyEquivalent: @""]; action: @selector(setPriority:) keyEquivalent: @""];
[item setTarget: self]; [item setTarget: self];
[item setTag: FILE_PRIORITY_LOW_TAG]; [item setTag: FILE_PRIORITY_LOW_TAG];
[item setImage: [NSImage imageNamed: @"PriorityLow.png"]]; [item setImage: [NSImage imageNamed: @"PriorityLowTemplate.png"]];
[priorityMenu addItem: item]; [priorityMenu addItem: item];
[item release]; [item release];

View File

@ -25,6 +25,7 @@
#import "FilePriorityCell.h" #import "FilePriorityCell.h"
#import "FileOutlineView.h" #import "FileOutlineView.h"
#import "FileListNode.h" #import "FileListNode.h"
#import "NSImageAdditions.h"
#import "Torrent.h" #import "Torrent.h"
#define IMAGE_OVERLAP 3.0 #define IMAGE_OVERLAP 3.0
@ -130,28 +131,33 @@
if (count == 0) if (count == 0)
{ {
NSImage * image = [NSImage imageNamed: @"PriorityNone.png"]; //if ([self backgroundStyle] != NSBackgroundStyleDark)
[images addObject: image]; {
totalWidth = [image size].width; NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: [NSColor lightGrayColor]];
[images addObject: image];
totalWidth = [image size].width;
}
} }
else else
{ {
NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor];
totalWidth = 0.0; totalWidth = 0.0;
if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_LOW]]) if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_LOW]])
{ {
NSImage * image = [NSImage imageNamed: @"PriorityLow.png"]; NSImage * image = [[NSImage imageNamed: @"PriorityLowTemplate.png"] imageWithColor: priorityColor];
[images addObject: image]; [images addObject: image];
totalWidth += [image size].width; totalWidth += [image size].width;
} }
if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_NORMAL]]) if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_NORMAL]])
{ {
NSImage * image = [NSImage imageNamed: @"PriorityNormal.png"]; NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: priorityColor];
[images addObject: image]; [images addObject: image];
totalWidth += [image size].width; totalWidth += [image size].width;
} }
if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_HIGH]]) if ([priorities containsObject: [NSNumber numberWithInteger: TR_PRI_HIGH]])
{ {
NSImage * image = [NSImage imageNamed: @"PriorityHigh.png"]; NSImage * image = [[NSImage imageNamed: @"PriorityHighTemplate.png"] imageWithColor: priorityColor];
[images addObject: image]; [images addObject: image];
totalWidth += [image size].width; totalWidth += [image size].width;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

View File

@ -114,6 +114,8 @@ EXTRA_DIST = \
MessageWindowController.m \ MessageWindowController.m \
NSApplicationAdditions.h \ NSApplicationAdditions.h \
NSApplicationAdditions.m \ NSApplicationAdditions.m \
NSImageAdditions.h \
NSImageAdditions.m \
NSMutableArrayAdditions.h \ NSMutableArrayAdditions.h \
NSMutableArrayAdditions.m \ NSMutableArrayAdditions.m \
NSStringAdditions.h \ NSStringAdditions.h \

31
macosx/NSImageAdditions.h Normal file
View File

@ -0,0 +1,31 @@
/******************************************************************************
* $Id$
*
* Copyright (c) 2011 Transmission authors and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#import <Cocoa/Cocoa.h>
@interface NSImage (NSImageAdditions)
- (NSImage *) imageWithColor: (NSColor *) color;
@end

43
macosx/NSImageAdditions.m Normal file
View File

@ -0,0 +1,43 @@
/******************************************************************************
* $Id$
*
* Copyright (c) 2011 Transmission authors and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#import "NSImageAdditions.h"
@implementation NSImage (NSImageAdditions)
- (NSImage *) imageWithColor: (NSColor *) color
{
NSImage * coloredImage = [self copy];
[coloredImage lockFocus];
[color set];
NSRectFillUsingOperation(NSMakeRect(0.0, 0.0, [coloredImage size].width, [coloredImage size].height), NSCompositeSourceAtop);
[coloredImage unlockFocus];
return [coloredImage autorelease];
}
@end

View File

@ -24,6 +24,7 @@
#import "TorrentCell.h" #import "TorrentCell.h"
#import "GroupsController.h" #import "GroupsController.h"
#import "NSImageAdditions.h"
#import "NSStringAdditions.h" #import "NSStringAdditions.h"
#import "ProgressGradients.h" #import "ProgressGradients.h"
#import "Torrent.h" #import "Torrent.h"
@ -38,8 +39,8 @@
#define NORMAL_BUTTON_WIDTH 14.0 #define NORMAL_BUTTON_WIDTH 14.0
#define ACTION_BUTTON_WIDTH 16.0 #define ACTION_BUTTON_WIDTH 16.0
#define PRIORITY_ICON_WIDTH 14.0 #define PRIORITY_ICON_WIDTH 12.0
#define PRIORITY_ICON_HEIGHT 14.0 #define PRIORITY_ICON_HEIGHT 12.0
//ends up being larger than font height //ends up being larger than font height
#define HEIGHT_TITLE 16.0 #define HEIGHT_TITLE 16.0
@ -49,7 +50,7 @@
#define PADDING_BETWEEN_BUTTONS 3.0 #define PADDING_BETWEEN_BUTTONS 3.0
#define PADDING_BETWEEN_IMAGE_AND_TITLE (PADDING_HORIZONTAL + 1.0) #define PADDING_BETWEEN_IMAGE_AND_TITLE (PADDING_HORIZONTAL + 1.0)
#define PADDING_BETWEEN_IMAGE_AND_BAR PADDING_HORIZONTAL #define PADDING_BETWEEN_IMAGE_AND_BAR PADDING_HORIZONTAL
#define PADDING_BETWEEN_TITLE_AND_PRIORITY 3.0 #define PADDING_BETWEEN_TITLE_AND_PRIORITY 4.0
#define PADDING_ABOVE_TITLE 4.0 #define PADDING_ABOVE_TITLE 4.0
#define PADDING_BETWEEN_TITLE_AND_MIN_STATUS 3.0 #define PADDING_BETWEEN_TITLE_AND_MIN_STATUS 3.0
#define PADDING_BETWEEN_TITLE_AND_PROGRESS 1.0 #define PADDING_BETWEEN_TITLE_AND_PROGRESS 1.0
@ -480,13 +481,12 @@
//priority icon //priority icon
if ([torrent priority] != TR_PRI_NORMAL) if ([torrent priority] != TR_PRI_NORMAL)
{ {
NSImage * priorityImage = [torrent priority] == TR_PRI_HIGH ? [NSImage imageNamed: @"PriorityHigh.png"]
: [NSImage imageNamed: @"PriorityLow.png"];
const NSRect priorityRect = NSMakeRect(NSMaxX(titleRect) + PADDING_BETWEEN_TITLE_AND_PRIORITY, const NSRect priorityRect = NSMakeRect(NSMaxX(titleRect) + PADDING_BETWEEN_TITLE_AND_PRIORITY,
NSMidY(titleRect) - PRIORITY_ICON_HEIGHT * 0.5, NSMidY(titleRect) - PRIORITY_ICON_HEIGHT * 0.5,
PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT); PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT);
NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor];
NSImage * priorityImage = [[NSImage imageNamed: ([torrent priority] == TR_PRI_HIGH ? @"PriorityHighTemplate.png" : @"PriorityLowTemplate.png")] imageWithColor: priorityColor];
[priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil]; [priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0 respectFlipped: YES hints: nil];
} }

View File

@ -150,7 +150,7 @@
<td valign="top"> <td valign="top">
<p>Yes, either upon opening a torrent, or once it has started. When you open a multi-file torrent, a detailed Open window will appear, allowing you to select specific files. <p>Yes, either upon opening a torrent, or once it has started. When you open a multi-file torrent, a detailed Open window will appear, allowing you to select specific files.
<p>For transfers which are already running, double click them to open the Inspector, and then click the 'Files' tab. Simply check the boxes next to the files you want to download (the default is all of them). <p>For transfers which are already running, double click them to open the Inspector, and then click the 'Files' tab. Simply check the boxes next to the files you want to download (the default is all of them).
You can even set a priority (green/high or orange/low) to each file, if you want some to finish faster than others. To do so, use the selector that appears next to the checkboxes. You can even set a priority (high, normal, or low) to each file, if you want some to finish faster than others. To do so, use the selector that appears next to the checkboxes.
<p>If the window doesn't appear when opening a torrent, ensure that "Display options window" is checked in Preferences -> Transfers -> Adding. <p>If the window doesn't appear when opening a torrent, ensure that "Display options window" is checked in Preferences -> Transfers -> Adding.
</td> </td>
</tr> </tr>

View File

@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1060</int> <int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11B26</string> <string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1617</string> <string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138</string> <string key="IBDocument.AppKitVersion">1138.23</string>
<string key="IBDocument.HIToolboxVersion">566.00</string> <string key="IBDocument.HIToolboxVersion">567.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">1617</string> <string key="NS.object.0">1938</string>
</object> </object>
<array key="IBDocument.IntegratedClassDependencies"> <array key="IBDocument.IntegratedClassDependencies">
<string>NSTextField</string> <string>NSTextField</string>
@ -26,7 +26,10 @@
<array key="IBDocument.PluginDependencies"> <array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array> </array>
<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/> <object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="NSCustomObject" id="1001"> <object class="NSCustomObject" id="1001">
<string key="NSClassName">InfoOptionsViewController</string> <string key="NSClassName">InfoOptionsViewController</string>
@ -46,6 +49,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{217, 54}, {45, 20}}</string> <string key="NSFrame">{{217, 54}, {45, 20}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="706967535"/> <reference key="NSNextKeyView" ref="706967535"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="517007757"> <object class="NSTextFieldCell" key="NSCell" id="517007757">
@ -121,6 +125,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{71, 53}, {138, 22}}</string> <string key="NSFrame">{{71, 53}, {138, 22}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="620344525"/> <reference key="NSNextKeyView" ref="620344525"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="669284794"> <object class="NSPopUpButtonCell" key="NSCell" id="669284794">
@ -202,6 +207,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 57}, {56, 14}}</string> <string key="NSFrame">{{10, 57}, {56, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="110760088"/> <reference key="NSNextKeyView" ref="110760088"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="563562657"> <object class="NSTextFieldCell" key="NSCell" id="563562657">
@ -232,6 +238,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{217, 76}, {45, 20}}</string> <string key="NSFrame">{{217, 76}, {45, 20}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="919278636"/> <reference key="NSNextKeyView" ref="919278636"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="156964320"> <object class="NSTextFieldCell" key="NSCell" id="156964320">
@ -287,6 +294,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{9, 95}, {88, 17}}</string> <string key="NSFrame">{{9, 95}, {88, 17}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="457156870"/> <reference key="NSNextKeyView" ref="457156870"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="960257683"> <object class="NSTextFieldCell" key="NSCell" id="960257683">
@ -308,6 +316,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{9, 181}, {117, 14}}</string> <string key="NSFrame">{{9, 181}, {117, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="614569420"/> <reference key="NSNextKeyView" ref="614569420"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="51582947"> <object class="NSTextFieldCell" key="NSCell" id="51582947">
@ -325,6 +334,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{9, 219}, {46, 17}}</string> <string key="NSFrame">{{9, 219}, {46, 17}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="340525598"/> <reference key="NSNextKeyView" ref="340525598"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="235794164"> <object class="NSTextFieldCell" key="NSCell" id="235794164">
@ -342,6 +352,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{125, 137}, {45, 20}}</string> <string key="NSFrame">{{125, 137}, {45, 20}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="531478243"/> <reference key="NSNextKeyView" ref="531478243"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="886515737"> <object class="NSTextFieldCell" key="NSCell" id="886515737">
@ -392,6 +403,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{175, 140}, {29, 14}}</string> <string key="NSFrame">{{175, 140}, {29, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="900455097"/> <reference key="NSNextKeyView" ref="900455097"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="619733085"> <object class="NSTextFieldCell" key="NSCell" id="619733085">
@ -409,6 +421,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{125, 159}, {45, 20}}</string> <string key="NSFrame">{{125, 159}, {45, 20}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1027547097"/> <reference key="NSNextKeyView" ref="1027547097"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="668169900"> <object class="NSTextFieldCell" key="NSCell" id="668169900">
@ -459,6 +472,7 @@
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrame">{{214, 79}, {90, 14}}</string> <string key="NSFrame">{{214, 79}, {90, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="787858145"/> <reference key="NSNextKeyView" ref="787858145"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="635385194"> <object class="NSTextFieldCell" key="NSCell" id="635385194">
@ -479,6 +493,7 @@
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrame">{{214, 57}, {90, 14}}</string> <string key="NSFrame">{{214, 57}, {90, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="317277208"/> <reference key="NSNextKeyView" ref="317277208"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="583484016"> <object class="NSTextFieldCell" key="NSCell" id="583484016">
@ -499,6 +514,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{267, 57}, {47, 14}}</string> <string key="NSFrame">{{267, 57}, {47, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="249386201"/> <reference key="NSNextKeyView" ref="249386201"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="38211108"> <object class="NSTextFieldCell" key="NSCell" id="38211108">
@ -516,6 +532,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{175, 162}, {29, 14}}</string> <string key="NSFrame">{{175, 162}, {29, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="166572511"/> <reference key="NSNextKeyView" ref="166572511"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1042346107"> <object class="NSTextFieldCell" key="NSCell" id="1042346107">
@ -533,6 +550,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{71, 75}, {138, 22}}</string> <string key="NSFrame">{{71, 75}, {138, 22}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="760004836"/> <reference key="NSNextKeyView" ref="760004836"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="931579513"> <object class="NSPopUpButtonCell" key="NSCell" id="931579513">
@ -603,6 +621,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 79}, {35, 14}}</string> <string key="NSFrame">{{10, 79}, {35, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="705594185"/> <reference key="NSNextKeyView" ref="705594185"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1061208496"> <object class="NSTextFieldCell" key="NSCell" id="1061208496">
@ -620,6 +639,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 204}, {95, 14}}</string> <string key="NSFrame">{{10, 204}, {95, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="529271757"/> <reference key="NSNextKeyView" ref="529271757"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="780052505"> <object class="NSTextFieldCell" key="NSCell" id="780052505">
@ -637,6 +657,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{9, 29}, {60, 17}}</string> <string key="NSFrame">{{9, 29}, {60, 17}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="955673008"/> <reference key="NSNextKeyView" ref="955673008"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="982055451"> <object class="NSTextFieldCell" key="NSCell" id="982055451">
@ -654,6 +675,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 13}, {129, 14}}</string> <string key="NSFrame">{{10, 13}, {129, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="300762075"/> <reference key="NSNextKeyView" ref="300762075"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="110767594"> <object class="NSTextFieldCell" key="NSCell" id="110767594">
@ -671,6 +693,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{144, 10}, {45, 20}}</string> <string key="NSFrame">{{144, 10}, {45, 20}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="118542597"/> <reference key="NSNextKeyView" ref="118542597"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1003212074"> <object class="NSTextFieldCell" key="NSCell" id="1003212074">
@ -720,6 +743,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{194, 13}, {34, 14}}</string> <string key="NSFrame">{{194, 13}, {34, 14}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/> <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="276464263"> <object class="NSTextFieldCell" key="NSCell" id="276464263">
@ -737,6 +761,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 138}, {93, 18}}</string> <string key="NSFrame">{{10, 138}, {93, 18}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="38678337"/> <reference key="NSNextKeyView" ref="38678337"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="482789677"> <object class="NSButtonCell" key="NSCell" id="482789677">
@ -765,6 +790,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 118}, {230, 18}}</string> <string key="NSFrame">{{10, 118}, {230, 18}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="275413408"/> <reference key="NSNextKeyView" ref="275413408"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="582573900"> <object class="NSButtonCell" key="NSCell" id="582573900">
@ -788,6 +814,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{10, 160}, {109, 18}}</string> <string key="NSFrame">{{10, 160}, {109, 18}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="520423397"/> <reference key="NSNextKeyView" ref="520423397"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="818727845"> <object class="NSButtonCell" key="NSCell" id="818727845">
@ -811,6 +838,7 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{110, 200}, {98, 22}}</string> <string key="NSFrame">{{110, 200}, {98, 22}}</string>
<reference key="NSSuperview" ref="617828785"/> <reference key="NSSuperview" ref="617828785"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1004759797"/> <reference key="NSNextKeyView" ref="1004759797"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="545585394"> <object class="NSPopUpButtonCell" key="NSCell" id="545585394">
@ -825,23 +853,7 @@
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int> <int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int> <int key="NSPeriodicInterval">75</int>
<object class="NSMenuItem" key="NSMenuItem" id="329620563"> <nil key="NSMenuItem"/>
<reference key="NSMenu" ref="355652245"/>
<string key="NSTitle">Normal</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
<object class="NSCustomResource" key="NSImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">PriorityNormal</string>
</object>
<reference key="NSOnImage" ref="662512792"/>
<reference key="NSMixedImage" ref="999867276"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">1</int>
<reference key="NSTarget" ref="545585394"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool> <bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="355652245"> <object class="NSMenu" key="NSMenu" id="355652245">
<string key="NSTitle">OtherViews</string> <string key="NSTitle">OtherViews</string>
@ -854,14 +866,29 @@
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<object class="NSCustomResource" key="NSImage"> <object class="NSCustomResource" key="NSImage">
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">PriorityHigh</string> <string key="NSResourceName">PriorityHighTemplate</string>
</object> </object>
<reference key="NSOnImage" ref="662512792"/> <reference key="NSOnImage" ref="662512792"/>
<reference key="NSMixedImage" ref="999867276"/> <reference key="NSMixedImage" ref="999867276"/>
<string key="NSAction">_popUpItemAction:</string> <string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="545585394"/> <reference key="NSTarget" ref="545585394"/>
</object> </object>
<reference ref="329620563"/> <object class="NSMenuItem" id="329620563">
<reference key="NSMenu" ref="355652245"/>
<string key="NSTitle">Normal</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<object class="NSCustomResource" key="NSImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">PriorityNormalTemplate</string>
</object>
<reference key="NSOnImage" ref="662512792"/>
<reference key="NSMixedImage" ref="999867276"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">1</int>
<reference key="NSTarget" ref="545585394"/>
</object>
<object class="NSMenuItem" id="434558061"> <object class="NSMenuItem" id="434558061">
<reference key="NSMenu" ref="355652245"/> <reference key="NSMenu" ref="355652245"/>
<string key="NSTitle">Low</string> <string key="NSTitle">Low</string>
@ -870,7 +897,7 @@
<int key="NSMnemonicLoc">2147483647</int> <int key="NSMnemonicLoc">2147483647</int>
<object class="NSCustomResource" key="NSImage"> <object class="NSCustomResource" key="NSImage">
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">PriorityLow</string> <string key="NSResourceName">PriorityLowTemplate</string>
</object> </object>
<reference key="NSOnImage" ref="662512792"/> <reference key="NSOnImage" ref="662512792"/>
<reference key="NSMixedImage" ref="999867276"/> <reference key="NSMixedImage" ref="999867276"/>
@ -880,7 +907,7 @@
</object> </object>
</array> </array>
</object> </object>
<int key="NSSelectedIndex">1</int> <int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">1</int> <int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool> <bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool> <bool key="NSAltersState">YES</bool>
@ -890,6 +917,7 @@
</array> </array>
<string key="NSFrameSize">{321, 241}</string> <string key="NSFrameSize">{321, 241}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="234468111"/> <reference key="NSNextKeyView" ref="234468111"/>
<object class="NSMutableString" key="NSClassName"> <object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters> <characters key="NS.bytes">NSView</characters>
@ -899,38 +927,6 @@
</array> </array>
<object class="IBObjectContainer" key="IBDocument.Objects"> <object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords"> <array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="520423397"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">53</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="38678337"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">54</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="787858145"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">55</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="300762075"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">56</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">setPriority:</string> <string key="label">setPriority:</string>
@ -1107,14 +1103,6 @@
</object> </object>
<int key="connectionID">78</int> <int key="connectionID">78</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="317277208"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">90</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">fIdleLimitField</string> <string key="label">fIdleLimitField</string>
@ -1171,6 +1159,46 @@
</object> </object>
<int key="connectionID">112</int> <int key="connectionID">112</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="787858145"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">55</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="300762075"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">56</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="520423397"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">53</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="38678337"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">54</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="317277208"/>
<reference key="destination" ref="1001"/>
</object>
<int key="connectionID">90</int>
</object>
</array> </array>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects"> <array key="orderedObjects">
@ -1770,7 +1798,115 @@
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">112</int> <int key="maxID">112</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"/> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">ColorTextField</string>
<string key="superclassName">NSTextField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ColorTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">InfoOptionsViewController</string>
<string key="superclassName">NSViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="fDownloadLimitCheck">NSButton</string>
<string key="fDownloadLimitField">NSTextField</string>
<string key="fDownloadLimitLabel">NSTextField</string>
<string key="fGlobalLimitCheck">NSButton</string>
<string key="fIdleLimitField">NSTextField</string>
<string key="fIdleLimitGlobalLabel">NSTextField</string>
<string key="fIdleLimitLabel">NSTextField</string>
<string key="fIdlePopUp">NSPopUpButton</string>
<string key="fPeersConnectField">NSTextField</string>
<string key="fPeersConnectLabel">NSTextField</string>
<string key="fPriorityPopUp">NSPopUpButton</string>
<string key="fRatioLimitField">NSTextField</string>
<string key="fRatioLimitGlobalLabel">NSTextField</string>
<string key="fRatioPopUp">NSPopUpButton</string>
<string key="fUploadLimitCheck">NSButton</string>
<string key="fUploadLimitField">NSTextField</string>
<string key="fUploadLimitLabel">NSTextField</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="fDownloadLimitCheck">
<string key="name">fDownloadLimitCheck</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="fDownloadLimitField">
<string key="name">fDownloadLimitField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fDownloadLimitLabel">
<string key="name">fDownloadLimitLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fGlobalLimitCheck">
<string key="name">fGlobalLimitCheck</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="fIdleLimitField">
<string key="name">fIdleLimitField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fIdleLimitGlobalLabel">
<string key="name">fIdleLimitGlobalLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fIdleLimitLabel">
<string key="name">fIdleLimitLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fIdlePopUp">
<string key="name">fIdlePopUp</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="fPeersConnectField">
<string key="name">fPeersConnectField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fPeersConnectLabel">
<string key="name">fPeersConnectLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fPriorityPopUp">
<string key="name">fPriorityPopUp</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="fRatioLimitField">
<string key="name">fRatioLimitField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fRatioLimitGlobalLabel">
<string key="name">fRatioLimitGlobalLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fRatioPopUp">
<string key="name">fRatioPopUp</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="fUploadLimitCheck">
<string key="name">fUploadLimitCheck</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="fUploadLimitField">
<string key="name">fUploadLimitField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="fUploadLimitLabel">
<string key="name">fUploadLimitLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/InfoOptionsViewController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
@ -1779,7 +1915,7 @@
</object> </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/> <real value="1070" key="NS.object.0"/>
</object> </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
@ -1787,9 +1923,9 @@
<string key="NSMenuCheckmark">{9, 8}</string> <string key="NSMenuCheckmark">{9, 8}</string>
<string key="NSMenuMixedState">{7, 2}</string> <string key="NSMenuMixedState">{7, 2}</string>
<string key="NSSwitch">{15, 15}</string> <string key="NSSwitch">{15, 15}</string>
<string key="PriorityHigh">{14, 14}</string> <string key="PriorityHighTemplate">{128, 128}</string>
<string key="PriorityLow">{14, 14}</string> <string key="PriorityLowTemplate">{128, 128}</string>
<string key="PriorityNormal">{14, 14}</string> <string key="PriorityNormalTemplate">{128, 128}</string>
</dictionary> </dictionary>
</data> </data>
</archive> </archive>