adium 3778:843355bd07f0: Built-in methods woo.
commits at adium.im
commits at adium.im
Thu Mar 24 05:46:10 UTC 2011
details: http://hg.adium.im/adium/rev/843355bd07f0
revision: 3778:843355bd07f0
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Thu Mar 24 01:44:26 2011 -0400
Built-in methods woo.
Subject: adium 3779:8908c91268b3: Contrary to 310da23db99f keys.png is still used for the password prompt. Refs #14610
details: http://hg.adium.im/adium/rev/8908c91268b3
revision: 3779:8908c91268b3
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Thu Mar 24 01:44:27 2011 -0400
Contrary to 310da23db99f keys.png is still used for the password prompt. Refs #14610
diffs (113 lines):
diff -r 664a53cbeca8 -r 8908c91268b3 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Mar 24 01:14:45 2011 +0100
+++ b/Adium.xcodeproj/project.pbxproj Thu Mar 24 01:44:27 2011 -0400
@@ -1141,6 +1141,7 @@
5A94397B1279ECB800FDD81D /* AIImgurImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */; };
5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
5A9A9F8B11F295EB00328DF9 /* Stop sign.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* Stop sign.png */; };
+ 5ADFFE5D133846C300069C1B /* keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 5ADFFE5C133846C300069C1B /* keys.png */; };
6311F4710E340DD2004234B8 /* AISharedAdium.h in Headers */ = {isa = PBXBuildFile; fileRef = 6311F46F0E340DD2004234B8 /* AISharedAdium.h */; settings = {ATTRIBUTES = (Public, ); }; };
6311F4720E340DD2004234B8 /* AISharedAdium.m in Sources */ = {isa = PBXBuildFile; fileRef = 6311F4700E340DD2004234B8 /* AISharedAdium.m */; };
6318DBA10F8D93F200C5E584 /* WebKit Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347065E406015DC5004F0D20 /* WebKit Defaults.plist */; };
@@ -4280,6 +4281,7 @@
5A9A9F8711F2951400328DF9 /* AIDoNothingContactAlertPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIDoNothingContactAlertPlugin.h; sourceTree = "<group>"; };
5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIDoNothingContactAlertPlugin.m; sourceTree = "<group>"; };
5A9A9F8A11F295EB00328DF9 /* Stop sign.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Stop sign.png"; path = "Resources/Stop sign.png"; sourceTree = SOURCE_ROOT; };
+ 5ADFFE5C133846C300069C1B /* keys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = keys.png; path = Resources/keys.png; sourceTree = "<group>"; };
6311F46F0E340DD2004234B8 /* AISharedAdium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AISharedAdium.h; path = "Frameworks/Adium Framework/Source/AISharedAdium.h"; sourceTree = "<group>"; };
6311F4700E340DD2004234B8 /* AISharedAdium.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AISharedAdium.m; path = "Frameworks/Adium Framework/Source/AISharedAdium.m"; sourceTree = "<group>"; };
63125D8D0A75EBF000303EE9 /* AIPurpleLiveJournalAccount.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIPurpleLiveJournalAccount.h; path = "Plugins/Purple Service/AIPurpleLiveJournalAccount.h"; sourceTree = "<group>"; };
@@ -8918,6 +8920,7 @@
F5A3C2DD039A516E01A8010A /* Passwords */ = {
isa = PBXGroup;
children = (
+ 5ADFFE5C133846C300069C1B /* keys.png */,
4B8742480840E3D800738987 /* AdiumPasswords.h */,
4B8742490840E3D800738987 /* AdiumPasswords.m */,
3420E65B0611D80000AE67E3 /* ESAccountPasswordPromptController.h */,
@@ -10021,6 +10024,7 @@
97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */,
9722ABC613257D5800CAB486 /* ContactListWindow.xib in Resources */,
9722ABC813257D7F00CAB486 /* ContactListWindow.xib in Resources */,
+ 5ADFFE5D133846C300069C1B /* keys.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 664a53cbeca8 -r 8908c91268b3 Plugins/Dock Icon Badging/AIDockNameOverlay.m
--- a/Plugins/Dock Icon Badging/AIDockNameOverlay.m Thu Mar 24 01:14:45 2011 +0100
+++ b/Plugins/Dock Icon Badging/AIDockNameOverlay.m Thu Mar 24 01:44:27 2011 -0400
@@ -1,8 +1,5 @@
#import "AIDockNameOverlay.h"
#import "AIDockController.h"
-#import <Adium/AIChatControllerProtocol.h>
-#import <Adium/AIContactAlertsControllerProtocol.h>
-#import <Adium/AIStatusControllerProtocol.h>
#import <AIUtilities/AIParagraphStyleAdditions.h>
#import <AIUtilities/AIImageAdditions.h>
#import <Adium/AIChat.h>
@@ -10,6 +7,7 @@
#import <AIUtilities/AIArrayAdditions.h>
#import <Adium/AIAbstractListController.h>
#import <AIUtilities/AIColorAdditions.h>
+#import <AIUtilities/AIBezierPathAdditions.h>
#define DOCK_OVERLAY_ALERT_SHORT AILocalizedString(@"Display name in the dock icon",nil)
@@ -248,51 +246,18 @@
if (top >= 128)
break;
- CGFloat left, right, arcRadius, stringInset;
+ CGFloat arcRadius, stringInset;
NSBezierPath *path;
+ NSRect pillRect;
NSColor *backColor = nil, *textColor = nil, *borderColor = nil;
//Create the pill frame
arcRadius = (iconHeight / 2.0f);
stringInset = (iconHeight / 4.0f);
- left = 1 + arcRadius;
- right = 127 - arcRadius;
+ pillRect = NSMakeRect(0, bottom, 127, iconHeight);
- path = [NSBezierPath bezierPath];
+ path = [NSBezierPath bezierPathWithRoundedRect:pillRect radius:arcRadius];
[path setLineWidth:((iconHeight/2.0f) * 0.13333f)];
- //Top
- [path moveToPoint: NSMakePoint(left, top)];
- [path lineToPoint: NSMakePoint(right, top)];
-
- //Right rounded cap
- [path appendBezierPathWithArcWithCenter:NSMakePoint(right, top - arcRadius)
- radius:arcRadius
- startAngle:90
- endAngle:0
- clockwise:YES];
- [path lineToPoint: NSMakePoint(right + arcRadius, bottom + arcRadius)];
- [path appendBezierPathWithArcWithCenter:NSMakePoint(right, bottom + arcRadius)
- radius:arcRadius
- startAngle:0
- endAngle:270
- clockwise:YES];
-
- //Bottom
- [path moveToPoint: NSMakePoint(right, bottom)];
- [path lineToPoint: NSMakePoint(left, bottom)];
-
- //Left rounded cap
- [path appendBezierPathWithArcWithCenter:NSMakePoint(left, bottom + arcRadius)
- radius:arcRadius
- startAngle:270
- endAngle:180
- clockwise:YES];
- [path lineToPoint: NSMakePoint(left - arcRadius, top - arcRadius)];
- [path appendBezierPathWithArcWithCenter:NSMakePoint(left, top - arcRadius)
- radius:arcRadius
- startAngle:180
- endAngle:90
- clockwise:YES];
if ([object integerValueForProperty:KEY_UNVIEWED_CONTENT]) { //Unviewed
backColor = backUnviewedContentColor;
diff -r 664a53cbeca8 -r 8908c91268b3 Resources/keys.png
Binary file Resources/keys.png has changed
More information about the commits
mailing list