Plugin/CTFGradient.h Plugin/CTFGradient.m @@ -45,7 +45,7 @@ 6953E4360F3EDE9D0014ECF7 /* CTFMenubarMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6953E4340F3EDE9D0014ECF7 /* CTFMenubarMenuController.m */; }; 6953E43C0F3EDEB50014ECF7 /* MenubarMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6953E43A0F3EDEB50014ECF7 /* MenubarMenu.xib */; }; 69A26D0C0F302C10006648BC /* NSBezierPath-RoundedRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = 69A26D0B0F302C10006648BC /* NSBezierPath-RoundedRectangle.m */; }; - 79166CBD0FF69E1800B1F69B /* CTGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 79166CBB0FF69E1800B1F69B /* CTGradient.m */; }; + 79166CBD0FF69E1800B1F69B /* CTFGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 79166CBB0FF69E1800B1F69B /* CTFGradient.m */; }; 79A21C4D0F30B735009424B8 /* CTFWhitelistWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 79A21C490F30B735009424B8 /* CTFWhitelistWindowController.m */; }; 79C040700FF1CCE6002DA6A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 79A060EB0FF1CBF50035F03A /* Sparkle.framework */; }; 79E2EB930F86AAD3005CF170 /* SparkleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 79E2EB920F86AAD3005CF170 /* SparkleManager.m */; }; @@ -142,8 +142,8 @@ 6953E43B0F3EDEB50014ECF7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Plugin/English.lproj/MenubarMenu.xib; sourceTree = "<group>"; }; 69A26D0A0F302C10006648BC /* NSBezierPath-RoundedRectangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSBezierPath-RoundedRectangle.h"; path = "Plugin/NSBezierPath-RoundedRectangle.h"; sourceTree = "<group>"; }; 69A26D0B0F302C10006648BC /* NSBezierPath-RoundedRectangle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSBezierPath-RoundedRectangle.m"; path = "Plugin/NSBezierPath-RoundedRectangle.m"; sourceTree = "<group>"; }; - 79166CBB0FF69E1800B1F69B /* CTGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTGradient.m; path = Plugin/CTGradient.m; sourceTree = "<group>"; }; - 79166CBC0FF69E1800B1F69B /* CTGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTGradient.h; path = Plugin/CTGradient.h; sourceTree = "<group>"; }; + 79166CBB0FF69E1800B1F69B /* CTFGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTFGradient.m; path = Plugin/CTFGradient.m; sourceTree = "<group>"; }; + 79166CBC0FF69E1800B1F69B /* CTFGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTFGradient.h; path = Plugin/CTFGradient.h; sourceTree = "<group>"; }; 79475E0C0F658D9A00FD82E3 /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Plugin/Sparkle/Sparkle.xcodeproj; sourceTree = "<group>"; }; 79A21C490F30B735009424B8 /* CTFWhitelistWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTFWhitelistWindowController.m; path = Plugin/CTFWhitelistWindowController.m; sourceTree = "<group>"; }; 79A21C4A0F30B735009424B8 /* CTFWhitelistWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTFWhitelistWindowController.h; path = Plugin/CTFWhitelistWindowController.h; sourceTree = "<group>"; }; @@ -249,8 +249,8 @@ 69A26D0A0F302C10006648BC /* NSBezierPath-RoundedRectangle.h */, 0038DE230FC0CCF0007B54E9 /* MATrackingArea.m */, 0038DE220FC0CCF0007B54E9 /* MATrackingArea.h */, - 79166CBB0FF69E1800B1F69B /* CTGradient.m */, - 79166CBC0FF69E1800B1F69B /* CTGradient.h */, + 79166CBB0FF69E1800B1F69B /* CTFGradient.m */, + 79166CBC0FF69E1800B1F69B /* CTFGradient.h */, 00FBE92E0FCD68CE00BC0995 /* NSActionTemplate.png */, ); name = "10.4 Support"; @@ -418,7 +418,7 @@ 0038DE240FC0CCF0007B54E9 /* MATrackingArea.m in Sources */, A4DEFC7A0FF33F7400CCB6A8 /* CTFPreferencesDictionary.m in Sources */, A4DEFC7B0FF33F7400CCB6A8 /* CTFUserDefaultsController.m in Sources */, - 79166CBD0FF69E1800B1F69B /* CTGradient.m in Sources */, + 79166CBD0FF69E1800B1F69B /* CTFGradient.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; ClickToFlash.xcodeproj/project.pbxproj @@ -34,7 +34,7 @@ THE SOFTWARE. #import "CTFUtilities.h" #import "CTFWhitelist.h" #import "NSBezierPath-RoundedRectangle.h" -#import "CTGradient.h" +#import "CTFGradient.h" #import "SparkleManager.h" #define LOGGING_ENABLED 0 @@ -1009,7 +1009,7 @@ BOOL usingMATrackingArea = NO; //tweak the opacity of the endingColor for compatibility with CTGradient endingColor = [NSColor colorWithDeviceWhite:0.0 alpha:0.00]; - gradient = [CTGradient gradientWithBeginningColor:startingColor + gradient = [CTFGradient gradientWithBeginningColor:startingColor endingColor:endingColor]; //angle is reversed compared to NSGradient Plugin/Plugin.m Plugin/CTGradient.h Plugin/CTGradient.m b8e2abe2d8514e29ec5eba9b854f9c7546138007 Ruotger Skupin roddi@me.com http://github.com/rentzsch/clicktoflash/commit/0f55f2c2c191e80888c906223c0d5362477de660 0f55f2c2c191e80888c906223c0d5362477de660 2009-09-10T01:47:27-07:00 2009-09-10T01:47:27-07:00 renamed CTGradient to CTFGradient to avoid namespace collisions with other projects using CTGradient and WebKit 868b8be25a394b8d980caf2073ce5975513de5ef Ruotger Skupin roddi@me.com