diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index d14c89654..68c20ec36 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -105,10 +105,9 @@ A209ECA2114319C3002B02D1 /* InfoWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A209ECA1114319C3002B02D1 /* InfoWindow.xib */; }; A209EE5C1144B51E002B02D1 /* history.c in Sources */ = {isa = PBXBuildFile; fileRef = A209EE5A1144B51E002B02D1 /* history.c */; }; A209EE5D1144B51E002B02D1 /* history.h in Headers */ = {isa = PBXBuildFile; fileRef = A209EE5B1144B51E002B02D1 /* history.h */; }; - A20B6F6B0C4D842B0034AB1D /* PriorityLow.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */; }; - A20B6F830C4D8A610034AB1D /* PriorityHigh.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F820C4D8A610034AB1D /* PriorityHigh.png */; }; - A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FA40C4D97840034AB1D /* PriorityNone.png */; }; - A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */; }; + A20B6F6B0C4D842B0034AB1D /* PriorityLowTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F6A0C4D842B0034AB1D /* PriorityLowTemplate.png */; }; + A20B6F830C4D8A610034AB1D /* PriorityHighTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6F820C4D8A610034AB1D /* PriorityHighTemplate.png */; }; + A20B6FAE0C4D9B040034AB1D /* PriorityNormalTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A20B6FAD0C4D9B040034AB1D /* PriorityNormalTemplate.png */; }; A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */; }; A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; }; 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 */; }; A233BD330D8C6585007EE7B4 /* MessageWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD320D8C6585007EE7B4 /* MessageWindow.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 */; }; A23547E311CD0B090046EAE6 /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = A23547E111CD0B090046EAE6 /* cache.h */; }; 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 = ""; }; A209EE5A1144B51E002B02D1 /* history.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = history.c; path = libtransmission/history.c; sourceTree = ""; }; A209EE5B1144B51E002B02D1 /* history.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = history.h; path = libtransmission/history.h; sourceTree = ""; }; - A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityLow.png; path = macosx/Images/PriorityLow.png; sourceTree = ""; }; - A20B6F820C4D8A610034AB1D /* PriorityHigh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityHigh.png; path = macosx/Images/PriorityHigh.png; sourceTree = ""; }; - A20B6FA40C4D97840034AB1D /* PriorityNone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNone.png; path = macosx/Images/PriorityNone.png; sourceTree = ""; }; - A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNormal.png; path = macosx/Images/PriorityNormal.png; sourceTree = ""; }; + A20B6F6A0C4D842B0034AB1D /* PriorityLowTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityLowTemplate.png; path = macosx/Images/PriorityLowTemplate.png; sourceTree = ""; }; + A20B6F820C4D8A610034AB1D /* PriorityHighTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityHighTemplate.png; path = macosx/Images/PriorityHighTemplate.png; sourceTree = ""; }; + A20B6FAD0C4D9B040034AB1D /* PriorityNormalTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PriorityNormalTemplate.png; path = macosx/Images/PriorityNormalTemplate.png; sourceTree = ""; }; A20BFFB50D091CC700CE5D2B /* ToolbarSegmentedCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolbarSegmentedCell.h; path = macosx/ToolbarSegmentedCell.h; sourceTree = ""; }; A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolbarSegmentedCell.m; path = macosx/ToolbarSegmentedCell.m; sourceTree = ""; }; A21282A50CA6C66800EAEE0F /* StatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StatusBarView.h; path = macosx/StatusBarView.h; sourceTree = ""; }; @@ -659,6 +658,8 @@ A232F07D0EEA034A00041646 /* BonjourController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BonjourController.m; path = macosx/BonjourController.m; sourceTree = ""; }; A233BD320D8C6585007EE7B4 /* MessageWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MessageWindow.xib; path = macosx/MessageWindow.xib; sourceTree = ""; }; A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = StatsWindow.xib; path = macosx/StatsWindow.xib; sourceTree = ""; }; + A234EA521453563B000F3E97 /* NSImageAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSImageAdditions.h; path = macosx/NSImageAdditions.h; sourceTree = ""; }; + A234EA531453563B000F3E97 /* NSImageAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSImageAdditions.m; path = macosx/NSImageAdditions.m; sourceTree = ""; }; A23547E011CD0B090046EAE6 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cache.c; path = libtransmission/cache.c; sourceTree = ""; }; A23547E111CD0B090046EAE6 /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache.h; path = libtransmission/cache.h; sourceTree = ""; }; A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayWindow.m; path = macosx/DragOverlayWindow.m; sourceTree = ""; }; @@ -1252,10 +1253,9 @@ A209EBD81142F52B002B02D1 /* InfoFileView.xib */, A209EC11114301C6002B02D1 /* InfoOptionsView.xib */, A220AF7913D7CC460035C512 /* GlobalOptionsPopover.xib */, - A20B6FA40C4D97840034AB1D /* PriorityNone.png */, - A20B6FAD0C4D9B040034AB1D /* PriorityNormal.png */, - A20B6F6A0C4D842B0034AB1D /* PriorityLow.png */, - A20B6F820C4D8A610034AB1D /* PriorityHigh.png */, + A20B6FAD0C4D9B040034AB1D /* PriorityNormalTemplate.png */, + A20B6F6A0C4D842B0034AB1D /* PriorityLowTemplate.png */, + A20B6F820C4D8A610034AB1D /* PriorityHighTemplate.png */, A2623B2C0D3DC2EF0045D19A /* PriorityControlNormal.png */, A2623B2D0D3DC2EF0045D19A /* PriorityControlLow.png */, A2623B2E0D3DC2EF0045D19A /* PriorityControlHigh.png */, @@ -1504,6 +1504,8 @@ A29D84031049C25600D1987A /* NSApplicationAdditions.m */, A22BAE261388040500FB022F /* NSMutableArrayAdditions.h */, A22BAE271388040500FB022F /* NSMutableArrayAdditions.m */, + A234EA521453563B000F3E97 /* NSImageAdditions.h */, + A234EA531453563B000F3E97 /* NSImageAdditions.m */, ); name = Additions; sourceTree = ""; @@ -2084,10 +2086,9 @@ A241528B0C0261B8007DD3B4 /* Globe.png in Resources */, A2E9AA760C249AF400085DCF /* ToolbarCreateTemplate.png in Resources */, A2F011990C27418800576FC0 /* CreateLarge.png in Resources */, - A20B6F6B0C4D842B0034AB1D /* PriorityLow.png in Resources */, - A20B6F830C4D8A610034AB1D /* PriorityHigh.png in Resources */, - A20B6FA50C4D97840034AB1D /* PriorityNone.png in Resources */, - A20B6FAE0C4D9B040034AB1D /* PriorityNormal.png in Resources */, + A20B6F6B0C4D842B0034AB1D /* PriorityLowTemplate.png in Resources */, + A20B6F830C4D8A610034AB1D /* PriorityHighTemplate.png in Resources */, + A20B6FAE0C4D9B040034AB1D /* PriorityNormalTemplate.png in Resources */, A277DA0B0C693D9C00DA2CD4 /* ActionOn.png in Resources */, A2EF7DEC0C96297400FA9811 /* PurpleDot.png in Resources */, A2BC19850CA9AF5A00DD302A /* CompleteCheck.png in Resources */, @@ -2345,6 +2346,7 @@ A2E57BA713109E6B00A7DAB1 /* FilterBarController.m in Sources */, A22BAE281388040500FB022F /* NSMutableArrayAdditions.m in Sources */, A2966E8713DAF74C007B52DF /* GlobalOptionsPopoverViewController.m in Sources */, + A234EA541453563B000F3E97 /* NSImageAdditions.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m index 018c61e19..d690adadc 100644 --- a/macosx/FileOutlineController.m +++ b/macosx/FileOutlineController.m @@ -604,7 +604,7 @@ typedef enum action: @selector(setPriority:) keyEquivalent: @""]; [item setTarget: self]; [item setTag: FILE_PRIORITY_HIGH_TAG]; - [item setImage: [NSImage imageNamed: @"PriorityHigh.png"]]; + [item setImage: [NSImage imageNamed: @"PriorityHighTemplate.png"]]; [priorityMenu addItem: item]; [item release]; @@ -612,7 +612,7 @@ typedef enum action: @selector(setPriority:) keyEquivalent: @""]; [item setTarget: self]; [item setTag: FILE_PRIORITY_NORMAL_TAG]; - [item setImage: [NSImage imageNamed: @"PriorityNormal.png"]]; + [item setImage: [NSImage imageNamed: @"PriorityNormalTemplate.png"]]; [priorityMenu addItem: item]; [item release]; @@ -620,7 +620,7 @@ typedef enum action: @selector(setPriority:) keyEquivalent: @""]; [item setTarget: self]; [item setTag: FILE_PRIORITY_LOW_TAG]; - [item setImage: [NSImage imageNamed: @"PriorityLow.png"]]; + [item setImage: [NSImage imageNamed: @"PriorityLowTemplate.png"]]; [priorityMenu addItem: item]; [item release]; diff --git a/macosx/FilePriorityCell.m b/macosx/FilePriorityCell.m index 33a9f6e23..4f199f754 100644 --- a/macosx/FilePriorityCell.m +++ b/macosx/FilePriorityCell.m @@ -25,6 +25,7 @@ #import "FilePriorityCell.h" #import "FileOutlineView.h" #import "FileListNode.h" +#import "NSImageAdditions.h" #import "Torrent.h" #define IMAGE_OVERLAP 3.0 @@ -130,28 +131,33 @@ if (count == 0) { - NSImage * image = [NSImage imageNamed: @"PriorityNone.png"]; - [images addObject: image]; - totalWidth = [image size].width; + //if ([self backgroundStyle] != NSBackgroundStyleDark) + { + NSImage * image = [[NSImage imageNamed: @"PriorityNormalTemplate.png"] imageWithColor: [NSColor lightGrayColor]]; + [images addObject: image]; + totalWidth = [image size].width; + } } else { + NSColor * priorityColor = [self backgroundStyle] == NSBackgroundStyleDark ? [NSColor whiteColor] : [NSColor darkGrayColor]; + totalWidth = 0.0; 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]; totalWidth += [image size].width; } 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]; totalWidth += [image size].width; } 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]; totalWidth += [image size].width; } diff --git a/macosx/Images/PriorityHigh.png b/macosx/Images/PriorityHigh.png deleted file mode 100644 index c10f72dd3..000000000 Binary files a/macosx/Images/PriorityHigh.png and /dev/null differ diff --git a/macosx/Images/PriorityHighTemplate.png b/macosx/Images/PriorityHighTemplate.png new file mode 100644 index 000000000..dc490b8fc Binary files /dev/null and b/macosx/Images/PriorityHighTemplate.png differ diff --git a/macosx/Images/PriorityLow.png b/macosx/Images/PriorityLow.png deleted file mode 100644 index ddf619d05..000000000 Binary files a/macosx/Images/PriorityLow.png and /dev/null differ diff --git a/macosx/Images/PriorityLowTemplate.png b/macosx/Images/PriorityLowTemplate.png new file mode 100644 index 000000000..c8cc936bb Binary files /dev/null and b/macosx/Images/PriorityLowTemplate.png differ diff --git a/macosx/Images/PriorityNone.png b/macosx/Images/PriorityNone.png deleted file mode 100644 index e63832e3f..000000000 Binary files a/macosx/Images/PriorityNone.png and /dev/null differ diff --git a/macosx/Images/PriorityNormal.png b/macosx/Images/PriorityNormal.png deleted file mode 100644 index a138e518c..000000000 Binary files a/macosx/Images/PriorityNormal.png and /dev/null differ diff --git a/macosx/Images/PriorityNormalTemplate.png b/macosx/Images/PriorityNormalTemplate.png new file mode 100644 index 000000000..cb01551c1 Binary files /dev/null and b/macosx/Images/PriorityNormalTemplate.png differ diff --git a/macosx/Makefile.am b/macosx/Makefile.am index 92788567b..8afe7416f 100644 --- a/macosx/Makefile.am +++ b/macosx/Makefile.am @@ -114,6 +114,8 @@ EXTRA_DIST = \ MessageWindowController.m \ NSApplicationAdditions.h \ NSApplicationAdditions.m \ + NSImageAdditions.h \ + NSImageAdditions.m \ NSMutableArrayAdditions.h \ NSMutableArrayAdditions.m \ NSStringAdditions.h \ diff --git a/macosx/NSImageAdditions.h b/macosx/NSImageAdditions.h new file mode 100644 index 000000000..67a5177c4 --- /dev/null +++ b/macosx/NSImageAdditions.h @@ -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 + +@interface NSImage (NSImageAdditions) + +- (NSImage *) imageWithColor: (NSColor *) color; + +@end diff --git a/macosx/NSImageAdditions.m b/macosx/NSImageAdditions.m new file mode 100644 index 000000000..b9954e9f3 --- /dev/null +++ b/macosx/NSImageAdditions.m @@ -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 diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m index 56b5e951d..7c787813b 100644 --- a/macosx/TorrentCell.m +++ b/macosx/TorrentCell.m @@ -24,6 +24,7 @@ #import "TorrentCell.h" #import "GroupsController.h" +#import "NSImageAdditions.h" #import "NSStringAdditions.h" #import "ProgressGradients.h" #import "Torrent.h" @@ -38,8 +39,8 @@ #define NORMAL_BUTTON_WIDTH 14.0 #define ACTION_BUTTON_WIDTH 16.0 -#define PRIORITY_ICON_WIDTH 14.0 -#define PRIORITY_ICON_HEIGHT 14.0 +#define PRIORITY_ICON_WIDTH 12.0 +#define PRIORITY_ICON_HEIGHT 12.0 //ends up being larger than font height #define HEIGHT_TITLE 16.0 @@ -49,7 +50,7 @@ #define PADDING_BETWEEN_BUTTONS 3.0 #define PADDING_BETWEEN_IMAGE_AND_TITLE (PADDING_HORIZONTAL + 1.0) #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_BETWEEN_TITLE_AND_MIN_STATUS 3.0 #define PADDING_BETWEEN_TITLE_AND_PROGRESS 1.0 @@ -480,13 +481,12 @@ //priority icon 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, NSMidY(titleRect) - PRIORITY_ICON_HEIGHT * 0.5, 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]; } diff --git a/macosx/TransmissionHelp/TransmissionHelp.helpindex b/macosx/TransmissionHelp/TransmissionHelp.helpindex index b6c113e7a..170c4f1f9 100644 Binary files a/macosx/TransmissionHelp/TransmissionHelp.helpindex and b/macosx/TransmissionHelp/TransmissionHelp.helpindex differ diff --git a/macosx/TransmissionHelp/html/gettingstarted.html b/macosx/TransmissionHelp/html/gettingstarted.html index ae0260ff6..3cc1a07dc 100644 --- a/macosx/TransmissionHelp/html/gettingstarted.html +++ b/macosx/TransmissionHelp/html/gettingstarted.html @@ -150,7 +150,7 @@

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.

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.

If the window doesn't appear when opening a torrent, ensure that "Display options window" is checked in Preferences -> Transfers -> Adding. diff --git a/macosx/en.lproj/InfoOptionsView.xib b/macosx/en.lproj/InfoOptionsView.xib index f834ce15b..8b1d0cfde 100644 --- a/macosx/en.lproj/InfoOptionsView.xib +++ b/macosx/en.lproj/InfoOptionsView.xib @@ -2,13 +2,13 @@ 1060 - 11B26 - 1617 - 1138 - 566.00 + 11C74 + 1938 + 1138.23 + 567.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 1938 NSTextField @@ -26,7 +26,10 @@ com.apple.InterfaceBuilder.CocoaPlugin - + + PluginDependencyRecalculationVersion + + InfoOptionsViewController @@ -46,6 +49,7 @@ 268 {{217, 54}, {45, 20}} + YES @@ -121,6 +125,7 @@ 268 {{71, 53}, {138, 22}} + YES @@ -202,6 +207,7 @@ 268 {{10, 57}, {56, 14}} + YES @@ -232,6 +238,7 @@ 268 {{217, 76}, {45, 20}} + YES @@ -287,6 +294,7 @@ 268 {{9, 95}, {88, 17}} + YES @@ -308,6 +316,7 @@ 268 {{9, 181}, {117, 14}} + YES @@ -325,6 +334,7 @@ 268 {{9, 219}, {46, 17}} + YES @@ -342,6 +352,7 @@ 268 {{125, 137}, {45, 20}} + YES @@ -392,6 +403,7 @@ 268 {{175, 140}, {29, 14}} + YES @@ -409,6 +421,7 @@ 268 {{125, 159}, {45, 20}} + YES @@ -459,6 +472,7 @@ 266 {{214, 79}, {90, 14}} + YES @@ -479,6 +493,7 @@ 266 {{214, 57}, {90, 14}} + YES @@ -499,6 +514,7 @@ 268 {{267, 57}, {47, 14}} + YES @@ -516,6 +532,7 @@ 268 {{175, 162}, {29, 14}} + YES @@ -533,6 +550,7 @@ 268 {{71, 75}, {138, 22}} + YES @@ -603,6 +621,7 @@ 268 {{10, 79}, {35, 14}} + YES @@ -620,6 +639,7 @@ 268 {{10, 204}, {95, 14}} + YES @@ -637,6 +657,7 @@ 268 {{9, 29}, {60, 17}} + YES @@ -654,6 +675,7 @@ 268 {{10, 13}, {129, 14}} + YES @@ -671,6 +693,7 @@ 268 {{144, 10}, {45, 20}} + YES @@ -720,6 +743,7 @@ 268 {{194, 13}, {34, 14}} + YES @@ -737,6 +761,7 @@ 268 {{10, 138}, {93, 18}} + YES @@ -765,6 +790,7 @@ 268 {{10, 118}, {230, 18}} + YES @@ -788,6 +814,7 @@ 268 {{10, 160}, {109, 18}} + YES @@ -811,6 +838,7 @@ 268 {{110, 200}, {98, 22}} + YES @@ -825,23 +853,7 @@ 400 75 - - - Normal - - 1048576 - 2147483647 - 1 - - NSImage - PriorityNormal - - - - _popUpItemAction: - 1 - - + YES OtherViews @@ -854,14 +866,29 @@ 2147483647 NSImage - PriorityHigh + PriorityHighTemplate _popUpItemAction: - + + + Normal + + 1048576 + 2147483647 + + NSImage + PriorityNormalTemplate + + + + _popUpItemAction: + 1 + + Low @@ -870,7 +897,7 @@ 2147483647 NSImage - PriorityLow + PriorityLowTemplate @@ -880,7 +907,7 @@ - 1 + -1 1 YES YES @@ -890,6 +917,7 @@ {321, 241} + NSView @@ -899,38 +927,6 @@ - - - delegate - - - - 53 - - - - delegate - - - - 54 - - - - delegate - - - - 55 - - - - delegate - - - - 56 - setPriority: @@ -1107,14 +1103,6 @@ 78 - - - delegate - - - - 90 - fIdleLimitField @@ -1171,6 +1159,46 @@ 112 + + + delegate + + + + 55 + + + + delegate + + + + 56 + + + + delegate + + + + 53 + + + + delegate + + + + 54 + + + + delegate + + + + 90 + @@ -1770,7 +1798,115 @@ 112 - + + + + ColorTextField + NSTextField + + IBProjectSource + ./Classes/ColorTextField.h + + + + InfoOptionsViewController + NSViewController + + NSButton + NSTextField + NSTextField + NSButton + NSTextField + NSTextField + NSTextField + NSPopUpButton + NSTextField + NSTextField + NSPopUpButton + NSTextField + NSTextField + NSPopUpButton + NSButton + NSTextField + NSTextField + + + + fDownloadLimitCheck + NSButton + + + fDownloadLimitField + NSTextField + + + fDownloadLimitLabel + NSTextField + + + fGlobalLimitCheck + NSButton + + + fIdleLimitField + NSTextField + + + fIdleLimitGlobalLabel + NSTextField + + + fIdleLimitLabel + NSTextField + + + fIdlePopUp + NSPopUpButton + + + fPeersConnectField + NSTextField + + + fPeersConnectLabel + NSTextField + + + fPriorityPopUp + NSPopUpButton + + + fRatioLimitField + NSTextField + + + fRatioLimitGlobalLabel + NSTextField + + + fRatioPopUp + NSPopUpButton + + + fUploadLimitCheck + NSButton + + + fUploadLimitField + NSTextField + + + fUploadLimitLabel + NSTextField + + + + IBProjectSource + ./Classes/InfoOptionsViewController.h + + + + 0 IBCocoaFramework @@ -1779,7 +1915,7 @@ com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3 @@ -1787,9 +1923,9 @@ {9, 8} {7, 2} {15, 15} - {14, 14} - {14, 14} - {14, 14} + {128, 128} + {128, 128} + {128, 128}