Changeset 7508

Timestamp:

Dec 26, 2008, 5:57:51 AM (13 years ago)

Author:

livings124

Message:

so long Tiger support

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (32 diffs)
• macosx/ActionPopUpButton.h (deleted)
• macosx/ActionPopUpButton.m (deleted)
• macosx/AddWindowController.m (modified) (3 diffs)
• macosx/Badger.h (modified) (1 diff)
• macosx/Badger.m (modified) (7 diffs)
• macosx/BlocklistDownloader.m (modified) (3 diffs)
• macosx/BlocklistScheduler.m (modified) (2 diffs)
• macosx/Controller.h (modified) (3 diffs)
• macosx/Controller.m (modified) (14 diffs)
• macosx/CreatorWindowController.m (modified) (4 diffs)
• macosx/DragOverlayView.m (modified) (2 diffs)
• macosx/FileOutlineController.m (modified) (2 diffs)
• macosx/FileOutlineView.h (modified) (2 diffs)
• macosx/FileOutlineView.m (modified) (4 diffs)
• macosx/GroupsController.m (modified) (4 diffs)
• macosx/GroupsPrefsController.h (modified) (1 diff)
• macosx/GroupsPrefsController.m (modified) (2 diffs)
• macosx/Images/ActionGear.png (deleted)
• macosx/Images/Badge.png (deleted)
• macosx/Images/Network.png (deleted)
• macosx/Images/Peers.png (deleted)
• macosx/Images/Preferences.png (deleted)
• macosx/InfoWindowController.m (modified) (4 diffs)
• macosx/MenuLabel.h (deleted)
• macosx/MenuLabel.m (deleted)
• macosx/MessageWindowController.m (modified) (2 diffs)
• macosx/NSApplicationAdditions.h (deleted)
• macosx/NSApplicationAdditions.m (deleted)
• macosx/NSBezierPathAdditions.h (deleted)
• macosx/NSBezierPathAdditions.m (deleted)
• macosx/NSStringAdditions.m (modified) (3 diffs)
• macosx/PiecesView.m (modified) (2 diffs)
• macosx/PortChecker.m (modified) (2 diffs)
• macosx/PrefsController.m (modified) (7 diffs)
• macosx/ProgressGradients.h (modified) (1 diff)
• macosx/ProgressGradients.m (modified) (10 diffs)
• macosx/QuickLookController.m (modified) (1 diff)
• macosx/StatsWindowController.m (modified) (3 diffs)
• macosx/Torrent.m (modified) (5 diffs)
• macosx/TorrentCell.m (modified) (11 diffs)
• macosx/TorrentTableView.m (modified) (9 diffs)
• macosx/TransmissionHelp/TransmissionHelp.helpindex (modified) (previous)
• macosx/TransmissionHelp/html/pffirewall.html (modified) (1 diff)
• macosx/en.lproj/MainMenu.xib (modified) (32 diffs)
• macosx/en.lproj/PrefsWindow.xib (modified) (17 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -45 +45 @@
                 4D6DAAC6090CE00500F43C22 /* RevealOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D6DAAC4090CE00500F43C22 /* RevealOff.png */; };
                 4D6DAAC7090CE00500F43C22 /* RevealOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D6DAAC5090CE00500F43C22 /* RevealOn.png */; };
-                4D752E930913C949008EAAD4 /* Preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D752E920913C949008EAAD4 /* Preferences.png */; };
                 4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
                 4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; };
@@ -59 +58 @@
                 4DE5CC9D0980656F00BE280E /* NSStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DE5CC9C0980656F00BE280E /* NSStringAdditions.m */; };
                 4DE5CCA70980735700BE280E /* Badger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DE5CCA60980735700BE280E /* Badger.m */; };
-                4DE5CCA90980739100BE280E /* Badge.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCA80980739100BE280E /* Badge.png */; };
                 4DE5CCBA0981D27700BE280E /* ResumeAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCB80981D27700BE280E /* ResumeAll.png */; };
                 4DE5CCBB0981D27700BE280E /* PauseAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DE5CCB90981D27700BE280E /* PauseAll.png */; };
@@ -83 +81 @@
                 A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A20BFFB60D091CC700CE5D2B /* ToolbarSegmentedCell.m */; };
                 A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = A21282A60CA6C66800EAEE0F /* StatusBarView.m */; };
-                A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */; };
                 A215BF5C0F02EBB800350CDB /* GroupRules.xib in Resources */ = {isa = PBXBuildFile; fileRef = A215BF5B0F02EBB800350CDB /* GroupRules.xib */; };
                 A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A219798A0D07B78400438EA7 /* GroupToolbarItem.m */; };
@@ -92 +89 @@
                 A222E9870E6B21D9009FB003 /* BlocklistDownloaderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A222E9860E6B21D9009FB003 /* BlocklistDownloaderViewController.m */; };
                 A222EA7B0E6C32C4009FB003 /* BlocklistScheduler.m in Sources */ = {isa = PBXBuildFile; fileRef = A222EA7A0E6C32C4009FB003 /* BlocklistScheduler.m */; };
-                A224D2640DAAC55F000954EA /* Peers.png in Resources */ = {isa = PBXBuildFile; fileRef = A224D2630DAAC55F000954EA /* Peers.png */; };
                 A2265F420B5EF5F40093DDA5 /* FileNameCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A2265F400B5EF5F40093DDA5 /* FileNameCell.m */; };
                 A226FDAC0D0CDF20005A7F71 /* libnatpmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C7A118D0D0B2EB800B5701F /* libnatpmp.a */; };
@@ -108 +104 @@
                 A233BD690D8CF2C7007EE7B4 /* StatsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */; };
                 A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */; };
-                A2399CCD0CD3852300225B2B /* NSApplicationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */; };
                 A23F4FF20D1D98AD002FCB97 /* PrefsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A23F4FF00D1D98AD002FCB97 /* PrefsWindow.xib */; };
                 A23F50020D1D99D7002FCB97 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = A23F50000D1D99D7002FCB97 /* MainMenu.xib */; };
@@ -125 +120 @@
                 A25892640CF1F7E800CCCDDF /* StatsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A25892630CF1F7E800CCCDDF /* StatsWindowController.m */; };
                 A259317E0A73B2CC002F4FE7 /* TransmissionHelp in Resources */ = {isa = PBXBuildFile; fileRef = A259316A0A73B2CC002F4FE7 /* TransmissionHelp */; };
-                A25AFDE90D1038AD0092A1BA /* MenuLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = A25AFDE80D1038AD0092A1BA /* MenuLabel.m */; };
                 A25D2CBD0CF4C73E0096A262 /* stats.c in Sources */ = {isa = PBXBuildFile; fileRef = A25D2CBB0CF4C7190096A262 /* stats.c */; };
                 A25D2CBE0CF4C73E0096A262 /* stats.h in Headers */ = {isa = PBXBuildFile; fileRef = A25D2CBA0CF4C7190096A262 /* stats.h */; };
@@ -147 +141 @@
                 A2623B420D3DC5930045D19A /* PauseHover.png in Resources */ = {isa = PBXBuildFile; fileRef = A2623B3E0D3DC5930045D19A /* PauseHover.png */; };
                 A2623B4E0D3DC6DF0045D19A /* ActionHover.png in Resources */ = {isa = PBXBuildFile; fileRef = A2623B4D0D3DC6DF0045D19A /* ActionHover.png */; };
-                A26397550D0F714300D36DF2 /* ActionPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A26397540D0F714300D36DF2 /* ActionPopUpButton.m */; };
                 A26AF21A0D2DA35A00FF7140 /* FileOutlineController.m in Sources */ = {isa = PBXBuildFile; fileRef = A26AF2190D2DA35A00FF7140 /* FileOutlineController.m */; };
                 A26AF27E0D2DBDDF00FF7140 /* AddWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A26AF27C0D2DBDDF00FF7140 /* AddWindow.xib */; };
@@ -172 +165 @@
                 A29DF8BD0DB2545A00D04E5A /* ggets.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D307920D9EC4800051FD27 /* ggets.h */; };
                 A29DF8BE0DB2545F00D04E5A /* verify.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D22A110D65EED100007D5F /* verify.h */; };
-                A29E04B50DA8764100705643 /* Network.png in Resources */ = {isa = PBXBuildFile; fileRef = A29E04B40DA8764100705643 /* Network.png */; };
                 A29EBE710DC06068006CEE80 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A29EBE700DC06068006CEE80 /* libcurl.dylib */; };
                 A2A1CB7A0BF29D5500AE959F /* PeerProgressIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1CB780BF29D5500AE959F /* PeerProgressIndicatorCell.m */; };
@@ -230 +222 @@
                 A2F151260CD438DE001F3B0E /* InfoTabBackBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */; };
                 A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
-                A2F41DA90D0B9152006CE378 /* ActionGear.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F41DA80D0B9152006CE378 /* ActionGear.png */; };
                 A2F41DAB0D0B916B006CE378 /* YingYangTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */; };
                 A2F41DBC0D0B96C0006CE378 /* FilterBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F41DBA0D0B96C0006CE378 /* FilterBlue.png */; };
@@ -308 +299 @@
                 D4AF3B2F0C41F7A500D46B6B /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = D4AF3B2D0C41F7A500D46B6B /* list.c */; };
                 D4AF3B300C41F7A600D46B6B /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = D4AF3B2E0C41F7A500D46B6B /* list.h */; };
-                E138A9770C04D88F00C5426C /* CTGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = E138A9740C04D88F00C5426C /* CTGradient.m */; };
                 E138A9780C04D88F00C5426C /* ProgressGradients.m in Sources */ = {isa = PBXBuildFile; fileRef = E138A9760C04D88F00C5426C /* ProgressGradients.m */; };
 /* End PBXBuildFile section */
@@ -423 +413 @@
                 4D6DAAC4090CE00500F43C22 /* RevealOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealOff.png; path = macosx/Images/RevealOff.png; sourceTree = "<group>"; };
                 4D6DAAC5090CE00500F43C22 /* RevealOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RevealOn.png; path = macosx/Images/RevealOn.png; sourceTree = "<group>"; };
-                4D752E920913C949008EAAD4 /* Preferences.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Preferences.png; path = macosx/Images/Preferences.png; sourceTree = "<group>"; };
                 4DA6FDB80911233800450CB1 /* PauseOn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseOn.png; path = macosx/Images/PauseOn.png; sourceTree = "<group>"; };
                 4DA6FDB90911233800450CB1 /* PauseOff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseOff.png; path = macosx/Images/PauseOff.png; sourceTree = "<group>"; };
@@ -439 +428 @@
                 4DE5CCA50980735700BE280E /* Badger.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Badger.h; path = macosx/Badger.h; sourceTree = "<group>"; };
                 4DE5CCA60980735700BE280E /* Badger.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = Badger.m; path = macosx/Badger.m; sourceTree = "<group>"; };
-                4DE5CCA80980739100BE280E /* Badge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Badge.png; path = macosx/Images/Badge.png; sourceTree = "<group>"; };
                 4DE5CCB80981D27700BE280E /* ResumeAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeAll.png; path = macosx/Images/ResumeAll.png; sourceTree = "<group>"; };
                 4DE5CCB90981D27700BE280E /* PauseAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseAll.png; path = macosx/Images/PauseAll.png; sourceTree = "<group>"; };
@@ -475 +463 @@
                 A21282A50CA6C66800EAEE0F /* StatusBarView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StatusBarView.h; path = macosx/StatusBarView.h; sourceTree = "<group>"; };
                 A21282A60CA6C66800EAEE0F /* StatusBarView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = StatusBarView.m; path = macosx/StatusBarView.m; sourceTree = "<group>"; };
-                A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSBezierPathAdditions.m; path = macosx/NSBezierPathAdditions.m; sourceTree = "<group>"; };
-                A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSBezierPathAdditions.h; path = macosx/NSBezierPathAdditions.h; sourceTree = "<group>"; };
                 A215BF5D0F02EBB800350CDB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = macosx/en.lproj/GroupRules.xib; sourceTree = "<group>"; };
                 A21979890D07B78400438EA7 /* GroupToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GroupToolbarItem.h; path = macosx/GroupToolbarItem.h; sourceTree = "<group>"; };
@@ -495 +481 @@
                 A223AA810D220CEB00840069 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/MainMenu.xib; sourceTree = "<group>"; };
                 A223AA830D220CEB00840069 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/PrefsWindow.xib; sourceTree = "<group>"; };
-                A224D2630DAAC55F000954EA /* Peers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Peers.png; path = macosx/Images/Peers.png; sourceTree = "<group>"; };
                 A2265F3F0B5EF5F40093DDA5 /* FileNameCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileNameCell.h; path = macosx/FileNameCell.h; sourceTree = "<group>"; };
                 A2265F400B5EF5F40093DDA5 /* FileNameCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileNameCell.m; path = macosx/FileNameCell.m; sourceTree = "<group>"; };
@@ -509 +494 @@
                 A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayWindow.m; path = macosx/DragOverlayWindow.m; sourceTree = "<group>"; };
                 A2385DD30BFE06C800B24EF6 /* DragOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayWindow.h; path = macosx/DragOverlayWindow.h; sourceTree = "<group>"; };
-                A2399CCB0CD3852300225B2B /* NSApplicationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSApplicationAdditions.h; path = macosx/NSApplicationAdditions.h; sourceTree = "<group>"; };
-                A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSApplicationAdditions.m; path = macosx/NSApplicationAdditions.m; sourceTree = "<group>"; };
                 A245030B0D6A1FB000B49D00 /* UpArrowGroupTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = UpArrowGroupTemplate.png; path = macosx/Images/UpArrowGroupTemplate.png; sourceTree = "<group>"; };
                 A245030D0D6A1FBC00B49D00 /* DownArrowGroupTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownArrowGroupTemplate.png; path = macosx/Images/DownArrowGroupTemplate.png; sourceTree = "<group>"; };
@@ -526 +509 @@
                 A25892630CF1F7E800CCCDDF /* StatsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsWindowController.m; path = macosx/StatsWindowController.m; sourceTree = "<group>"; };
                 A259316A0A73B2CC002F4FE7 /* TransmissionHelp */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TransmissionHelp; path = macosx/TransmissionHelp; sourceTree = "<group>"; };
