diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index f5069054b..e4bcd66fc 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -89,7 +89,6 @@ A22BC9A30C5BBCF100F5FB72 /* BottomBack.png in Resources */ = {isa = PBXBuildFile; fileRef = A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */; }; A22D3AA60D00D1790079CFED /* Turtle.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA30D00D1790079CFED /* Turtle.png */; }; A22D3AA70D00D1790079CFED /* TurtleBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA40D00D1790079CFED /* TurtleBlue.png */; }; - A22D3AA80D00D1790079CFED /* TurtleGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AA50D00D1790079CFED /* TurtleGraphite.png */; }; A22D3ABA0D00D31F0079CFED /* BottomBackInactive.png in Resources */ = {isa = PBXBuildFile; fileRef = A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */; }; A232D29E0A70903E00973B12 /* Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = A232D29D0A70903E00973B12 /* Filter.png */; }; A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */; }; @@ -435,7 +434,6 @@ A22BC9A20C5BBCF100F5FB72 /* BottomBack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBack.png; path = macosx/Images/BottomBack.png; sourceTree = ""; }; A22D3AA30D00D1790079CFED /* Turtle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Turtle.png; path = macosx/Images/Turtle.png; sourceTree = ""; }; A22D3AA40D00D1790079CFED /* TurtleBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TurtleBlue.png; path = macosx/Images/TurtleBlue.png; sourceTree = ""; }; - A22D3AA50D00D1790079CFED /* TurtleGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TurtleGraphite.png; path = macosx/Images/TurtleGraphite.png; sourceTree = ""; }; A22D3AB90D00D31F0079CFED /* BottomBackInactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BottomBackInactive.png; path = macosx/Images/BottomBackInactive.png; sourceTree = ""; }; A232D29D0A70903E00973B12 /* Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Filter.png; path = macosx/Images/Filter.png; sourceTree = ""; }; A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSMenuAdditions.h; path = macosx/NSMenuAdditions.h; sourceTree = ""; }; @@ -897,7 +895,6 @@ 4DF7500908A103AD007B0D70 /* Remove.png */, A22D3AA30D00D1790079CFED /* Turtle.png */, A22D3AA40D00D1790079CFED /* TurtleBlue.png */, - A22D3AA50D00D1790079CFED /* TurtleGraphite.png */, A2F41DA80D0B9152006CE378 /* ActionGear.png */, A277DA090C693D9C00DA2CD4 /* ActionOn.png */, A277DA0A0C693D9C00DA2CD4 /* ActionOff.png */, @@ -1565,7 +1562,6 @@ A25892770CF1FCE800CCCDDF /* StatsWindow.xib in Resources */, A22D3AA60D00D1790079CFED /* Turtle.png in Resources */, A22D3AA70D00D1790079CFED /* TurtleBlue.png in Resources */, - A22D3AA80D00D1790079CFED /* TurtleGraphite.png in Resources */, A22D3ABA0D00D31F0079CFED /* BottomBackInactive.png in Resources */, A29AF4F70D01BADC00D097EC /* DownArrow.png in Resources */, A29AF4F90D01BAEB00D097EC /* UpArrow.png in Resources */, diff --git a/macosx/Controller.h b/macosx/Controller.h index d148f3207..8940ac135 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -161,8 +161,6 @@ - (void) showMessageWindow: (id) sender; - (void) showStatsWindow: (id) sender; -- (void) updateControlTint: (NSNotification *) notification; - - (void) updateUI; - (void) updateTorrentsInQueue; diff --git a/macosx/Controller.m b/macosx/Controller.m index 504fcb08c..2ce8451c3 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -383,9 +383,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi [nc addObserver: self selector: @selector(torrentTableViewSelectionDidChange:) name: NSTableViewSelectionDidChangeNotification object: fTableView]; - [nc addObserver: self selector: @selector(updateControlTint:) - name: NSControlTintDidChangeNotification object: nil]; - [nc addObserver: self selector: @selector(prepareForUpdate:) name: SUUpdaterWillRestartNotification object: nil]; fUpdateInProgress = NO; @@ -1992,13 +1989,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi [self updateUI]; } -- (void) updateControlTint: (NSNotification *) notification -{ - if ([fDefaults boolForKey: @"SpeedLimit"]) - [fSpeedLimitButton setImage: [NSColor currentControlTint] == NSGraphiteControlTint - ? [NSImage imageNamed: @"TurtleGraphite.png"] : [NSImage imageNamed: @"TurtleBlue.png"]]; -} - - (void) toggleSpeedLimit: (id) sender { [fDefaults setBool: ![fDefaults boolForKey: @"SpeedLimit"] forKey: @"SpeedLimit"]; diff --git a/macosx/Images/TurtleGraphite.png b/macosx/Images/TurtleGraphite.png deleted file mode 100644 index fb8c87b86..000000000 Binary files a/macosx/Images/TurtleGraphite.png and /dev/null differ diff --git a/macosx/SpeedLimitToTurtleIconTransformer.m b/macosx/SpeedLimitToTurtleIconTransformer.m index 66f87ca5b..a97221f9e 100644 --- a/macosx/SpeedLimitToTurtleIconTransformer.m +++ b/macosx/SpeedLimitToTurtleIconTransformer.m @@ -41,9 +41,7 @@ if (!value) return nil; - return [value boolValue] ? ([NSColor currentControlTint] == NSGraphiteControlTint - ? [NSImage imageNamed: @"TurtleGraphite.png"] : [NSImage imageNamed: @"TurtleBlue.png"]) - : [NSImage imageNamed: @"Turtle.png"]; + return [value boolValue] ? [NSImage imageNamed: @"TurtleBlue.png"] : [NSImage imageNamed: @"Turtle.png"]; } @end \ No newline at end of file