Add a small IRC icon and an improved larger one. Refs #12697.
1.1 --- a/Adium.xcodeproj/project.pbxproj Sat Oct 31 16:02:31 2009 -0400
1.2 +++ b/Adium.xcodeproj/project.pbxproj Sat Oct 31 15:52:20 2009 -0400
1.3 @@ -164,6 +164,7 @@
1.4 11AE53610F68CE3300BE8077 /* AIPurpleOscarAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 11AE52000F68CA5000BE8077 /* AIPurpleOscarAccountViewController.h */; };
1.5 11AE53620F68CE3300BE8077 /* AIPurpleOscarAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11AE52010F68CA5000BE8077 /* AIPurpleOscarAccountViewController.m */; };
1.6 11AE5555109CC88C0074BDC2 /* pref-confirmations.png in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5554109CC88C0074BDC2 /* pref-confirmations.png */; };
1.7 + 11AE5587109CCCC30074BDC2 /* irc-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11AE5575109CCC950074BDC2 /* irc-small.png */; };
1.8 11BD73AE0F5A53EA007D438A /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68950F1FD563002F2D01 /* facebook.png */; };
1.9 11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D10F5A54BB007D438A /* twitter-small.png */; };
1.10 11BD73D40F5A54BB007D438A /* twitter.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D20F5A54BB007D438A /* twitter.png */; };
1.11 @@ -1969,6 +1970,7 @@
1.12 11AE52000F68CA5000BE8077 /* AIPurpleOscarAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPurpleOscarAccountViewController.h; path = "Plugins/Purple Service/AIPurpleOscarAccountViewController.h"; sourceTree = "<group>"; };
1.13 11AE52010F68CA5000BE8077 /* AIPurpleOscarAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPurpleOscarAccountViewController.m; path = "Plugins/Purple Service/AIPurpleOscarAccountViewController.m"; sourceTree = "<group>"; };
1.14 11AE5554109CC88C0074BDC2 /* pref-confirmations.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-confirmations.png"; path = "Resources/pref-confirmations.png"; sourceTree = "<group>"; };
1.15 + 11AE5575109CCC950074BDC2 /* irc-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "irc-small.png"; path = "Plugins/Purple Service/irc-small.png"; sourceTree = "<group>"; };
1.16 11BD73D10F5A54BB007D438A /* twitter-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "twitter-small.png"; path = "Plugins/Twitter Plugin/twitter-small.png"; sourceTree = "<group>"; };
1.17 11BD73D20F5A54BB007D438A /* twitter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = twitter.png; path = "Plugins/Twitter Plugin/twitter.png"; sourceTree = "<group>"; };
1.18 11BE28980FCC7C13000E6A10 /* AIPicImImageUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPicImImageUploader.h; path = "Plugins/Image Uploading Plugin/AIPicImImageUploader.h"; sourceTree = "<group>"; };
1.19 @@ -6084,6 +6086,7 @@
1.20 34E4CD510E68277D00D1B0DC /* ESIRCJoinChatView.nib */,
1.21 34E4CD500E68277D00D1B0DC /* ESIRCJoinChatViewController.h */,
1.22 34E4CD4F0E68277D00D1B0DC /* ESIRCJoinChatViewController.m */,
1.23 + 11AE5575109CCC950074BDC2 /* irc-small.png */,
1.24 34E4CD640E68279C00D1B0DC /* irc.png */,
1.25 34E4CD650E68279C00D1B0DC /* PurpleDefaultsIRC.plist */,
1.26 );
1.27 @@ -9608,6 +9611,7 @@
1.28 isa = PBXResourcesBuildPhase;
1.29 buildActionMask = 2147483647;
1.30 files = (
1.31 + 11AE5587109CCCC30074BDC2 /* irc-small.png in Resources */,
1.32 3485DB5F09EBCE7400232CC4 /* DCPurpleGaduGaduJoinChatView.nib in Resources */,
1.33 3485DB6209EBCE7400232CC4 /* ESPurpleGaduGaduAccountView.nib in Resources */,
1.34 3485DB6309EBCE7400232CC4 /* PurpleDefaultsGadu-Gadu.plist in Resources */,
2.1 --- a/Plugins/Purple Service/ESIRCService.m Sat Oct 31 16:02:31 2009 -0400
2.2 +++ b/Plugins/Purple Service/ESIRCService.m Sat Oct 31 15:52:20 2009 -0400
2.3 @@ -102,13 +102,11 @@
2.4 */
2.5 - (NSImage *)defaultServiceIconOfType:(AIServiceIconType)iconType
2.6 {
2.7 - NSImage *baseImage = [NSImage imageNamed:@"irc" forClass:[self class] loadLazily:YES];
2.8 -
2.9 - if (iconType == AIServiceIconSmall || iconType == AIServiceIconList) {
2.10 - baseImage = [baseImage imageByScalingToSize:NSMakeSize(16, 16)];
2.11 - }
2.12 -
2.13 - return baseImage;
2.14 + if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) {
2.15 + return [NSImage imageNamed:@"irc-small" forClass:[self class] loadLazily:YES];
2.16 + } else {
2.17 + return [NSImage imageNamed:@"irc" forClass:[self class] loadLazily:YES];
2.18 + }
2.19 }
2.20
2.21 /*!
2.22 @@ -122,9 +120,9 @@
2.23 - (NSString *)pathForDefaultServiceIconOfType:(AIServiceIconType)iconType
2.24 {
2.25 if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) {
2.26 - return nil; //xxx add small IRC icon
2.27 + return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"irc-small"];
2.28 } else {
2.29 - return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"irc"];
2.30 + return [[NSBundle bundleForClass:[self class]] pathForImageResource:@"irc"];
2.31 }
2.32 }
2.33
3.1 Binary file Plugins/Purple Service/irc-small.png has changed
4.1 Binary file Plugins/Purple Service/irc.png has changed