-                A25AFDE70D1038AD0092A1BA /* MenuLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MenuLabel.h; path = macosx/MenuLabel.h; sourceTree = "<group>"; };
-                A25AFDE80D1038AD0092A1BA /* MenuLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MenuLabel.m; path = macosx/MenuLabel.m; sourceTree = "<group>"; };
                 A25D2CBA0CF4C7190096A262 /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stats.h; path = libtransmission/stats.h; sourceTree = "<group>"; };
                 A25D2CBB0CF4C7190096A262 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stats.c; path = libtransmission/stats.c; sourceTree = "<group>"; };
@@ -549 +530 @@
                 A2623B3E0D3DC5930045D19A /* PauseHover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseHover.png; path = macosx/Images/PauseHover.png; sourceTree = "<group>"; };
                 A2623B4D0D3DC6DF0045D19A /* ActionHover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionHover.png; path = macosx/Images/ActionHover.png; sourceTree = "<group>"; };
-                A26397530D0F714300D36DF2 /* ActionPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ActionPopUpButton.h; path = macosx/ActionPopUpButton.h; sourceTree = "<group>"; };
-                A26397540D0F714300D36DF2 /* ActionPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ActionPopUpButton.m; path = macosx/ActionPopUpButton.m; sourceTree = "<group>"; };
                 A265A32E0D25767700198AC8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = macosx/fr.lproj/Creator.xib; sourceTree = "<group>"; };
                 A265A32F0D25767700198AC8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = macosx/fr.lproj/InfoWindow.xib; sourceTree = "<group>"; };
@@ -609 +588 @@
                 A29DF8B70DB2544C00D04E5A /* resume.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = resume.h; path = libtransmission/resume.h; sourceTree = "<group>"; };
                 A29DF8B80DB2544C00D04E5A /* torrent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = torrent.h; path = libtransmission/torrent.h; sourceTree = "<group>"; };
-                A29E04B40DA8764100705643 /* Network.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Network.png; path = macosx/Images/Network.png; sourceTree = "<group>"; };
                 A29EBE520DC01FC9006CEE80 /* web.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = web.c; path = libtransmission/web.c; sourceTree = "<group>"; };
                 A29EBE530DC01FC9006CEE80 /* web.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = web.h; path = libtransmission/web.h; sourceTree = "<group>"; };
@@ -698 +676 @@
                 A2F151220CD438DE001F3B0E /* InfoTabBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBack.png; path = macosx/Images/InfoTabBack.png; sourceTree = "<group>"; };
                 A2F151230CD438DE001F3B0E /* InfoTabBackBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTabBackBlue.png; path = macosx/Images/InfoTabBackBlue.png; sourceTree = "<group>"; };
-                A2F41DA80D0B9152006CE378 /* ActionGear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionGear.png; path = macosx/Images/ActionGear.png; sourceTree = "<group>"; };
                 A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = YingYangTemplate.png; path = macosx/Images/YingYangTemplate.png; sourceTree = "<group>"; };
                 A2F41DBA0D0B96C0006CE378 /* FilterBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterBlue.png; path = macosx/Images/FilterBlue.png; sourceTree = "<group>"; };
@@ -780 +757 @@
                 D4AF3B2D0C41F7A500D46B6B /* list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = list.c; path = libtransmission/list.c; sourceTree = "<group>"; };
                 D4AF3B2E0C41F7A500D46B6B /* list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = list.h; path = libtransmission/list.h; sourceTree = "<group>"; };
-                E138A9730C04D88F00C5426C /* CTGradient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CTGradient.h; path = macosx/CTGradient/CTGradient.h; sourceTree = "<group>"; };
-                E138A9740C04D88F00C5426C /* CTGradient.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CTGradient.m; path = macosx/CTGradient/CTGradient.m; sourceTree = "<group>"; };
                 E138A9750C04D88F00C5426C /* ProgressGradients.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ProgressGradients.h; path = macosx/ProgressGradients.h; sourceTree = "<group>"; };
                 E138A9760C04D88F00C5426C /* ProgressGradients.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ProgressGradients.m; path = macosx/ProgressGradients.m; sourceTree = "<group>"; };
@@ -892 +867 @@
                                 A28F4F750E085BDC003A3882 /* ColorTextField.h */,
                                 A28F4F760E085BDC003A3882 /* ColorTextField.m */,
-                                A25AFDE70D1038AD0092A1BA /* MenuLabel.h */,
-                                A25AFDE80D1038AD0092A1BA /* MenuLabel.m */,
                                 A26AF2820D2DC27C00FF7140 /* AddWindowController.h */,
                                 A26AF2830D2DC27C00FF7140 /* AddWindowController.m */,
-                                A26397530D0F714300D36DF2 /* ActionPopUpButton.h */,
-                                A26397540D0F714300D36DF2 /* ActionPopUpButton.m */,
                                 A2BF078E0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.h */,
                                 A2BF078F0B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m */,
@@ -922 +893 @@
                                 E1B6FC000C0D72A00015FE4D /* Overlay Window */,
                                 E1B6FBEB0C0D70AC0015FE4D /* UKKQueue */,
-                                E138A9730C04D88F00C5426C /* CTGradient.h */,
-                                E138A9740C04D88F00C5426C /* CTGradient.m */,
                                 E138A9750C04D88F00C5426C /* ProgressGradients.h */,
                                 E138A9760C04D88F00C5426C /* ProgressGradients.m */,
@@ -1029 +998 @@
                                 A2EF7DEB0C96297400FA9811 /* PurpleDot.png */,
                                 A2BC19840CA9AF5A00DD302A /* CompleteCheck.png */,
-                                4D752E920913C949008EAAD4 /* Preferences.png */,
                                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */,
                                 A2E2EA910EE321C200EB6308 /* Groups.png */,
                                 A2D0E0480A54A97C003C72CF /* Bandwidth.png */,
-                                A224D2630DAAC55F000954EA /* Peers.png */,
-                                A29E04B40DA8764100705643 /* Network.png */,
                                 A2C0C5020E02CB6100D95339 /* Remote.png */,
                                 4D2784360905709500687951 /* Transmission.icns */,
@@ -1050 +1016 @@
                                 A22D3AA30D00D1790079CFED /* Turtle.png */,
                                 A22D3AA40D00D1790079CFED /* TurtleBlue.png */,
-                                A2F41DA80D0B9152006CE378 /* ActionGear.png */,
                                 A277DA090C693D9C00DA2CD4 /* ActionOn.png */,
                                 A2623B4D0D3DC6DF0045D19A /* ActionHover.png */,
@@ -1065 +1030 @@
                                 4DA6FDC4091141AD00450CB1 /* ResumeOn.png */,
                                 A2623B3D0D3DC5930045D19A /* ResumeHover.png */,
-                                4DE5CCA80980739100BE280E /* Badge.png */,
                                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */,
                                 4DDFDD21099A5D8E00189D81 /* UploadBadge.png */,
@@ -1240 +1204 @@
                         isa = PBXGroup;
                         children = (
-                                A2399CCB0CD3852300225B2B /* NSApplicationAdditions.h */,
-                                A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */,
                                 4DE5CC9B0980656F00BE280E /* NSStringAdditions.h */,
                                 4DE5CC9C0980656F00BE280E /* NSStringAdditions.m */,
-                                A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */,
-                                A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */,
                         );
                         name = Additions;
@@ -1678 +1638 @@
                                 4DA6FDC5091141AD00450CB1 /* ResumeOff.png in Resources */,
                                 4DA6FDC6091141AD00450CB1 /* ResumeOn.png in Resources */,
-                                4D752E930913C949008EAAD4 /* Preferences.png in Resources */,
-                                4DE5CCA90980739100BE280E /* Badge.png in Resources */,
                                 4DE5CCBA0981D27700BE280E /* ResumeAll.png in Resources */,
                                 4DE5CCBB0981D27700BE280E /* PauseAll.png in Resources */,
@@ -1725 +1683 @@
                                 A29AF4F70D01BADC00D097EC /* DownArrowTemplate.png in Resources */,
                                 A29AF4F90D01BAEB00D097EC /* UpArrowTemplate.png in Resources */,
-                                A2F41DA90D0B9152006CE378 /* ActionGear.png in Resources */,
                                 A2F41DAB0D0B916B006CE378 /* YingYangTemplate.png in Resources */,
                                 A2F41DBC0D0B96C0006CE378 /* FilterBlue.png in Resources */,
@@ -1753 +1710 @@
                                 A233BD690D8CF2C7007EE7B4 /* StatsWindow.xib in Resources */,
                                 A2D307B10D9EC9F50051FD27 /* BlocklistStatusWindow.xib in Resources */,
-                                A29E04B50DA8764100705643 /* Network.png in Resources */,
-                                A224D2640DAAC55F000954EA /* Peers.png in Resources */,
                                 A26146E10DD4A0160060F033 /* GroupsNoneTemplate.png in Resources */,
                                 A2C0C5030E02CB6100D95339 /* Remote.png in Resources */,
@@ -1893 +1848 @@
                                 A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.m in Sources */,
                                 A2FB057F0BFEB6800095564D /* DragOverlayView.m in Sources */,
-                                E138A9770C04D88F00C5426C /* CTGradient.m in Sources */,
                                 E138A9780C04D88F00C5426C /* ProgressGradients.m in Sources */,
-                                A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */,
                                 A2DF37070C220D03006523C1 /* CreatorWindowController.m in Sources */,
                                 35F373030C2DA89000DAA8F2 /* FilePriorityCell.m in Sources */,
@@ -1902 +1855 @@
                                 A257C1820CAD3003004E121C /* PeerTableView.m in Sources */,
                                 A2E23AC60CB5E1930002BB25 /* InfoTabButtonCell.m in Sources */,
-                                A2399CCD0CD3852300225B2B /* NSApplicationAdditions.m in Sources */,
                                 A2A6321B0CD9751700E3DA60 /* BadgeView.m in Sources */,
                                 A2ED7D8F0CEF431B00970975 /* FilterButton.m in Sources */,
@@ -1909 +1861 @@
                                 A219798B0D07B78400438EA7 /* GroupToolbarItem.m in Sources */,
                                 A20BFFB70D091CC700CE5D2B /* ToolbarSegmentedCell.m in Sources */,
-                                A26397550D0F714300D36DF2 /* ActionPopUpButton.m in Sources */,
-                                A25AFDE90D1038AD0092A1BA /* MenuLabel.m in Sources */,
                                 A22180980D148A71007D09ED /* GroupsPrefsController.m in Sources */,
                                 A26AF21A0D2DA35A00FF7140 /* FileOutlineController.m in Sources */,

trunk/macosx/AddWindowController.m

@@ -28 +28 @@
 #import "GroupsController.h"
 #import "NSStringAdditions.h"
-#import "NSApplicationAdditions.h"
 #import "ExpandedPathToIconTransformer.h"
 
@@ -165 +164 @@
         [alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Add torrent -> same name -> button")];
         [alert addButtonWithTitle: NSLocalizedString(@"Add", "Add torrent -> same name -> button")];
-        
-        if ([NSApp isOnLeopardOrBetter])
-            [alert setShowsSuppressionButton: YES];
-        else
-            [alert addButtonWithTitle: NSLocalizedString(@"Don't Alert Again", "Add torrent -> same name -> button")];
+        [alert setShowsSuppressionButton: YES];
         
         [alert beginSheetModalForWindow: [self window] modalDelegate: self
@@ -309 +304 @@
 - (void) sameNameAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
 {
-    if (([NSApp isOnLeopardOrBetter] ? [[alert suppressionButton] state] == NSOnState : returnCode == NSAlertThirdButtonReturn))
+    if ([[alert suppressionButton] state] == NSOnState)
         [[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningFolderDataSameName"];
     

trunk/macosx/Badger.h

@@ -31 +31 @@
     
     NSUInteger fCompleted;
-    
-    //tiger-only fields
-    NSImage * fDockIcon, * fBadge;
-    NSDictionary * fAttributes;
-    NSUInteger fCompletedBadged;
-    BOOL fSpeedBadge, fQuittingTiger;
 }
 

trunk/macosx/Badger.m

@@ -25 +25 @@
 #import "Badger.h"
 #import "BadgeView.h"
-#import "NSApplicationAdditions.h"
-#import "NSStringAdditions.h"
-
-#define COMPLETED_BOTTOM_PADDING 5.0
-#define SPEED_BOTTOM_PADDING 2.0
-#define SPEED_BETWEEN_PADDING 2.0
-#define BADGE_HEIGHT 30.0
-
-@interface Badger (Private)
-
-- (void) badgeString: (NSString *) string forRect: (NSRect) rect;
-
-@end
 
 @implementation Badger
@@ -49 +36 @@
         fCompleted = 0;
         
-        if ([NSApp isOnLeopardOrBetter])
-        {
-            BadgeView * view = [[BadgeView alloc] initWithFrame: [[[NSApp dockTile] contentView] frame] lib: lib];
-            [[NSApp dockTile] setContentView: view];
-            [view release];
-        }
-        else
-        {
-            fQuittingTiger = NO;
-            fSpeedBadge = NO;
-            fCompletedBadged = 0;
-        }
+        BadgeView * view = [[BadgeView alloc] initWithFrame: [[[NSApp dockTile] contentView] frame] lib: lib];
+        [[NSApp dockTile] setContentView: view];
+        [view release];
         
         //change that just impacts the dock badge
@@ -73 +51 @@
     [[NSNotificationCenter defaultCenter] removeObserver: self];
     
-    if (![NSApp isOnLeopardOrBetter])
-        [NSApp setApplicationIconImage: nil]; //needed on 10.4
-    
-    [fDockIcon release];
-    [fAttributes release];
-    
     [super dealloc];
 }
@@ -84 +56 @@
 - (void) updateBadge
 {
-    if ([NSApp isOnLeopardOrBetter])
-    {
-        float downloadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"]
-                                ? tr_sessionGetPieceSpeed(fLib, TR_DOWN) : 0.0f;
-        float uploadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"]
-                            ? tr_sessionGetPieceSpeed(fLib, TR_UP) : 0.0f;
-        
-        //only update if the badged values change
-        if ([(BadgeView *)[[NSApp dockTile] contentView] setRatesWithDownload: downloadRate upload: uploadRate])
-            [[NSApp dockTile] display];
-        
-        return;
-    }
+    float downloadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"]
+                            ? tr_sessionGetPieceSpeed(fLib, TR_DOWN) : 0.0f;
+    float uploadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"]
+                        ? tr_sessionGetPieceSpeed(fLib, TR_UP) : 0.0f;
     
-    if (fQuittingTiger)
-        return;
-    
-    //set completed badge to top right
-    BOOL completedChange = fCompleted != fCompletedBadged;
-    if (completedChange)
-    {
-        fCompletedBadged = fCompleted;
-        
-        //force image to reload - copy does not work
-        NSImage * icon = [[NSImage imageNamed: @"NSApplicationIcon"] copy];
-        NSSize iconSize = [icon size];
-        
-        [fDockIcon release];
-        fDockIcon = [[NSImage alloc] initWithSize: iconSize];
-        [fDockIcon addRepresentation: [icon bestRepresentationForDevice: nil]];
-        [icon release];
-        
-        if (fCompleted > 0)
-        {
-            if (!fBadge)
-                fBadge = [NSImage imageNamed: @"Badge"];
-            
-            NSRect badgeRect;
-            badgeRect.size = [fBadge size];
-            badgeRect.origin.x = iconSize.width - badgeRect.size.width;
-            badgeRect.origin.y = iconSize.height - badgeRect.size.height;
-            
-            [fDockIcon lockFocus];
-            
-            //place badge
-            [fBadge compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
-            
-            //ignore shadow of badge when placing string
-            badgeRect.size.height -= COMPLETED_BOTTOM_PADDING;
-            badgeRect.origin.y += COMPLETED_BOTTOM_PADDING;
-            
-            //place badge text
-            [self badgeString: [NSString stringWithFormat: @"%d", fCompleted] forRect: badgeRect];
-                        
-            [fDockIcon unlockFocus];
-        }
-    }
-    
-    NSImage * dockIcon = nil;
-    BOOL speedBadge = NO;
-    
-    BOOL checkDownload = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"],
-        checkUpload = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"];
-    if (checkDownload || checkUpload)
-    {
-        //set upload and download rate badges
-        NSString * downloadRateString = nil, * uploadRateString = nil;
-        
-        float downloadRate = checkDownload ? tr_sessionGetPieceSpeed(fLib, TR_DOWN) : 0.0f;
-        float uploadRate = checkUpload ? tr_sessionGetPieceSpeed(fLib, TR_UP) : 0.0f;
-        
-        if (checkDownload && downloadRate >= 0.1)
-            downloadRateString = [NSString stringForSpeedAbbrev: downloadRate];
-        if (checkUpload && uploadRate >= 0.1)
-            uploadRateString = [NSString stringForSpeedAbbrev: uploadRate];
-        
-        speedBadge = uploadRateString || downloadRateString;
-        if (speedBadge)
-        {
-            if (!fDockIcon)
-                fDockIcon = [[NSImage imageNamed: @"NSApplicationIcon"] copy];
-            dockIcon = [fDockIcon copy];
-            
-            NSRect badgeRect;
-            badgeRect.size = [[NSImage imageNamed: @"UploadBadge.png"] size];
-            badgeRect.origin = NSZeroPoint;
-            
-            //ignore shadow of badge when placing string
-            NSRect stringRect = badgeRect;
-            stringRect.size.height -= SPEED_BOTTOM_PADDING;
-            stringRect.origin.y += SPEED_BOTTOM_PADDING;
-            
-            [dockIcon lockFocus];
-            
-            if (uploadRateString)
-            {
-                //place badge and text
-                [[NSImage imageNamed: @"UploadBadge.png"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
-                [self badgeString: uploadRateString forRect: stringRect];
-            }
-            
-            if (downloadRateString)
-            {
-                //download rate above upload rate
-                if (uploadRateString)
-                {
-                    float spaceBetween = badgeRect.size.height + SPEED_BETWEEN_PADDING;
-                    badgeRect.origin.y += spaceBetween;
-                    stringRect.origin.y += spaceBetween;
-                }
-                
-                //place badge and text
-                [[NSImage imageNamed: @"DownloadBadge.png"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
-                [self badgeString: downloadRateString forRect: stringRect];
-            }
-            
-            [dockIcon unlockFocus];
-        }
-    }
-    
-    //update dock badge
-    if (fSpeedBadge || speedBadge || completedChange)
-    {
-        [NSApp setApplicationIconImage: dockIcon ? dockIcon : fDockIcon];
-        [dockIcon release];
-        
-        fSpeedBadge = speedBadge;
-    }
+    //only update if the badged values change
+    if ([(BadgeView *)[[NSApp dockTile] contentView] setRatesWithDownload: downloadRate upload: uploadRate])
+        [[NSApp dockTile] display];
 }
 
@@ -217 +69 @@
 {
     fCompleted++;
-    
-    if ([NSApp isOnLeopardOrBetter])
-        [[NSApp dockTile] setBadgeLabel: [NSString stringWithFormat: @"%d", fCompleted]];
-    else
-        [self updateBadge];
+    [[NSApp dockTile] setBadgeLabel: [NSString stringWithFormat: @"%d", fCompleted]];
 }
 
@@ -229 +77 @@
     {
         fCompleted = 0;
-        if ([NSApp isOnLeopardOrBetter])
-            [[NSApp dockTile] setBadgeLabel: @""];
-        else
-            [self updateBadge];
+        [[NSApp dockTile] setBadgeLabel: @""];
     }
 }
@@ -238 +83 @@
 - (void) setQuitting
 {
-    if ([NSApp isOnLeopardOrBetter])
-    {
-        [self clearCompleted];
-        [(BadgeView *)[[NSApp dockTile] contentView] setQuitting];
-        [[NSApp dockTile] display];
-    }
-    else
-    {
-        fQuittingTiger = YES;
-        
-        fSpeedBadge = NO;
-        fCompleted = 0;
-        fCompletedBadged = 0;
-        
-        NSImage * quitIcon = [[NSImage imageNamed: @"NSApplicationIcon"] copy];
-        NSRect rect = NSZeroRect;
-        rect.size = [quitIcon size];
-        
-        NSRect badgeRect = NSMakeRect(0.0, (rect.size.height - BADGE_HEIGHT) * 0.5, rect.size.width, BADGE_HEIGHT);
-        
-        [quitIcon lockFocus];
-        
-        [[NSImage imageNamed: @"QuitBadge.png"] compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
-        [self badgeString: NSLocalizedString(@"Quitting", "Dock Badger -> quit message") forRect: badgeRect];
-        
-        [quitIcon unlockFocus];
-        
-        [NSApp setApplicationIconImage: quitIcon];
-        [quitIcon release];
-    }
+    [self clearCompleted];
+    [(BadgeView *)[[NSApp dockTile] contentView] setQuitting];
+    [[NSApp dockTile] display];
 }
 
 @end
-
-@implementation Badger (Private)
-
-//dock icon must have locked focus
-- (void) badgeString: (NSString *) string forRect: (NSRect) rect
-{
-    if (!fAttributes)
-    {
-        NSShadow * stringShadow = [[NSShadow alloc] init];
-        [stringShadow setShadowOffset: NSMakeSize(2.0, -2.0)];
-        [stringShadow setShadowBlurRadius: 4.0];
-        
-        fAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
-            [NSColor whiteColor], NSForegroundColorAttributeName,
-            [NSFont boldSystemFontOfSize: 26.0], NSFontAttributeName, stringShadow, NSShadowAttributeName, nil];
-        
-        [stringShadow release];
-    }
-    
-    NSSize stringSize = [string sizeWithAttributes: fAttributes];
-    
-    //string is in center of image
-    rect.origin.x += (rect.size.width - stringSize.width) * 0.5;
-    rect.origin.y += (rect.size.height - stringSize.height) * 0.5;
-    rect.size = stringSize;
-                        
-    [string drawInRect: rect withAttributes: fAttributes];
-}
-
-@end

trunk/macosx/BlocklistDownloader.m

@@ -27 +27 @@
 #import "BlocklistScheduler.h"
 #import "PrefsController.h"
-#import "NSApplicationAdditions.h"
 
 #define LIST_URL @"http://download.m0k.org/transmission/files/level1.gz"
@@ -125 +124 @@
 {
     fState = BLOCKLIST_DL_PROCESSING;
-    
-    if ([NSApp isOnLeopardOrBetter])
-        [self performSelectorInBackground: @selector(finishDownloadSuccess) withObject: nil];
-    else
-        [self finishDownloadSuccess];
+    [self performSelectorInBackground: @selector(finishDownloadSuccess) withObject: nil];
 }
 
@@ -158 +153 @@
     
     //delete downloaded file
-    if ([NSApp isOnLeopardOrBetter])
-        [[NSFileManager defaultManager] removeItemAtPath: DESTINATION error: NULL];
-    else
-        [[NSFileManager defaultManager] removeFileAtPath: DESTINATION handler: nil];
+    [[NSFileManager defaultManager] removeItemAtPath: DESTINATION error: NULL];
     
     [fViewController setFinished];

trunk/macosx/BlocklistScheduler.m

@@ -25 +25 @@
 #import "BlocklistScheduler.h"
 #import "BlocklistDownloader.h"
-#import "NSApplicationAdditions.h"
 
 //thirty second delay before running after option is changed
@@ -72 +71 @@
     
     //current run loop usually means a second update won't work
-    NSRunLoop * loop = [NSApp isOnLeopardOrBetter] ? [NSRunLoop mainRunLoop] : [NSRunLoop currentRunLoop];
+    NSRunLoop * loop = [NSRunLoop mainRunLoop];
     [loop addTimer: fTimer forMode: NSDefaultRunLoopMode];
     [loop addTimer: fTimer forMode: NSModalPanelRunLoopMode];

trunk/macosx/Controller.h

@@ -37 +37 @@
 @class StatusBarView;
 @class FilterButton;
-@class MenuLabel;
 
 typedef enum
@@ -68 +67 @@
     
     IBOutlet NSMenuItem             * fOpenIgnoreDownloadFolder;
-    
-    IBOutlet NSBox                  * fBottomTigerLine;
     IBOutlet NSButton               * fActionButton, * fSpeedLimitButton;
     IBOutlet NSTextField            * fTotalTorrentsField;
@@ -75 +72 @@
     IBOutlet StatusBarView          * fStatusBar;
     IBOutlet NSButton               * fStatusButton;
-    IBOutlet MenuLabel              * fStatusTigerField;
-    IBOutlet NSImageView            * fStatusTigerImageView;
     IBOutlet NSTextField            * fTotalDLField, * fTotalULField;
     IBOutlet NSImageView            * fTotalDLImageView;

trunk/macosx/Controller.m

@@ -43 +43 @@
 #import "FilterButton.h"
 #import "BonjourController.h"
-#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "ExpandedPathToPathTransformer.h"
@@ -307 +306 @@
                                 + [fTableView rowHeight] + [fTableView intercellSpacing].height;
     [fWindow setContentMinSize: contentMinSize];
-    
-    if ([NSApp isOnLeopardOrBetter])
-    {
-        [fWindow setContentBorderThickness: [[fTableView enclosingScrollView] frame].origin.y forEdge: NSMinYEdge];
-        [[fTotalTorrentsField cell] setBackgroundStyle: NSBackgroundStyleRaised];
-        
-        [[[fActionButton menu] itemAtIndex: 0] setImage: [NSImage imageNamed: NSImageNameActionTemplate]]; //set in nib if Leopard-only
-        
-        [fBottomTigerLine removeFromSuperview];
-        [fStatusTigerField removeFromSuperview];
-        [fStatusTigerImageView removeFromSuperview];
-    }
-    else
-    {
-        [fActionButton setBezelStyle: NSSmallSquareBezelStyle];
-        [fSpeedLimitButton setBezelStyle: NSSmallSquareBezelStyle];
-        
-        //status bar
-        [fStatusButton setHidden: YES];
-        [fStatusTigerField setHidden: NO];
-        [fStatusTigerImageView setHidden: NO];
-        
-        //filter bar
-        [fNoFilterButton sizeToFit];
-        
-        NSRect activeRect = [fActiveFilterButton frame];
-        activeRect.origin.x = NSMaxX([fNoFilterButton frame]) + 1.0;
-        [fActiveFilterButton setFrame: activeRect];
-    }
+    [fWindow setContentBorderThickness: [[fTableView enclosingScrollView] frame].origin.y forEdge: NSMinYEdge];
+        
+    [[fTotalTorrentsField cell] setBackgroundStyle: NSBackgroundStyleRaised];
     
     [self updateGroupsFilterButton];
@@ -638 +611 @@
     
     [fOverlayWindow release];
+    [fBadger release];
     
     [fAutoImportedNames release];
@@ -644 +618 @@
     //complete cleanup
     tr_sessionClose(fLib);
-    
-    [fBadger release]; //clears dock icon on Tiger
 }
 
@@ -719 +691 @@
     
     //delete the torrent file after opening
-    if ([NSApp isOnLeopardOrBetter])
-        [[NSFileManager defaultManager] removeItemAtPath: path error: NULL];
-    else
-        [[NSFileManager defaultManager] removeFileAtPath: path handler: nil];
+    [[NSFileManager defaultManager] removeItemAtPath: path error: NULL];
     
     [fPendingTorrentDownloads removeObjectForKey: [[download request] URL]];
@@ -990 +959 @@
     [alert addButtonWithTitle: NSLocalizedString(@"OK", "Open invalid alert -> button")];
     
-    BOOL onLeopard = [NSApp isOnLeopardOrBetter];
-    if (onLeopard)
-        [alert setShowsSuppressionButton: YES];
-    else
-        [alert addButtonWithTitle: NSLocalizedString(@"Don't Alert Again", "Open duplicate alert -> button")];
-    
-    NSInteger result = [alert runModal];
-    if ((onLeopard ? [[alert suppressionButton] state] == NSOnState : result == NSAlertSecondButtonReturn))
+    [alert runModal];
+    if ([[alert suppressionButton] state] == NSOnState)
         [fDefaults setBool: NO forKey: @"WarningInvalidOpen"];
     [alert release];
@@ -1015 +978 @@
     [alert setAlertStyle: NSWarningAlertStyle];
     [alert addButtonWithTitle: NSLocalizedString(@"OK", "Open duplicate alert -> button")];
-    
-    BOOL onLeopard = [NSApp isOnLeopardOrBetter];
-    if (onLeopard)
-        [alert setShowsSuppressionButton: YES];
-    else
-        [alert addButtonWithTitle: NSLocalizedString(@"Don't Alert Again", "Open duplicate alert -> button")];
-    
-    NSInteger result = [alert runModal];
-    if ((onLeopard ? [[alert suppressionButton] state] == NSOnState : result == NSAlertSecondButtonReturn))
+    [alert setShowsSuppressionButton: YES];
+    
+    [alert runModal];
+    if ([[alert suppressionButton] state])
         [fDefaults setBool: NO forKey: @"WarningDuplicate"];
     [alert release];
@@ -1566 +1524 @@
                 }
                 
-                if ([NSApp isOnLeopardOrBetter])
-                {
-                    [fStatusButton setTitle: statusString];
-                    [self resizeStatusButton];
-                }
-                else
-                    [fStatusTigerField setStringValue: statusString];
+                [fStatusButton setTitle: statusString];
+                [self resizeStatusButton];
             }
         }
@@ -1951 +1904 @@
     }
     
-    //on Tiger add the group sort descriptor to the front
-    if (![NSApp isOnLeopardOrBetter] && [fDefaults boolForKey: @"SortByGroup"])
-    {
-        NSSortDescriptor * groupDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"groupOrderValue" ascending: YES] autorelease];
-        
-        NSMutableArray * temp = [[NSMutableArray alloc] initWithCapacity: [descriptors count]+1];
-        [temp addObject: groupDescriptor];
-        [temp addObjectsFromArray: descriptors];
-        
-        [descriptors release];
-        descriptors = temp;
-    }
-    
     //actually sort
-    if ([fDefaults boolForKey: @"SortByGroup"] && [NSApp isOnLeopardOrBetter])
+    if ([fDefaults boolForKey: @"SortByGroup"])
     {
         NSEnumerator * enumerator = [fDisplayedTorrents objectEnumerator];
@@ -2111 +2051 @@
     
     //place torrents into groups
-    BOOL groupRows = [fDefaults boolForKey: @"SortByGroup"] && [NSApp isOnLeopardOrBetter];
+    BOOL groupRows = [fDefaults boolForKey: @"SortByGroup"];
     if (groupRows)
     {
@@ -2408 +2348 @@
     }
     
-    //tiger doesn't have built-in image scaling in buttons
-    if (![NSApp isOnLeopardOrBetter])
-    {
-        icon = [[icon copy] autorelease];
-        [icon setScalesWhenResized: YES];
-        [icon setSize: NSMakeSize(12.0, 12.0)];
-    }
-    
     [[fGroupFilterMenu itemAtIndex: 0] setImage: icon];
     [fGroupsButton setToolTip: toolTip];
@@ -2514 +2446 @@
                         userInfo: [NSNumber numberWithBool: nextIsLimit] repeats: NO];
     
-    NSRunLoop * loop = [NSApp isOnLeopardOrBetter] ? [NSRunLoop mainRunLoop] : [NSRunLoop currentRunLoop];
+    NSRunLoop * loop = [NSRunLoop mainRunLoop];
     [loop addTimer: fSpeedLimitTimer forMode: NSDefaultRunLoopMode];
     [loop addTimer: fSpeedLimitTimer forMode: NSModalPanelRunLoopMode];
@@ -2732 +2664 @@
 {
     //only allow reordering of rows if sorting by order
-    if (([fDefaults boolForKey: @"SortByGroup"] && [NSApp isOnLeopardOrBetter])
-        || [[fDefaults stringForKey: @"Sort"] isEqualToString: SORT_ORDER])
+    if ([fDefaults boolForKey: @"SortByGroup"] || [[fDefaults stringForKey: @"Sort"] isEqualToString: SORT_ORDER])
     {
         NSMutableIndexSet * indexSet = [NSMutableIndexSet indexSet];
@@ -3454 +3385 @@
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
-    NSMutableArray * idents = [NSMutableArray arrayWithObjects:
-                                TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_OPEN_WEB,
-                                TOOLBAR_REMOVE, TOOLBAR_PAUSE_RESUME_SELECTED, TOOLBAR_PAUSE_RESUME_ALL,
-                                TOOLBAR_FILTER, TOOLBAR_INFO,
-                                NSToolbarSeparatorItemIdentifier,
-                                NSToolbarSpaceItemIdentifier,
-                                NSToolbarFlexibleSpaceItemIdentifier,
-                                NSToolbarCustomizeToolbarItemIdentifier, nil];
-    
-    //allow quicklook on leopard
-    if ([NSApp isOnLeopardOrBetter])
-        [idents insertObject: TOOLBAR_QUICKLOOK atIndex: 6];
-    
-    return idents;
+    return [NSArray arrayWithObjects:
+            TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_OPEN_WEB, TOOLBAR_REMOVE,
+            TOOLBAR_PAUSE_RESUME_SELECTED, TOOLBAR_PAUSE_RESUME_ALL,
+            TOOLBAR_QUICKLOOK, TOOLBAR_FILTER, TOOLBAR_INFO,
+            NSToolbarSeparatorItemIdentifier,
+            NSToolbarSpaceItemIdentifier,
+            NSToolbarFlexibleSpaceItemIdentifier,
+            NSToolbarCustomizeToolbarItemIdentifier, nil];
 }
 
 - (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
 {
-    NSMutableArray * idents =  [NSMutableArray arrayWithObjects:
-                                TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_REMOVE,
-                                NSToolbarSeparatorItemIdentifier,
-                                TOOLBAR_PAUSE_RESUME_ALL,
-                                NSToolbarFlexibleSpaceItemIdentifier,
-                                TOOLBAR_FILTER, TOOLBAR_INFO, nil];
-    
-    //allow quicklook on leopard
-    if ([NSApp isOnLeopardOrBetter])
-        [idents insertObject: TOOLBAR_QUICKLOOK atIndex: [idents count]-2];
-    
-    return idents;
+    return [NSArray arrayWithObjects:
+            TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_REMOVE, NSToolbarSeparatorItemIdentifier,
+            TOOLBAR_PAUSE_RESUME_ALL, NSToolbarFlexibleSpaceItemIdentifier,
+            TOOLBAR_QUICKLOOK, TOOLBAR_FILTER, TOOLBAR_INFO, nil];
 }
 

trunk/macosx/CreatorWindowController.m

@@ -24 +24 @@
 
 #import "CreatorWindowController.h"
-#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "utils.h" //tr_httpIsValidURL
@@ -185 +184 @@
     fOpenTorrent = [fDefaults boolForKey: @"CreatorOpen"];
     [self updateEnableOpenCheckForTrackers];
-    
-    if (![NSApp isOnLeopardOrBetter])
-    {
-        [fTrackerAddRemoveControl sizeToFit];
-        [fTrackerAddRemoveControl setLabel: @"+" forSegment: TRACKER_ADD_TAG];
-        [fTrackerAddRemoveControl setLabel: @"-" forSegment: TRACKER_REMOVE_TAG];
-    }
 }
 
@@ -241 +233 @@
         [alert addButtonWithTitle: NSLocalizedString(@"Create", "Create torrent -> blank address -> button")];
         [alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Create torrent -> blank address -> button")];
-        
-        if ([NSApp isOnLeopardOrBetter])
-            [alert setShowsSuppressionButton: YES];
-        else
-            [alert addButtonWithTitle: NSLocalizedString(@"Don't Alert Again", "Create torrent -> blank address -> button")];
+        [alert setShowsSuppressionButton: YES];
 
         [alert beginSheetModalForWindow: [self window] modalDelegate: self
@@ -378 +366 @@
 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
 {
-    if (([NSApp isOnLeopardOrBetter] ? [[alert suppressionButton] state] == NSOnState : returnCode == NSAlertThirdButtonReturn))
+    if ([[alert suppressionButton] state] == NSOnState)
         [[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningCreatorBlankAddress"];
     

trunk/macosx/DragOverlayView.m

@@ -24 +24 @@
 
 #import "DragOverlayView.h"
-#import "NSBezierPathAdditions.h"
 
 #define PADDING 10.0f
@@ -37 +36 @@
         //create badge
         NSRect badgeRect = NSMakeRect(0.0f, 0.0f, 325.0f, 84.0f);
-        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0f];
+        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect xRadius: 15.0f yRadius: 15.0f];
         
         fBackBadge = [[NSImage alloc] initWithSize: badgeRect.size];

trunk/macosx/FileOutlineController.m

@@ -29 +29 @@
 #import "FileListNode.h"
 #import "QuickLookController.h"
-#import "NSApplicationAdditions.h"
 
 #define ROW_SMALL_HEIGHT 18.0f
@@ -60 +59 @@
     
     //set table header tool tips
-    if ([NSApp isOnLeopardOrBetter])
-    {
-        [[fOutline tableColumnWithIdentifier: @"Check"] setHeaderToolTip: NSLocalizedString(@"Download",
-                                                                            "file table -> header tool tip")];
-        [[fOutline tableColumnWithIdentifier: @"Priority"] setHeaderToolTip: NSLocalizedString(@"Priority",
-                                                                            "file table -> header tool tip")];
-    }
+    [[fOutline tableColumnWithIdentifier: @"Check"] setHeaderToolTip: NSLocalizedString(@"Download",
+                                                                        "file table -> header tool tip")];
+    [[fOutline tableColumnWithIdentifier: @"Priority"] setHeaderToolTip: NSLocalizedString(@"Priority",
+                                                                        "file table -> header tool tip")];
     
     [fOutline setMenu: [self menu]];

trunk/macosx/FileOutlineView.h

@@ -26 +26 @@
 
 @class Torrent;
-@class CTGradient;
 
 @interface FileOutlineView : NSOutlineView
@@ -32 +31 @@
     Torrent * fTorrent;
     
-    CTGradient * fHighPriorityGradient, * fLowPriorityGradient, * fMixedPriorityGradient;
+    NSGradient * fHighPriorityGradient, * fLowPriorityGradient, * fMixedPriorityGradient;
     
     int fMouseRow;

trunk/macosx/FileOutlineView.m

@@ -29 +29 @@
 #import "FileListNode.h"
 #import "QuickLookController.h"
-#import "CTGradient.h"
 
 @implementation FileOutlineView
@@ -48 +47 @@
     NSColor * endingColor = [NSColor colorWithCalibratedRed: 217.0/255.0 green: 250.0/255.0 blue: 211.0/255.0 alpha: 1.0];
     NSColor * beginningColor = [endingColor blendedColorWithFraction: 0.3 ofColor: [NSColor whiteColor]];
-    fHighPriorityGradient = [[CTGradient gradientWithBeginningColor: beginningColor endingColor: endingColor] retain];
+    fHighPriorityGradient = [[NSGradient alloc] initWithStartingColor: beginningColor endingColor: endingColor];
     
     endingColor = [NSColor colorWithCalibratedRed: 255.0/255.0 green: 243.0/255.0 blue: 206.0/255.0 alpha: 1.0];
     beginningColor = [endingColor blendedColorWithFraction: 0.3 ofColor: [NSColor whiteColor]];
-    fLowPriorityGradient = [[CTGradient gradientWithBeginningColor: beginningColor endingColor: endingColor] retain];
+    fLowPriorityGradient = [[NSGradient alloc] initWithStartingColor: beginningColor endingColor: endingColor];
     
     endingColor = [NSColor colorWithCalibratedRed: 225.0/255.0 green: 218.0/255.0 blue: 255.0/255.0 alpha: 1.0];
     beginningColor = [endingColor blendedColorWithFraction: 0.3 ofColor: [NSColor whiteColor]];
-    fMixedPriorityGradient = [[CTGradient gradientWithBeginningColor: beginningColor endingColor: endingColor] retain];
+    fMixedPriorityGradient = [[NSGradient alloc] initWithStartingColor: beginningColor endingColor: endingColor];
     
     fMouseRow = -1;
@@ -186 +185 @@
         if ([fTorrent checkForFiles: indexes] != NSOffState)
         {
-            CTGradient * gradient = nil;
+            NSGradient * gradient = nil;
             
             NSSet * priorities = [fTorrent filePrioritiesForIndexes: indexes];
@@ -210 +209 @@
                 NSRect rect = [self rectOfRow: row];
                 rect.size.height -= 1.0;
-                [gradient fillRect: rect angle: 90];
+                [gradient drawInRect: rect angle: 90];
             }
         }

trunk/macosx/GroupsController.m

@@ -24 +24 @@
 
 #import "GroupsController.h"
-#import "CTGradient.h"
-#import "NSBezierPathAdditions.h"
-#import "NSApplicationAdditions.h"
 
 #define ICON_WIDTH 16.0
@@ -210 +207 @@
 - (BOOL) usesAutoAssignRulesForIndex: (NSInteger) index
 {
-    if (![NSApp isOnLeopardOrBetter])
-        return NO;
-    
     NSInteger orderIndex = [self rowValueForIndex: index];
     if (orderIndex == -1)
@@ -411 +405 @@
     NSRect rect = NSMakeRect(0.0, 0.0, ICON_WIDTH, ICON_WIDTH);
     
-    NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: rect radius: 3.0];
+    NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: rect xRadius: 3.0 yRadius: 3.0];
     NSImage * icon = [[NSImage alloc] initWithSize: rect.size];
     
@@ -419 +413 @@
     
     //border
-    CTGradient * gradient = [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.45 ofColor:
+    NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [color blendedColorWithFraction: 0.45 ofColor:
                                 [NSColor whiteColor]] endingColor: color];
-    [gradient fillBezierPath: bp angle: 270.0];
+    [gradient drawInBezierPath: bp angle: 270.0];
+    [gradient release];
     
     //inside
-    bp = [NSBezierPath bezierPathWithRoundedRect: NSInsetRect(rect, 1.0, 1.0) radius: 3.0];
-    gradient = [CTGradient gradientWithBeginningColor: [color blendedColorWithFraction: 0.75 ofColor: [NSColor whiteColor]]
+    bp = [NSBezierPath bezierPathWithRoundedRect: NSInsetRect(rect, 1.0, 1.0) xRadius: 3.0 yRadius: 3.0];
+    gradient = [[NSGradient alloc] initWithStartingColor: [color blendedColorWithFraction: 0.75 ofColor: [NSColor whiteColor]]
                 endingColor: [color blendedColorWithFraction: 0.2 ofColor: [NSColor whiteColor]]];
-    [gradient fillBezierPath: bp angle: 270.0];
+    [gradient drawInBezierPath: bp angle: 270.0];
+    [gradient release];
     
     [icon unlockFocus];

trunk/macosx/GroupsPrefsController.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 
-@class CTGradient;
-
 @interface GroupsPrefsController : NSObject
 {
     IBOutlet NSTableView * fTableView;
     IBOutlet NSSegmentedControl * fAddRemoveControl;
-
+    
     IBOutlet NSColorWell * fSelectedColorView;
     IBOutlet NSTextField * fSelectedColorNameField;
     IBOutlet NSButton * fCustomLocationEnableCheck;
     IBOutlet NSPopUpButton * fCustomLocationPopUp;
-
-    IBOutlet NSView * fGroupRulesPrefsContainer;
+    
     IBOutlet NSButton * fAutoAssignRulesEnableCheck;
     IBOutlet NSButton * fAutoAssignRulesEditButton;

trunk/macosx/GroupsPrefsController.m

@@ -25 +25 @@
 #import "GroupsPrefsController.h"
 #import "GroupsController.h"
-#import "NSApplicationAdditions.h"
 #import "ExpandedPathToPathTransformer.h"
 #import "ExpandedPathToIconTransformer.h"
@@ -45 +44 @@
 {
     [fTableView registerForDraggedTypes: [NSArray arrayWithObject: GROUP_TABLE_VIEW_DATA_TYPE]];
-    
-    if (![NSApp isOnLeopardOrBetter])
-    {
-        [fAddRemoveControl sizeToFit];
-        [fAddRemoveControl setLabel: @"+" forSegment: ADD_TAG];
-        [fAddRemoveControl setLabel: @"-" forSegment: REMOVE_TAG];
-        [fGroupRulesPrefsContainer setHidden: YES]; //get rid of container when 10.5-only
-    }
     
     [fSelectedColorView addObserver: self forKeyPath: @"color" options: 0 context: NULL];

trunk/macosx/InfoWindowController.m

@@ -33 +33 @@
 #import "PiecesView.h"
 #import "QuickLookController.h"
-#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #include "utils.h" //tr_getRatio()
@@ -168 +167 @@
     
     //set table header tool tips
-    if ([NSApp isOnLeopardOrBetter])
-    {
-        [[fPeerTable tableColumnWithIdentifier: @"Encryption"] setHeaderToolTip: NSLocalizedString(@"Encrypted Connection",
-                                                                            "inspector -> peer table -> header tool tip")];
-        [[fPeerTable tableColumnWithIdentifier: @"Progress"] setHeaderToolTip: NSLocalizedString(@"Available",
-                                                                            "inspector -> peer table -> header tool tip")];
-        [[fPeerTable tableColumnWithIdentifier: @"UL To"] setHeaderToolTip: NSLocalizedString(@"Uploading To Peer",
-                                                                            "inspector -> peer table -> header tool tip")];
-        [[fPeerTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Peer",
-                                                                            "inspector -> peer table -> header tool tip")];
-        
-        [[fWebSeedTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Web Seed",
-                                                                            "inspector -> web seed table -> header tool tip")];
-    }
-    else
-    {
-        [fTrackerAddRemoveControl sizeToFit];
-        [fTrackerAddRemoveControl setLabel: @"+" forSegment: TRACKER_ADD_TAG];
-        [fTrackerAddRemoveControl setLabel: @"-" forSegment: TRACKER_REMOVE_TAG];
-    }
+    [[fPeerTable tableColumnWithIdentifier: @"Encryption"] setHeaderToolTip: NSLocalizedString(@"Encrypted Connection",
+                                                                        "inspector -> peer table -> header tool tip")];
+    [[fPeerTable tableColumnWithIdentifier: @"Progress"] setHeaderToolTip: NSLocalizedString(@"Available",
+                                                                        "inspector -> peer table -> header tool tip")];
+    [[fPeerTable tableColumnWithIdentifier: @"UL To"] setHeaderToolTip: NSLocalizedString(@"Uploading To Peer",
+                                                                        "inspector -> peer table -> header tool tip")];
+    [[fPeerTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Peer",
+                                                                        "inspector -> peer table -> header tool tip")];
+    
+    [[fWebSeedTable tableColumnWithIdentifier: @"DL From"] setHeaderToolTip: NSLocalizedString(@"Downloading From Web Seed",
+                                                                        "inspector -> web seed table -> header tool tip")];
     
     //prepare for animating peer table and web seed table
@@ -249 +239 @@
         if (numberSelected > 0)
         {
-            [fImageView setImage: [NSImage imageNamed: [NSApp isOnLeopardOrBetter]
-                                    ? NSImageNameMultipleDocuments : @"NSApplicationIcon"]];
+            [fImageView setImage: [NSImage imageNamed: NSImageNameMultipleDocuments]];
             
             [fNameField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d Torrents Selected",
@@ -1764 +1753 @@
         [alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Remove built-in tracker alert -> button")];
         
-        BOOL onLeopard = [NSApp isOnLeopardOrBetter];
-        if (onLeopard)
-            [alert setShowsSuppressionButton: YES];
-        else
-            [alert addButtonWithTitle: NSLocalizedString(@"Don't Alert Again", "Remove built-in tracker alert -> button")];
+        [alert setShowsSuppressionButton: YES];
 
         NSInteger result = [alert runModal];
-        if ((onLeopard ? [[alert suppressionButton] state] == NSOnState : result == NSAlertThirdButtonReturn))
+        if ([[alert suppressionButton] state] == NSOnState)
             [[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningRemoveBuiltInTracker"];
         [alert release];

trunk/macosx/MessageWindowController.m

@@ -25 +25 @@
 #import "MessageWindowController.h"
 #import "NSStringAdditions.h"
-#import "NSApplicationAdditions.h"
 #import <transmission.h>
 
@@ -68 +67 @@
         name: @"NSTableViewColumnDidResizeNotification" object: fMessageTable];
     
-    if ([NSApp isOnLeopardOrBetter])
-        [window setContentBorderThickness: [[fMessageTable enclosingScrollView] frame].origin.y forEdge: NSMinYEdge];
+    [window setContentBorderThickness: [[fMessageTable enclosingScrollView] frame].origin.y forEdge: NSMinYEdge];
     
     //initially sort peer table by date

trunk/macosx/NSStringAdditions.m

@@ -24 +24 @@
 
 #import "NSStringAdditions.h"
-#import "NSApplicationAdditions.h"
 #import <transmission.h>
 
@@ -148 +147 @@
 - (NSComparisonResult) compareFinder: (NSString *) string
 {
-    const NSInteger comparisonOptions = [NSApp isOnLeopardOrBetter]
-                                ? (NSCaseInsensitiveSearch | NSNumericSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch)
-                                : (NSCaseInsensitiveSearch | NSNumericSearch);
+    const NSInteger comparisonOptions = NSCaseInsensitiveSearch | NSNumericSearch | NSWidthInsensitiveSearch | NSForcedOrderingSearch;
     return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }
@@ -156 +153 @@
 - (NSComparisonResult) compareNumeric: (NSString *) string
 {
-    const NSInteger comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSNumericSearch | NSForcedOrderingSearch) : NSNumericSearch;
+    const NSInteger comparisonOptions = NSNumericSearch | NSForcedOrderingSearch;
     return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }

trunk/macosx/PiecesView.m

@@ -26 +26 @@
 #import "Torrent.h"
 #import "InfoWindowController.h"
-#import "CTGradient.h"
 #import "utils.h"
 
@@ -48 +47 @@
     
     [fBack lockFocus];
-    CTGradient * gradient = [CTGradient gradientWithBeginningColor: [NSColor colorWithCalibratedWhite: 0.0f alpha: 0.4f]
+    NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [NSColor colorWithCalibratedWhite: 0.0f alpha: 0.4f]
                                 endingColor: [NSColor colorWithCalibratedWhite: 0.2f alpha: 0.4f]];
-    [gradient fillRect: [self bounds] angle: 90.0f];
+    [gradient drawInRect: [self bounds] angle: 90.0f];
+    [gradient release];
     [fBack unlockFocus];
     

trunk/macosx/PortChecker.m

@@ -24 +24 @@
 
 #import "PortChecker.h"
-#import "NSApplicationAdditions.h"
 
 #define CHECKER_URL @"http://portcheck.transmissionbt.com/%d"
@@ -131 +130 @@
     
     NSURLRequest * portProbeRequest = [NSURLRequest requestWithURL: [NSURL URLWithString:
-                [NSString stringWithFormat: CHECKER_URL, fPortNumber]] cachePolicy:
-                [NSApp isOnLeopardOrBetter] ? NSURLRequestReloadIgnoringLocalAndRemoteCacheData : NSURLRequestReloadIgnoringCacheData
-                timeoutInterval: 15.0];
+                                        [NSString stringWithFormat: CHECKER_URL, fPortNumber]]
+                                        cachePolicy: NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval: 15.0];
     
     if ((fConnection = [[NSURLConnection alloc] initWithRequest: portProbeRequest delegate: self]))

trunk/macosx/PrefsController.m

@@ -28 +28 @@
 #import "PortChecker.h"
 #import "BonjourController.h"
-#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "UKKQueue.h"
@@ -177 +176 @@
     [self setPrefView: nil];
     
-    if (![NSApp isOnLeopardOrBetter])
-    {
-        [fRPCAddRemoveControl sizeToFit];
-        [fRPCAddRemoveControl setLabel: @"+" forSegment: RPC_IP_ADD_TAG];
-        [fRPCAddRemoveControl setLabel: @"-" forSegment: RPC_IP_REMOVE_TAG];
-    }
-    
     //set download folder
     [fFolderPopUp selectItemAtIndex: [fDefaults boolForKey: @"DownloadLocationConstant"] ? DOWNLOAD_FOLDER : DOWNLOAD_TORRENT];
@@ -257 +249 @@
     {
         [item setLabel: NSLocalizedString(@"General", "Preferences -> toolbar item title")];
-        [item setImage: [NSImage imageNamed: [NSApp isOnLeopardOrBetter] ? NSImageNamePreferencesGeneral : @"Preferences.png"]];
+        [item setImage: [NSImage imageNamed: NSImageNamePreferencesGeneral]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
@@ -289 +281 @@
     {
         [item setLabel: NSLocalizedString(@"Peers", "Preferences -> toolbar item title")];
-        [item setImage: [NSImage imageNamed: [NSApp isOnLeopardOrBetter] ? NSImageNameUserGroup : @"Peers.png"]];
+        [item setImage: [NSImage imageNamed: NSImageNameUserGroup]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
@@ -297 +289 @@
     {
         [item setLabel: NSLocalizedString(@"Network", "Preferences -> toolbar item title")];
-        [item setImage: [NSImage imageNamed: [NSApp isOnLeopardOrBetter] ? NSImageNameNetwork : @"Network.png"]];
+        [item setImage: [NSImage imageNamed: NSImageNameNetwork]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
@@ -413 +405 @@
     NSMutableArray * sounds = [NSMutableArray array];
     
-    NSMutableArray * directories = [NSMutableArray arrayWithObjects: @"/System/Library/Sounds", @"/Library/Sounds", nil];
-    if ([NSApp isOnLeopardOrBetter])
-        [directories addObject: [NSHomeDirectory() stringByAppendingPathComponent: @"Library/Sounds"]];
+    NSArray * directories = [NSArray arrayWithObjects: @"/System/Library/Sounds", @"/Library/Sounds", @"Library/Sounds", nil];
     
     BOOL isDirectory;
@@ -1162 +1152 @@
             }
     }
-    
-    //for network view make sure progress indicator hides itself (get around a Tiger bug)
-    if (![NSApp isOnLeopardOrBetter] && view == fNetworkView && [fPortStatusImage image])
-        [fPortStatusProgress setDisplayedWhenStopped: NO];
 }
 

trunk/macosx/ProgressGradients.h

@@ -23 +23 @@
  *****************************************************************************/
 
-@class CTGradient;
-
 @interface ProgressGradients : NSObject
 
-+ (CTGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent;
++ (NSGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent;
 
-+ (CTGradient *) progressWhiteGradient;
-+ (CTGradient *) progressGrayGradient;
-+ (CTGradient *) progressLightGrayGradient;
-+ (CTGradient *) progressBlueGradient;
-+ (CTGradient *) progressDarkBlueGradient;
-+ (CTGradient *) progressGreenGradient;
-+ (CTGradient *) progressLightGreenGradient;
-+ (CTGradient *) progressDarkGreenGradient;
-+ (CTGradient *) progressRedGradient;
-+ (CTGradient *) progressYellowGradient;
++ (NSGradient *) progressWhiteGradient;
++ (NSGradient *) progressGrayGradient;
++ (NSGradient *) progressLightGrayGradient;
++ (NSGradient *) progressBlueGradient;
++ (NSGradient *) progressDarkBlueGradient;
++ (NSGradient *) progressGreenGradient;
++ (NSGradient *) progressLightGreenGradient;
++ (NSGradient *) progressDarkGreenGradient;
++ (NSGradient *) progressRedGradient;
++ (NSGradient *) progressYellowGradient;
 
 @end

trunk/macosx/ProgressGradients.m

@@ -24 +24 @@
 
 #import "ProgressGradients.h"
-#import "CTGradient.h"
 
 @implementation ProgressGradients
 
-+ (CTGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent
++ (NSGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent
 {
-    CTGradientElement color1;
-    color1.red = redComponent;
-    color1.green = greenComponent;
-    color1.blue = blueComponent;
-    color1.alpha = 1.0f;
-    color1.position = 0.0f;
+    NSColor * baseColor = [NSColor colorWithCalibratedRed: redComponent green: greenComponent blue: blueComponent alpha: 1.0];
     
-    CTGradientElement color2;
-    color2.red = redComponent * 0.95f;
-    color2.green = greenComponent * 0.95f;
-    color2.blue = blueComponent * 0.95f;
-    color2.alpha = 1.0f;
-    color2.position = 0.5f;
+    NSColor * color2 = [NSColor colorWithCalibratedRed: redComponent * 0.95 green: greenComponent * 0.95 blue: blueComponent * 0.95
+                        alpha: 1.0];
     
-    CTGradientElement color3;
-    color3.red = redComponent * 0.85f;
-    color3.green = greenComponent * 0.85f;
-    color3.blue = blueComponent * 0.85f;
-    color3.alpha = 1.0f;
-    color3.position = 0.5f;
+    NSColor * color3 = [NSColor colorWithCalibratedRed: redComponent * 0.85 green: greenComponent * 0.85 blue: blueComponent * 0.85
+                        alpha: 1.0];
     
-    CTGradientElement color4;
-    color4.red = redComponent;
-    color4.green = greenComponent;
-    color4.blue = blueComponent;
-    color4.alpha = 1.0f;
-    color4.position = 1.0f;
-    
-    CTGradient * newInstance = [[CTGradient alloc] init];
-    [newInstance addElement: &color1];
-    [newInstance addElement: &color2];
-    [newInstance addElement: &color3];
-    [newInstance addElement: &color4];
-    
-    return [newInstance autorelease];
+    NSGradient * progressGradient = [[NSGradient alloc] initWithColorsAndLocations: baseColor, 0.0, color2, 0.5, color3, 0.5,
+                                        baseColor, 1.0, nil];
+    return [progressGradient autorelease];
 }
 
-CTGradient * fProgressWhiteGradient = nil;
-+ (CTGradient *) progressWhiteGradient
+NSGradient * fProgressWhiteGradient = nil;
++ (NSGradient *) progressWhiteGradient
 {
     if (!fProgressWhiteGradient)
@@ -75 +50 @@
 }
 
-CTGradient * fProgressGrayGradient = nil;
-+ (CTGradient *) progressGrayGradient
+NSGradient * fProgressGrayGradient = nil;
++ (NSGradient *) progressGrayGradient
 {
     if (!fProgressGrayGradient)
@@ -83 +58 @@
 }
 
-CTGradient * fProgressLightGrayGradient = nil;
-+ (CTGradient *) progressLightGrayGradient
+NSGradient * fProgressLightGrayGradient = nil;
++ (NSGradient *) progressLightGrayGradient
 {
     if (!fProgressLightGrayGradient)
@@ -91 +66 @@
 }
 
-CTGradient * fProgressBlueGradient = nil;
-+ (CTGradient *) progressBlueGradient
+NSGradient * fProgressBlueGradient = nil;
++ (NSGradient *) progressBlueGradient
 {
     if (!fProgressBlueGradient)
@@ -99 +74 @@
 }
 
-CTGradient * fProgressDarkBlueGradient = nil;
-+ (CTGradient *) progressDarkBlueGradient
+NSGradient * fProgressDarkBlueGradient = nil;
++ (NSGradient *) progressDarkBlueGradient
 {
     if (!fProgressDarkBlueGradient)
@@ -107 +82 @@
 }
 
-CTGradient * fProgressGreenGradient = nil;
-+ (CTGradient *) progressGreenGradient
+NSGradient * fProgressGreenGradient = nil;
++ (NSGradient *) progressGreenGradient
 {
     if (!fProgressGreenGradient)
@@ -115 +90 @@
 }
 
-CTGradient * fProgressLightGreenGradient = nil;
-+ (CTGradient *) progressLightGreenGradient
+NSGradient * fProgressLightGreenGradient = nil;
++ (NSGradient *) progressLightGreenGradient
 {
     if (!fProgressLightGreenGradient)
@@ -123 +98 @@
 }
 
-CTGradient * fProgressDarkGreenGradient = nil;
-+ (CTGradient *) progressDarkGreenGradient
+NSGradient * fProgressDarkGreenGradient = nil;
++ (NSGradient *) progressDarkGreenGradient
 {
     if (!fProgressDarkGreenGradient)
@@ -131 +106 @@
 }
 
-CTGradient * fProgressRedGradient = nil;
-+ (CTGradient *) progressRedGradient
+NSGradient * fProgressRedGradient = nil;
++ (NSGradient *) progressRedGradient
 {
     if (!fProgressRedGradient)
@@ -139 +114 @@
 }
 
-CTGradient * fProgressYellowGradient = nil;
-+ (CTGradient *) progressYellowGradient
+NSGradient * fProgressYellowGradient = nil;
++ (NSGradient *) progressYellowGradient
 {
     if (!fProgressYellowGradient)

trunk/macosx/QuickLookController.m

@@ -145 +145 @@
         fInfoController = infoController;
         
-        //load the QuickLook framework and set the delegate, no point on trying this on Tiger
+        //load the QuickLook framework and set the delegate
         //animation types: 0 = none; 1 = fade; 2 = zoom
         fQuickLookAvailable = [[NSBundle bundleWithPath: @"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load];

trunk/macosx/StatsWindowController.m

@@ -25 +25 @@
 #import "StatsWindowController.h"
 #import "NSStringAdditions.h"
-#import "NSApplicationAdditions.h"
 
 #define UPDATE_SECONDS 1.0
@@ -147 +146 @@
     [alert addButtonWithTitle: NSLocalizedString(@"Reset", "Stats reset -> button")];
     [alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Stats reset -> button")];
-    
-    if ([NSApp isOnLeopardOrBetter])
-        [alert setShowsSuppressionButton: YES];
-    else
-        [alert addButtonWithTitle: NSLocalizedString(@"Don't Alert Again", "Stats reset -> button")];
+    [alert setShowsSuppressionButton: YES];
     
     [alert beginSheetModalForWindow: [self window] modalDelegate: self
@@ -211 +206 @@
     [[alert window] orderOut: nil];
     
-    if (([NSApp isOnLeopardOrBetter] ? [[alert suppressionButton] state] == NSOnState : code == NSAlertThirdButtonReturn))
+    if ([[alert suppressionButton] state] == NSOnState)
         [[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningResetStats"];
     

trunk/macosx/Torrent.m

@@ -26 +26 @@
 #import "GroupsController.h"
 #import "FileListNode.h"
-#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "utils.h" //tr_httpIsValidURL
@@ -557 +556 @@
     if ((volumeName = [[fileManager componentsToDisplayForPath: downloadFolder] objectAtIndex: 0]))
     {
-        BOOL onLeopard = [NSApp isOnLeopardOrBetter];
-        
-        NSDictionary * systemAttributes = onLeopard ? [fileManager attributesOfFileSystemForPath: downloadFolder error: NULL]
-                                            : [fileManager fileSystemAttributesAtPath: downloadFolder];
+        NSDictionary * systemAttributes = [fileManager attributesOfFileSystemForPath: downloadFolder error: NULL];
         uint64_t remainingSpace = [[systemAttributes objectForKey: NSFileSystemFreeSize] unsignedLongLongValue];
         
@@ -576 +572 @@
             [alert addButtonWithTitle: NSLocalizedString(@"Download Anyway", "Torrent disk space alert -> button")];
             
-            if (onLeopard)
-            {
-                [alert setShowsSuppressionButton: YES];
-                [[alert suppressionButton] setTitle: NSLocalizedString(@"Do not check disk space again",
-                                                        "Torrent disk space alert -> button")];
-            }
-            else
-                [alert addButtonWithTitle: NSLocalizedString(@"Always Download", "Torrent disk space alert -> button")];
+            [alert setShowsSuppressionButton: YES];
+            [[alert suppressionButton] setTitle: NSLocalizedString(@"Do not check disk space again",
+                                                    "Torrent disk space alert -> button")];
 
             NSInteger result = [alert runModal];
-            if ((onLeopard ? [[alert suppressionButton] state] == NSOnState : result == NSAlertThirdButtonReturn))
+            if ([[alert suppressionButton] state] == NSOnState)
                 [fDefaults setBool: NO forKey: @"WarningRemainingSpace"];
             [alert release];
@@ -1988 +1979 @@
     {
         //if cannot trash, just delete it (will work if it's on a remote volume)
-        if ([NSApp isOnLeopardOrBetter])
-        {
-            NSError * error;
-            if (![[NSFileManager defaultManager] removeItemAtPath: path error: &error])
-                NSLog(@"Could not trash %@: %@", path, [error localizedDescription]);
-        }
-        else
-        {
-            if (![[NSFileManager defaultManager] removeFileAtPath: path handler: nil])
-                NSLog(@"Could not trash %@", path);
-        }
+        NSError * error;
+        if (![[NSFileManager defaultManager] removeItemAtPath: path error: &error])
+            NSLog(@"Could not trash %@: %@", path, [error localizedDescription]);
     }
 }
@@ -2004 +1987 @@
 - (void) setTimeMachineExclude: (BOOL) exclude forPath: (NSString *) path
 {
-    if ([NSApp isOnLeopardOrBetter])
-        CSBackupSetItemExcluded((CFURLRef)[NSURL fileURLWithPath: path], exclude, true);
+    CSBackupSetItemExcluded((CFURLRef)[NSURL fileURLWithPath: path], exclude, true);
 }
 

trunk/macosx/TorrentCell.m

@@ -26 +26 @@
 #import "TorrentTableView.h"
 #import "GroupsController.h"
-#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
-#import "NSBezierPathAdditions.h"
 #import "ProgressGradients.h"
-#import "CTGradient.h"
 
 #define BAR_HEIGHT 12.0f
@@ -295 +292 @@
     else;
     
-    if ([NSApp isOnLeopardOrBetter])
-        [controlView updateTrackingAreas];
+    [controlView updateTrackingAreas];
     
     return YES;
@@ -400 +396 @@
         
         //border
-        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect radius: radius];
+        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius];
         [darkGroupColor set];
         [bp setLineWidth: 2.0f];
@@ -406 +402 @@
         
         //inside
-        bp = [NSBezierPath bezierPathWithRoundedRect: groupRect radius: radius];
-        CTGradient * gradient = [CTGradient gradientWithBeginningColor: [groupColor blendedColorWithFraction: 0.7f
+        bp = [NSBezierPath bezierPathWithRoundedRect: groupRect xRadius: radius yRadius: radius];
+        NSGradient * gradient = [[NSGradient alloc] initWithStartingColor: [groupColor blendedColorWithFraction: 0.7f
                                     ofColor: [NSColor whiteColor]] endingColor: darkGroupColor];
-        [gradient fillBezierPath: bp angle: 90.0f];
+        [gradient drawInBezierPath: bp angle: 90.0f];
+        [gradient release];
     }
     
@@ -590 +587 @@
             noIncludeRect.size.width = rightNoIncludeWidth;
             
-            [[ProgressGradients progressLightGrayGradient] fillRect: noIncludeRect angle: 90];
+            [[ProgressGradients progressLightGrayGradient] drawInRect: noIncludeRect angle: 90];
         }
         
@@ -607 +604 @@
                     notAvailableRect.size.width = notAvailableWidth;
                     
-                    [[ProgressGradients progressRedGradient] fillRect: notAvailableRect angle: 90];
+                    [[ProgressGradients progressRedGradient] drawInRect: notAvailableRect angle: 90];
                 }
             }
@@ -617 +614 @@
                 includeRect.size.width = rightWidth;
                 
-                [[ProgressGradients progressWhiteGradient] fillRect: includeRect angle: 90];
+                [[ProgressGradients progressWhiteGradient] drawInRect: includeRect angle: 90];
             }
         }
@@ -630 +627 @@
         {
             if ([torrent isChecking])
-                [[ProgressGradients progressYellowGradient] fillRect: completeRect angle: 90];
+                [[ProgressGradients progressYellowGradient] drawInRect: completeRect angle: 90];
             else if ([torrent isSeeding])
             {
@@ -642 +639 @@
                     ratioLeftRect.size.width = ratioLeftWidth;
                     
-                    [[ProgressGradients progressLightGreenGradient] fillRect: ratioLeftRect angle: 90];
+                    [[ProgressGradients progressLightGreenGradient] drawInRect: ratioLeftRect angle: 90];
                 }
                 
@@ -649 +646 @@
                     completeRect.size.width = leftWidth;
                     
-                    [[ProgressGradients progressGreenGradient] fillRect: completeRect angle: 90];
+                    [[ProgressGradients progressGreenGradient] drawInRect: completeRect angle: 90];
                 }
             }
             else
-                [[ProgressGradients progressBlueGradient] fillRect: completeRect angle: 90];
+                [[ProgressGradients progressBlueGradient] drawInRect: completeRect angle: 90];
         }
         else
@@ -660 +657 @@
             {
                 if ([torrent progressLeft] <= 0.0f)
-                    [[ProgressGradients progressDarkGreenGradient] fillRect: completeRect angle: 90];
+                    [[ProgressGradients progressDarkGreenGradient] drawInRect: completeRect angle: 90];
                 else
-                    [[ProgressGradients progressDarkBlueGradient] fillRect: completeRect angle: 90];
+                    [[ProgressGradients progressDarkBlueGradient] drawInRect: completeRect angle: 90];
             }
             else
-                [[ProgressGradients progressGrayGradient] fillRect: completeRect angle: 90];
+                [[ProgressGradients progressGrayGradient] drawInRect: completeRect angle: 90];
         }
     }

trunk/macosx/TorrentTableView.m

@@ -29 +29 @@
 #import "FileListNode.h"
 #import "QuickLookController.h"
-#import "NSApplicationAdditions.h"
 
 #define MAX_GROUP 999999
@@ -44 +43 @@
 @interface TorrentTableView (Private)
 
-//unused on Leopard
-- (BOOL) pointInControlRect: (NSPoint) point;
-- (BOOL) pointInRevealRect: (NSPoint) point;
-- (BOOL) pointInActionRect: (NSPoint) point;
-
 - (BOOL) pointInGroupStatusRect: (NSPoint) point;
 
@@ -66 +60 @@
         
         fTorrentCell = [[TorrentCell alloc] init];
-        
-        if (![NSApp isOnLeopardOrBetter])
-        {
-            NSTableColumn * groupColumn = [self tableColumnWithIdentifier: @"Group"];
-            [self setOutlineTableColumn: groupColumn];
-            
-            //remove all unnecessary columns
-            for (NSInteger i = [[self tableColumns] count]-1; i >= 0; i--)
-            {
-                NSTableColumn * column = [[self tableColumns] objectAtIndex: i];
-                if (column != groupColumn)
-                    [self removeTableColumn: column];
-            }
-            
-            [self sizeLastColumnToFit];
-            
-            [groupColumn setDataCell: fTorrentCell];
-        }
         
         NSData * groupData = [fDefaults dataForKey: @"CollapsedGroups"];
@@ -176 +152 @@
         [cell setRepresentedObject: item];
         
-        NSInteger row = [self rowForItem: item];
-        if ([NSApp isOnLeopardOrBetter])
-        {
-            [cell setControlHover: row == fMouseControlRow];
-            [cell setRevealHover: row == fMouseRevealRow];
-            [cell setActionHover: row == fMouseActionRow];
-        }
+        const NSInteger row = [self rowForItem: item];
+        [cell setControlHover: row == fMouseControlRow];
+        [cell setRevealHover: row == fMouseRevealRow];
+        [cell setActionHover: row == fMouseActionRow];
         [cell setActionPushed: row == fActionPushedRow];
     }
@@ -205 +178 @@
 - (NSRect) frameOfCellAtColumn: (NSInteger) column row: (NSInteger) row
 {
-    if (column == -1 || ![NSApp isOnLeopardOrBetter])
+    if (column == -1)
         return [self rectOfRow: row];
     else
@@ -273 +246 @@
     fMouseActionRow = -1;
     
-    if (![NSApp isOnLeopardOrBetter])
-        return;
-    
     NSEnumerator * enumerator = [[self trackingAreas] objectEnumerator];
     NSTrackingArea * area;
@@ -388 +358 @@
     }
     
-    BOOL pushed;
-    if ([NSApp isOnLeopardOrBetter])
-        pushed = row != -1 && (fMouseActionRow == row || fMouseRevealRow == row || fMouseControlRow == row);
-    else
-        pushed = [self pointInControlRect: point] || [self pointInRevealRect: point] || [self pointInActionRect: point];
+    const BOOL pushed = row != -1 && (fMouseActionRow == row || fMouseRevealRow == row || fMouseControlRow == row);
     
     //if pushing a button, don't change the selected rows
@@ -404 +370 @@
     
     //avoid weird behavior when showing menu by doing this after mouse down
-    if ([NSApp isOnLeopardOrBetter] ? row != -1 && fMouseActionRow == row : [self pointInActionRect: point])
+    if (row != -1 && fMouseActionRow == row)
     {
         fActionPushedRow = row;
@@ -884 +850 @@
 @implementation TorrentTableView (Private)
 
-- (BOOL) pointInControlRect: (NSPoint) point
-{
-    NSInteger row = [self rowAtPoint: point];
-    if (row < 0 || ![[self itemAtRow: row] isKindOfClass: [Torrent class]])
-        return NO;
-    
-    return NSPointInRect(point, [fTorrentCell controlButtonRectForBounds: [self rectOfRow: row]]);
-}
-
-- (BOOL) pointInRevealRect: (NSPoint) point
-{
-    NSInteger row = [self rowAtPoint: point];
-    if (row < 0 || ![[self itemAtRow: row] isKindOfClass: [Torrent class]])
-        return NO;
-    
-    return NSPointInRect(point, [fTorrentCell revealButtonRectForBounds: [self rectOfRow: row]]);
-}
-
-- (BOOL) pointInActionRect: (NSPoint) point
-{
-    NSInteger row = [self rowAtPoint: point];
-    if (row < 0 || ![[self itemAtRow: row] isKindOfClass: [Torrent class]])
-        return NO;
-    
-    return NSPointInRect(point, [fTorrentCell iconRectForBounds: [self rectOfRow: row]]);
-}
-
 - (BOOL) pointInGroupStatusRect: (NSPoint) point
 {

trunk/macosx/TransmissionHelp/html/pffirewall.html

@@ -21 +21 @@
                         </div>
                                 <br>
-                                <h3>On 10.4 Tiger</h3>
-                                <div summary="To do this" id="taskbox">
-                                        <ol>
-                                                <li>Open Transmission, go to Preferences >> Network and enter a number for the port. It is recommended you pick a random number between 49152 and 65535. Let's use 50001 for now. Then quit Transmission. </li>
-                                                <li>Open System Prefs >> Sharing >> Firewall. Click "New." In the "Port Name" pop-up menu, select Other, and fill in the settings as follows: </li>
-                                                        <ul>
-                                                                <li>TCP Port Number(s): the port you chose in step 1 - eg 50001. </li>
-                                                                <li>UDP Port Number(s): the port you chose in step 1 - eg 50001. </li>
-                                                                <li>Description: Transmission </li>
-                                                        </ul>
-                                                <li>Click OK. </li>
-                                                <p>NB: To disable the firewall, click Stop.
-                                        </ol>
-                                </div>
-                                <h3>On 10.5 Leopard</h3>
                                 <p>Upon opening Transmission for the first time, a Mac OS X dialogue box should appear asking if you will allow Transmission to receive incoming connections. Click Accept.
                                 <p>If this doesn't happen, you can add Transmission to Leopard's firewall manually:

trunk/macosx/en.lproj/MainMenu.xib

@@ -9 +9 @@
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                         <bool key="EncodedWithXMLCoder">YES</bool>
+                        <integer value="2"/>
                         <integer value="1603"/>
                         <integer value="1480"/>
                         <integer value="456"/>
-                        <integer value="3078"/>
-                        <integer value="2"/>
                 </object>
                 <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -73 +72 @@
                                                                 <int key="NSButtonFlags">-2031075073</int>
                                                                 <int key="NSButtonFlags2">96</int>
-                                                                <object class="NSImage" key="NSNormalImage">
-                                                                        <int key="NSImageFlags">549650432</int>
-                                                                        <string key="NSSize">{1, 1}</string>
-                                                                        <object class="NSMutableArray" key="NSReps">
-                                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                <object class="NSArray">
-                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                        <integer value="0" id="8"/>
-                                                                                        <object class="NSBitmapImageRep">
-                                                                                                <object class="NSData" key="NSTIFFRepresentation">
-                                                                                                        <bytes key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEgAAAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
-                                                                                                </object>
-                                                                                        </object>
-                                                                                </object>
-                                                                        </object>
-                                                                        <object class="NSColor" key="NSColor" id="98649701">
-                                                                                <int key="NSColorSpace">3</int>
-                                                                                <bytes key="NSWhite">MCAwAA</bytes>
-                                                                        </object>
+                                                                <object class="NSCustomResource" key="NSNormalImage" id="514467402">
+                                                                        <string key="NSClassName">NSImage</string>
+                                                                        <string key="NSResourceName">NSActionTemplate</string>
                                                                 </object>
                                                                 <string key="NSAlternateContents"/>
@@ -108 +89 @@
                                                                         <int key="NSKeyEquivModMask">1048576</int>
                                                                         <int key="NSMnemonicLoc">2147483647</int>
+                                                                        <reference key="NSImage" ref="514467402"/>
                                                                         <object class="NSCustomResource" key="NSOnImage" id="322614661">
                                                                                 <string key="NSClassName">NSImage</string>
@@ -221 +203 @@
                                                                 </object>
                                                         </object>
-                                                </object>
-                                                <object class="NSBox" id="382627929">
-                                                        <reference key="NSNextResponder" ref="303120456"/>
-                                                        <int key="NSvFlags">290</int>
-                                                        <string key="NSFrame">{{0, 20}, {468, 5}}</string>
-                                                        <reference key="NSSuperview" ref="303120456"/>
-                                                        <string key="NSOffsets">{0, 0}</string>
-                                                        <object class="NSTextFieldCell" key="NSTitleCell">
-                                                                <int key="NSCellFlags">67239424</int>
-                                                                <int key="NSCellFlags2">0</int>
-                                                                <string key="NSContents">Box</string>
-                                                                <reference key="NSSupport" ref="622385820"/>
-                                                                <object class="NSColor" key="NSBackgroundColor" id="570792161">
-                                                                        <int key="NSColorSpace">6</int>
-                                                                        <string key="NSCatalogName">System</string>
-                                                                        <string key="NSColorName">textBackgroundColor</string>
-                                                                        <object class="NSColor" key="NSColor" id="162898637">
-                                                                                <int key="NSColorSpace">3</int>
-                                                                                <bytes key="NSWhite">MQA</bytes>
-                                                                        </object>
-                                                                </object>
-                                                                <object class="NSColor" key="NSTextColor">
-                                                                        <int key="NSColorSpace">3</int>
-                                                                        <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-                                                                </object>
-                                                        </object>
-                                                        <int key="NSBorderType">3</int>
-                                                        <int key="NSBoxType">2</int>
-                                                        <int key="NSTitlePosition">0</int>
-                                                        <bool key="NSTransparent">NO</bool>
                                                 </object>
                                                 <object class="NSScrollView" id="87647552">
@@ -306 +258 @@
                                                                                                                                 <object class="NSArray">
                                                                                                                                         <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                        <reference ref="8"/>
+                                                                                                                                        <integer value="0" id="8"/>
                                                                                                                                         <object class="NSCachedImageRep">
                                                                                                                                                 <object class="NSData" key="NSTIFFRepresentation">
@@ -1832 +1784 @@
                                                                                                                                 </object>
                                                                                                                         </object>
-                                                                                                                        <reference key="NSColor" ref="98649701"/>
+                                                                                                                        <object class="NSColor" key="NSColor" id="98649701">
+                                                                                                                                <int key="NSColorSpace">3</int>
+                                                                                                                                <bytes key="NSWhite">MCAwAA</bytes>
+                                                                                                                        </object>
                                                                                                                 </object>
                                                                                                                 <reference key="NSSupport" ref="26"/>
@@ -1856 +1811 @@
                                                                                                                         <string key="NSCatalogName">System</string>
                                                                                                                         <string key="NSColorName">headerColor</string>
-                                                                                                                        <reference key="NSColor" ref="162898637"/>
+                                                                                                                        <object class="NSColor" key="NSColor" id="162898637">
+                                                                                                                                <int key="NSColorSpace">3</int>
+                                                                                                                                <bytes key="NSWhite">MQA</bytes>
+                                                                                                                        </object>
                                                                                                                 </object>
                                                                                                                 <reference key="NSTextColor" ref="441405713"/>
@@ -2000 +1958 @@
                                                                         <string key="NSFrameSize">{468, 173}</string>
                                                                         <reference key="NSSuperview" ref="87647552"/>
-                                                                        <reference key="NSNextKeyView" ref="675318801"/>
                                                                         <reference key="NSDocView" ref="675318801"/>
                                                                         <reference key="NSBGColor" ref="139722115"/>
@@ -2027 +1984 @@
                                                         <string key="NSFrame">{{0, 23}, {468, 173}}</string>
                                                         <reference key="NSSuperview" ref="303120456"/>
-                                                        <reference key="NSNextKeyView" ref="306237956"/>
                                                         <int key="NSsFlags">528</int>
                                                         <reference key="NSVScroller" ref="1068338331"/>
@@ -3595 +3551 @@
                                                 </object>
                                         </object>
-                                        <object class="NSTextField" id="914996384">
-                                                <reference key="NSNextResponder" ref="492482618"/>
-                                                <int key="NSvFlags">-2147483382</int>
-                                                <string key="NSFrame">{{21, 4}, {184, 14}}</string>
-                                                <reference key="NSSuperview" ref="492482618"/>
-                                                <bool key="NSEnabled">YES</bool>
-                                                <object class="NSTextFieldCell" key="NSCell" id="1054398883">
-                                                        <int key="NSCellFlags">67239488</int>
-                                                        <int key="NSCellFlags2">272761856</int>
-                                                        <string key="NSContents">Ratio 999.9</string>
-                                                        <reference key="NSSupport" ref="26"/>
-                                                        <reference key="NSControlView" ref="914996384"/>
-                                                        <reference key="NSBackgroundColor" ref="969793804"/>
-                                                        <reference key="NSTextColor" ref="911300388"/>
-                                                </object>
-                                        </object>
-                                        <object class="NSImageView" id="679494460">
-                                                <reference key="NSNextResponder" ref="492482618"/>
-                                                <int key="NSvFlags">-2147483380</int>
-                                                <object class="NSMutableSet" key="NSDragTypes">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <object class="NSMutableArray" key="set.sortedObjects">
-                                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                <string>Apple PDF pasteboard type</string>
-                                                                <string>Apple PICT pasteboard type</string>
-                                                                <string>Apple PNG pasteboard type</string>
-                                                                <string>NSFilenamesPboardType</string>
-                                                                <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-                                                                <string>NeXT TIFF v4.0 pasteboard type</string>
-                                                        </object>
-                                                </object>
-                                                <string key="NSFrame">{{10, 5}, {10, 12}}</string>
-                                                <reference key="NSSuperview" ref="492482618"/>
-                                                <bool key="NSEnabled">YES</bool>
-                                                <object class="NSImageCell" key="NSCell" id="50727597">
-                                                        <int key="NSCellFlags">130560</int>
-                                                        <int key="NSCellFlags2">33554432</int>
-                                                        <object class="NSCustomResource" key="NSContents" id="814379806">
-                                                                <string key="NSClassName">NSImage</string>
-                                                                <string key="NSResourceName">YingYangTemplate</string>
-                                                        </object>
-                                                        <int key="NSAlign">0</int>
-                                                        <int key="NSScale">0</int>
-                                                        <int key="NSStyle">0</int>
-                                                        <bool key="NSAnimates">NO</bool>
-                                                </object>
-                                                <bool key="NSEditable">YES</bool>
-                                        </object>
                                 </object>
                                 <string key="NSFrameSize">{400, 21}</string>
@@ -3672 +3580 @@
                                                         <bool key="NSDrawsBackground">YES</bool>
                                                         <int key="NSTextBezelStyle">1</int>
-                                                        <reference key="NSBackgroundColor" ref="570792161"/>
+                                                        <object class="NSColor" key="NSBackgroundColor" id="570792161">
+                                                                <int key="NSColorSpace">6</int>
+                                                                <string key="NSCatalogName">System</string>
+                                                                <string key="NSColorName">textBackgroundColor</string>
+                                                                <reference key="NSColor" ref="162898637"/>
+                                                        </object>
                                                         <reference key="NSTextColor" ref="911300388"/>
                                                         <object class="NSButtonCell" key="NSSearchButtonCell">
@@ -4614 +4527 @@
                                                 <int key="NSKeyEquivModMask">1048576</int>
                                                 <int key="NSMnemonicLoc">2147483647</int>
-                                                <reference key="NSImage" ref="814379806"/>
+                                                <object class="NSCustomResource" key="NSImage">
+                                                        <string key="NSClassName">NSImage</string>
+                                                        <string key="NSResourceName">YingYangTemplate</string>
+                                                </object>
                                                 <reference key="NSOnImage" ref="322614661"/>
                                                 <reference key="NSMixedImage" ref="3851078"/>
@@ -5828 +5744 @@
                                 <object class="IBConnectionRecord">
                                         <object class="IBOutletConnection" key="connection">
-                                                <string key="label">menu</string>
-                                                <reference key="source" ref="914996384"/>
-                                                <reference key="destination" ref="235340910"/>
-                                        </object>
-                                        <int key="connectionID">2755</int>
-                                </object>
-                                <object class="IBConnectionRecord">
-                                        <object class="IBOutletConnection" key="connection">
-                                                <string key="label">fStatusTigerField</string>
-                                                <reference key="source" ref="30116300"/>
-                                                <reference key="destination" ref="914996384"/>
-                                        </object>
-                                        <int key="connectionID">2756</int>
-                                </object>
-                                <object class="IBConnectionRecord">
-                                        <object class="IBOutletConnection" key="connection">
-                                                <string key="label">fStatusTigerImageView</string>
-                                                <reference key="source" ref="30116300"/>
-                                                <reference key="destination" ref="679494460"/>
-                                        </object>
-                                        <int key="connectionID">2757</int>
-                                </object>
-                                <object class="IBConnectionRecord">
-                                        <object class="IBOutletConnection" key="connection">
-                                                <string key="label">fBottomTigerLine</string>
-                                                <reference key="source" ref="30116300"/>
-                                                <reference key="destination" ref="382627929"/>
-                                        </object>
-                                        <int key="connectionID">2810</int>
-                                </object>
-                                <object class="IBConnectionRecord">
-                                        <object class="IBOutletConnection" key="connection">
                                                 <string key="label">delegate</string>
                                                 <reference key="source" ref="256186660"/>
@@ -6331 +6215 @@
                                                         <reference ref="403739499"/>
                                                         <reference ref="87647552"/>
-                                                        <reference ref="382627929"/>
                                                 </object>
                                                 <reference key="parent" ref="405103408"/>
@@ -7499 +7382 @@
                                                         <reference ref="508355629"/>
                                                         <reference ref="387610893"/>
-                                                        <reference ref="914996384"/>
-                                                        <reference ref="679494460"/>
                                                 </object>
                                                 <reference key="parent" ref="52096491"/>
@@ -7547 +7428 @@
                                                         <bool key="EncodedWithXMLCoder">YES</bool>
                                                         <reference ref="9693266"/>
-                                                </object>
-                                                <reference key="parent" ref="492482618"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">2731</int>
-                                                <reference key="object" ref="914996384"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <reference ref="1054398883"/>
-                                                </object>
-                                                <reference key="parent" ref="492482618"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">2743</int>
-                                                <reference key="object" ref="679494460"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <reference ref="50727597"/>
                                                 </object>
                                                 <reference key="parent" ref="492482618"/>
@@ -8008 +7871 @@
                                         </object>
                                         <object class="IBObjectRecord">
-                                                <int key="objectID">3055</int>
-                                                <reference key="object" ref="1054398883"/>
-                                                <reference key="parent" ref="914996384"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">3056</int>
-                                                <reference key="object" ref="50727597"/>
-                                                <reference key="parent" ref="679494460"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
                                                 <int key="objectID">3057</int>
                                                 <reference key="object" ref="186597542"/>
@@ -8322 +8175 @@
                                                 <reference key="object" ref="765429693"/>
                                                 <reference key="parent" ref="455126894"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">2785</int>
-                                                <reference key="object" ref="382627929"/>
-                                                <reference key="parent" ref="303120456"/>
                                         </object>
                                         <object class="IBObjectRecord">
@@ -8772 +8620 @@
                                         <string>2564.IBPluginDependency</string>
                                         <string>2564.ImportedFromIB2</string>
-                                        <string>2681.CustomClassName</string>
                                         <string>2681.IBPluginDependency</string>
                                         <string>2681.ImportedFromIB2</string>
+                                        <string>2683.IBEditorWindowLastContentRect</string>
                                         <string>2683.IBPluginDependency</string>
                                         <string>2683.ImportedFromIB2</string>
@@ -8787 +8635 @@
                                         <string>2700.IBPluginDependency</string>
                                         <string>2700.ImportedFromIB2</string>
-                                        <string>2731.CustomClassName</string>
-                                        <string>2731.IBPluginDependency</string>
-                                        <string>2731.ImportedFromIB2</string>
-                                        <string>2743.IBPluginDependency</string>
-                                        <string>2743.ImportedFromIB2</string>
-                                        <string>2785.IBPluginDependency</string>
-                                        <string>2785.ImportedFromIB2</string>
                                         <string>2839.IBPluginDependency</string>
                                         <string>2839.ImportedFromIB2</string>
@@ -8855 +8696 @@
                                         <string>3053.IBPluginDependency</string>
                                         <string>3054.IBPluginDependency</string>
-                                        <string>3055.IBPluginDependency</string>
-                                        <string>3056.IBPluginDependency</string>
                                         <string>3057.IBPluginDependency</string>
                                         <string>3058.IBPluginDependency</string>
@@ -9055 +8894 @@
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <reference ref="9"/>
-                                        <string>{{0, 799}, {400, 21}}</string>
+                                        <string>{{208, 808}, {400, 21}}</string>
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <reference ref="9"/>
@@ -9115 +8954 @@
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <reference ref="9"/>
-                                        <string>{{0, 797}, {457, 23}}</string>
+                                        <string>{{382, 705}, {457, 23}}</string>
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <reference ref="9"/>
@@ -9323 +9162 @@
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <reference ref="9"/>
-                                        <string>{{52, 624}, {468, 196}}</string>
-                                        <string>{{52, 624}, {468, 196}}</string>
+                                        <string>{{350, 492}, {468, 196}}</string>
+                                        <string>{{350, 492}, {468, 196}}</string>
                                         <reference ref="9"/>
                                         <string>{{52, 684}, {468, 196}}</string>
@@ -9383 +9222 @@
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <reference ref="9"/>
-                                        <string>ActionPopUpButton</string>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <reference ref="9"/>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <reference ref="9"/>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <reference ref="9"/>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <reference ref="9"/>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <reference ref="9"/>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <reference ref="9"/>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <reference ref="9"/>
-                                        <string>MenuLabel</string>
+                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                        <reference ref="9"/>
+                                        <string>{{346, 449}, {108, 63}}</string>
+                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                        <reference ref="9"/>
+                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                        <reference ref="9"/>
+                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                        <reference ref="9"/>
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <reference ref="9"/>
@@ -9458 +9290 @@
                                         <reference ref="9"/>
                                         <string>{{396, 658}, {236, 243}}</string>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -9595 +9425 @@
                         <object class="NSMutableArray" key="referencedPartialClassDescriptions">
                                 <bool key="EncodedWithXMLCoder">YES</bool>
-                                <object class="IBPartialClassDescription">
-                                        <string key="className">ActionPopUpButton</string>
-                                        <string key="superclassName">NSPopUpButton</string>
-                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                                <string key="majorKey">IBProjectSource</string>
-                                                <string key="minorKey">macosx/ActionPopUpButton.h</string>
-                                        </object>
-                                </object>
-                                <object class="IBPartialClassDescription">
-                                        <string key="className">ActionPopUpButton</string>
-                                        <string key="superclassName">NSPopUpButton</string>
-                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                                <string key="majorKey">IBUserSource</string>
-                                                <string key="minorKey"/>
-                                        </object>
-                                </object>
                                 <object class="IBPartialClassDescription">
                                         <string key="className">Controller</string>
@@ -9739 +9553 @@
                                                         <string>fActionButton</string>
                                                         <string>fActiveFilterButton</string>
-                                                        <string>fBottomTigerLine</string>
                                                         <string>fCheckRatioItem</string>
                                                         <string>fDockMenu</string>
@@ -9765 +9578 @@
                                                         <string>fStatusBar</string>
                                                         <string>fStatusButton</string>
-                                                        <string>fStatusTigerField</string>
-                                                        <string>fStatusTigerImageView</string>
                                                         <string>fTableView</string>
                                                         <string>fTotalDLField</string>
@@ -9784 +9595 @@
                                                         <string>NSButton</string>
                                                         <string>FilterButton</string>
-                                                        <string>NSBox</string>
                                                         <string>NSMenuItem</string>
                                                         <string>NSMenu</string>
@@ -9810 +9620 @@
                                                         <string>StatusBarView</string>
                                                         <string>NSButton</string>
-                                                        <string>MenuLabel</string>
-                                                        <string>NSImageView</string>
                                                         <string>TorrentTableView</string>
                                                         <string>NSTextField</string>
@@ -9922 +9730 @@
                                 </object>
                                 <object class="IBPartialClassDescription">
-                                        <string key="className">MenuLabel</string>
-                                        <string key="superclassName">NSTextField</string>
-                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                                <string key="majorKey">IBProjectSource</string>
-                                                <string key="minorKey">macosx/MenuLabel.h</string>
-                                        </object>
-                                </object>
-                                <object class="IBPartialClassDescription">
-                                        <string key="className">MenuLabel</string>
-                                        <string key="superclassName">NSTextField</string>
-                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                                <string key="majorKey">IBUserSource</string>
-                                                <string key="minorKey"/>
-                                        </object>
-                                </object>
-                                <object class="IBPartialClassDescription">
                                         <string key="className">NSApplication</string>
                                         <object class="IBClassDescriptionSource" key="sourceIdentifier">

trunk/macosx/en.lproj/PrefsWindow.xib

@@ -3 +3 @@
         <data>
                 <int key="IBDocument.SystemTarget">1050</int>
-                <string key="IBDocument.SystemVersion">9F33</string>
+                <string key="IBDocument.SystemVersion">9G55</string>
                 <string key="IBDocument.InterfaceBuilderVersion">677</string>
-                <string key="IBDocument.AppKitVersion">949.34</string>
-                <string key="IBDocument.HIToolboxVersion">352.00</string>
+                <string key="IBDocument.AppKitVersion">949.43</string>
+                <string key="IBDocument.HIToolboxVersion">353.00</string>
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                         <bool key="EncodedWithXMLCoder">YES</bool>
-                        <integer value="66"/>
+                        <integer value="1760"/>
                 </object>
                 <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -1527 +1527 @@
                         </object>
                         <object class="NSCustomView" id="284666863">
-                                <nil key="NSNextResponder"/>
+                                <reference key="NSNextResponder"/>
                                 <int key="NSvFlags">256</int>
                                 <object class="NSMutableArray" key="NSSubviews">
@@ -3282 +3282 @@
                                                 </object>
                                         </object>
-                                        <object class="NSCustomView" id="391284286">
+                                        <object class="NSButton" id="31476212">
                                                 <reference key="NSNextResponder" ref="284666863"/>
-                                                <int key="NSvFlags">292</int>
-                                                <object class="NSMutableArray" key="NSSubviews">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <object class="NSButton" id="31476212">
-                                                                <reference key="NSNextResponder" ref="391284286"/>
-                                                                <int key="NSvFlags">268</int>
-                                                                <string key="NSFrame">{{2, 54}, {323, 18}}</string>
-                                                                <reference key="NSSuperview" ref="391284286"/>
-                                                                <bool key="NSEnabled">YES</bool>
-                                                                <object class="NSButtonCell" key="NSCell" id="23936638">
-                                                                        <int key="NSCellFlags">-2080244224</int>
-                                                                        <int key="NSCellFlags2">0</int>
-                                                                        <string key="NSContents">Assign group to new transfers based on criteria</string>
-                                                                        <reference key="NSSupport" ref="86725571"/>
-                                                                        <reference key="NSControlView" ref="31476212"/>
-                                                                        <int key="NSButtonFlags">1211912703</int>
-                                                                        <int key="NSButtonFlags2">130</int>
-                                                                        <reference key="NSNormalImage" ref="1001726176"/>
-                                                                        <reference key="NSAlternateImage" ref="764913887"/>
-                                                                        <string key="NSAlternateContents"/>
-                                                                        <string key="NSKeyEquivalent"/>
-                                                                        <int key="NSPeriodicDelay">200</int>
-                                                                        <int key="NSPeriodicInterval">25</int>
-                                                                </object>
-                                                        </object>
-                                                        <object class="NSButton" id="233310108">
-                                                                <reference key="NSNextResponder" ref="391284286"/>
-                                                                <int key="NSvFlags">268</int>
-                                                                <string key="NSFrame">{{233, 16}, {96, 32}}</string>
-                                                                <reference key="NSSuperview" ref="391284286"/>
-                                                                <bool key="NSEnabled">YES</bool>
-                                                                <object class="NSButtonCell" key="NSCell" id="565625533">
-                                                                        <int key="NSCellFlags">67239424</int>
-                                                                        <int key="NSCellFlags2">134217728</int>
-                                                                        <string type="base64-UTF8" key="NSContents">RWRpdOKApg</string>
-                                                                        <reference key="NSSupport" ref="86725571"/>
-                                                                        <reference key="NSControlView" ref="233310108"/>
-                                                                        <int key="NSButtonFlags">-2038284033</int>
-                                                                        <int key="NSButtonFlags2">129</int>
-                                                                        <string key="NSAlternateContents"/>
-                                                                        <string key="NSKeyEquivalent"/>
-                                                                        <int key="NSPeriodicDelay">200</int>
-                                                                        <int key="NSPeriodicInterval">25</int>
-                                                                </object>
-                                                        </object>
-                                                        <object class="NSTextField" id="360885126">
-                                                                <reference key="NSNextResponder" ref="391284286"/>
-                                                                <int key="NSvFlags">256</int>
-                                                                <string key="NSFrame">{{20, 20}, {214, 28}}</string>
-                                                                <reference key="NSSuperview" ref="391284286"/>
-                                                                <bool key="NSEnabled">YES</bool>
-                                                                <object class="NSTextFieldCell" key="NSCell" id="660134747">
-                                                                        <int key="NSCellFlags">67239424</int>
-                                                                        <int key="NSCellFlags2">272760832</int>
-                                                                        <string key="NSContents">Transfers will be assigned to the first group where all criteria is met</string>
-                                                                        <reference key="NSSupport" ref="26"/>
-                                                                        <reference key="NSControlView" ref="360885126"/>
-                                                                        <reference key="NSBackgroundColor" ref="977951849"/>
-                                                                        <reference key="NSTextColor" ref="540507142"/>
-                                                                </object>
-                                                        </object>
-                                                </object>
-                                                <string key="NSFrame">{{167, 29}, {348, 90}}</string>
+                                                <int key="NSvFlags">268</int>
+                                                <string key="NSFrame">{{169, 85}, {323, 18}}</string>
                                                 <reference key="NSSuperview" ref="284666863"/>
-                                                <string key="NSClassName">NSView</string>
+                                                <bool key="NSEnabled">YES</bool>
+                                                <object class="NSButtonCell" key="NSCell" id="23936638">
+                                                        <int key="NSCellFlags">-2080244224</int>
+                                                        <int key="NSCellFlags2">0</int>
+                                                        <string key="NSContents">Assign group to new transfers based on criteria</string>
+                                                        <reference key="NSSupport" ref="86725571"/>
+                                                        <reference key="NSControlView" ref="31476212"/>
+                                                        <int key="NSButtonFlags">1211912703</int>
+                                                        <int key="NSButtonFlags2">130</int>
+                                                        <reference key="NSNormalImage" ref="1001726176"/>
+                                                        <reference key="NSAlternateImage" ref="764913887"/>
+                                                        <string key="NSAlternateContents"/>
+                                                        <string key="NSKeyEquivalent"/>
+                                                        <int key="NSPeriodicDelay">200</int>
+                                                        <int key="NSPeriodicInterval">25</int>
+                                                </object>
+                                        </object>
+                                        <object class="NSButton" id="233310108">
+                                                <reference key="NSNextResponder" ref="284666863"/>
+                                                <int key="NSvFlags">268</int>
+                                                <string key="NSFrame">{{400, 47}, {96, 32}}</string>
+                                                <reference key="NSSuperview" ref="284666863"/>
+                                                <bool key="NSEnabled">YES</bool>
+                                                <object class="NSButtonCell" key="NSCell" id="565625533">
+                                                        <int key="NSCellFlags">67239424</int>
+                                                        <int key="NSCellFlags2">134217728</int>
+                                                        <string type="base64-UTF8" key="NSContents">RWRpdOKApg</string>
+                                                        <reference key="NSSupport" ref="86725571"/>
+                                                        <reference key="NSControlView" ref="233310108"/>
+                                                        <int key="NSButtonFlags">-2038284033</int>
+                                                        <int key="NSButtonFlags2">129</int>
+                                                        <string key="NSAlternateContents"/>
+                                                        <string key="NSKeyEquivalent"/>
+                                                        <int key="NSPeriodicDelay">200</int>
+                                                        <int key="NSPeriodicInterval">25</int>
+                                                </object>
+                                        </object>
+                                        <object class="NSTextField" id="360885126">
+                                                <reference key="NSNextResponder" ref="284666863"/>
+                                                <int key="NSvFlags">256</int>
+                                                <string key="NSFrame">{{187, 51}, {214, 28}}</string>
+                                                <reference key="NSSuperview" ref="284666863"/>
+                                                <bool key="NSEnabled">YES</bool>
+                                                <object class="NSTextFieldCell" key="NSCell" id="660134747">
+                                                        <int key="NSCellFlags">67239424</int>
+                                                        <int key="NSCellFlags2">272760832</int>
+                                                        <string key="NSContents">Transfers will be assigned to the first group where all criteria is met</string>
+                                                        <reference key="NSSupport" ref="26"/>
+                                                        <reference key="NSControlView" ref="360885126"/>
+                                                        <reference key="NSBackgroundColor" ref="977951849"/>
+                                                        <reference key="NSTextColor" ref="540507142"/>
+                                                </object>
                                         </object>
                                 </object>
                                 <string key="NSFrameSize">{535, 240}</string>
+                                <reference key="NSSuperview"/>
                                 <string key="NSClassName">NSView</string>
                         </object>
@@ -4407 +4398 @@
                         </object>
                         <object class="NSCustomView" id="204700639">
-                                <reference key="NSNextResponder"/>
+                                <nil key="NSNextResponder"/>
                                 <int key="NSvFlags">256</int>
                                 <object class="NSMutableArray" key="NSSubviews">
@@ -5038 +5029 @@
                                 </object>
                                 <string key="NSFrameSize">{535, 345}</string>
-                                <reference key="NSSuperview"/>
                                 <string key="NSClassName">NSView</string>
                                 <string key="NSExtension">NSResponder</string>
@@ -8678 +8668 @@
                                 </object>
                                 <object class="IBConnectionRecord">
-                                        <object class="IBOutletConnection" key="connection">
-                                                <string key="label">fGroupRulesPrefsContainer</string>
-                                                <reference key="source" ref="981493640"/>
-                                                <reference key="destination" ref="391284286"/>
-                                        </object>
-                                        <int key="connectionID">1888</int>
-                                </object>
-                                <object class="IBConnectionRecord">
                                         <object class="IBBindingConnection" key="connection">
                                                 <string key="label">value: values.RandomPort</string>
@@ -11062 +11044 @@
                                                         <reference ref="415414007"/>
                                                         <reference ref="25528693"/>
-                                                        <reference ref="391284286"/>
+                                                        <reference ref="31476212"/>
+                                                        <reference ref="233310108"/>
+                                                        <reference ref="360885126"/>
                                                 </object>
                                                 <reference key="parent" ref="37013934"/>
@@ -11265 +11249 @@
                                         </object>
                                         <object class="IBObjectRecord">
-                                                <int key="objectID">1887</int>
-                                                <reference key="object" ref="391284286"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <reference ref="31476212"/>
-                                                        <reference ref="233310108"/>
-                                                        <reference ref="360885126"/>
-                                                </object>
-                                                <reference key="parent" ref="284666863"/>
+                                                <int key="objectID">1889</int>
+                                                <reference key="object" ref="200017199"/>
+                                                <object class="NSMutableArray" key="children">
+                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                        <reference ref="847795095"/>
+                                                </object>
+                                                <reference key="parent" ref="204700639"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">1890</int>
+                                                <reference key="object" ref="847795095"/>
+                                                <reference key="parent" ref="200017199"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">1891</int>
+                                                <reference key="object" ref="994561291"/>
+                                                <object class="NSMutableArray" key="children">
+                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                        <reference ref="681368311"/>
+                                                </object>
+                                                <reference key="parent" ref="204700639"/>
+                                        </object>
+                                        <object class="IBObjectRecord">
+                                                <int key="objectID">1892</int>
+                                                <reference key="object" ref="681368311"/>
+                                                <reference key="parent" ref="994561291"/>
                                         </object>
                                         <object class="IBObjectRecord">
@@ -11282 +11283 @@
                                                         <reference ref="23936638"/>
                                                 </object>
-                                                <reference key="parent" ref="391284286"/>
+                                                <reference key="parent" ref="284666863"/>
                                         </object>
                                         <object class="IBObjectRecord">
@@ -11296 +11297 @@
                                                         <reference ref="565625533"/>
                                                 </object>
-                                                <reference key="parent" ref="391284286"/>
+                                                <reference key="parent" ref="284666863"/>
                                         </object>
                                         <object class="IBObjectRecord">
@@ -11310 +11311 @@
                                                         <reference ref="660134747"/>
                                                 </object>
-                                                <reference key="parent" ref="391284286"/>
+                                                <reference key="parent" ref="284666863"/>
                                         </object>
                                         <object class="IBObjectRecord">
@@ -11316 +11317 @@
                                                 <reference key="object" ref="660134747"/>
                                                 <reference key="parent" ref="360885126"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">1889</int>
-                                                <reference key="object" ref="200017199"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <reference ref="847795095"/>
-                                                </object>
-                                                <reference key="parent" ref="204700639"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">1890</int>
-                                                <reference key="object" ref="847795095"/>
-                                                <reference key="parent" ref="200017199"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">1891</int>
-                                                <reference key="object" ref="994561291"/>
-                                                <object class="NSMutableArray" key="children">
-                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                        <reference ref="681368311"/>
-                                                </object>
-                                                <reference key="parent" ref="204700639"/>
-                                        </object>
-                                        <object class="IBObjectRecord">
-                                                <int key="objectID">1892</int>
-                                                <reference key="object" ref="681368311"/>
-                                                <reference key="parent" ref="994561291"/>
                                         </object>
                                 </object>
@@ -11701 +11674 @@
                                         <string>1834.ImportedFromIB2</string>
                                         <string>1835.IBPluginDependency</string>
-                                        <string>1887.IBPluginDependency</string>
                                         <string>1889.IBPluginDependency</string>
                                         <string>1889.ImportedFromIB2</string>
@@ -12261 +12233 @@
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                         <real value="1.000000e+00"/>
                                         <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12554 +12525 @@
                                                         <string>fGroupRulesSheetWindow</string>
                                                         <string>fRuleEditor</string>
-                                                        <string>fRulesAllAnyButton</string>
-                                                        <string>fRulesSheetCancelButton</string>
-                                                        <string>fRulesSheetDescriptionField</string>
-                                                        <string>fRulesSheetOKButton</string>
                                                         <string>fSelectedColorNameField</string>
                                                         <string>fSelectedColorView</string>
@@ -12571 +12538 @@
                                                         <string>NSView</string>
                                                         <string>NSWindow</string>
-                                                        <string>NSRuleEditor</string>
-                                                        <string>NSPopUpButton</string>
-                                                        <string>NSButton</string>
-                                                        <string>NSTextField</string>
-                                                        <string>NSButton</string>
+                                                        <string>NSPredicateEditor</string>
                                                         <string>NSTextField</string>
                                                         <string>NSColorWell</string>
@@ -12607 +12570 @@
                                                 <string key="majorKey">IBUserSource</string>
                                                 <string key="minorKey"/>
-                                        </object>
-                                </object>
-                                <object class="IBPartialClassDescription">
-                                        <string key="className">NSMenu</string>
-                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                                <string key="majorKey">IBProjectSource</string>
-                                                <string key="minorKey">macosx/NSMenuAdditions.h</string>
                                         </object>
                                 </object>