adium 2916:d3077a9b1875: Added hidden preference AIDisableContac...
commits at adium.im
commits at adium.im
Sun Nov 22 00:11:50 UTC 2009
details: http://hg.adium.im/adium/rev/d3077a9b1875
revision: 2916:d3077a9b1875
author: Evan Schoenberg
date: Sat Nov 21 15:31:05 2009 -0600
Added hidden preference AIDisableContactListTypeToFind which, if set to true, turns off automatic filter bar display when typing in the contact list
Subject: adium 2917:0f1e4d0a7747: Header change for typeToFindEnabled hidden pref
details: http://hg.adium.im/adium/rev/0f1e4d0a7747
revision: 2917:0f1e4d0a7747
author: Evan Schoenberg
date: Sat Nov 21 17:39:43 2009 -0600
Header change for typeToFindEnabled hidden pref
Subject: adium 2918:b86536983564: Remove unncessary attempted override of a private NSCell method
details: http://hg.adium.im/adium/rev/b86536983564
revision: 2918:b86536983564
author: Evan Schoenberg
date: Sat Nov 21 18:01:06 2009 -0600
Remove unncessary attempted override of a private NSCell method
{{{
- (void)_drawHighlightWithFrame:(NSRect)cellFrame inView:(NSView *)inControlView
}}}
it's not even called as of 10.6, and it hasn't been doing its job in 10.5, as custom highlighting in the Regular and Borderless window lists (which use the standard cells rather than the Group Bubbles and Contact Bubbles style cells) doesn't work, with or without it.
Subject: adium 2919:93ced8fc9973: Add interface declarations for 10.6+ methods we check for at runtime, suppressing 2 warnings when compiling
details: http://hg.adium.im/adium/rev/93ced8fc9973
revision: 2919:93ced8fc9973
author: Evan Schoenberg
date: Sat Nov 21 18:14:32 2009 -0600
Add interface declarations for 10.6+ methods we check for at runtime, suppressing 2 warnings when compiling
Subject: adium 2920:68d1a7f1f4e4: Don't claim to implement methods we don't
details: http://hg.adium.im/adium/rev/68d1a7f1f4e4
revision: 2920:68d1a7f1f4e4
author: Evan Schoenberg
date: Sat Nov 21 18:14:58 2009 -0600
Don't claim to implement methods we don't
Subject: adium 2921:aa0447480f67: Newline at end of file
details: http://hg.adium.im/adium/rev/aa0447480f67
revision: 2921:aa0447480f67
author: Evan Schoenberg
date: Sat Nov 21 18:15:12 2009 -0600
Newline at end of file
diffs (106 lines):
diff -r 4ff6b0bfa42e -r aa0447480f67 Frameworks/Adium Framework/Source/AIListCell.h
--- a/Frameworks/Adium Framework/Source/AIListCell.h Sat Nov 21 16:58:09 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIListCell.h Sat Nov 21 18:15:12 2009 -0600
@@ -77,7 +77,6 @@
//Drawing
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
-- (void)_drawHighlightWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
- (void)drawSelectionWithFrame:(NSRect)rect;
- (void)drawBackgroundWithFrame:(NSRect)rect;
- (void)drawContentWithFrame:(NSRect)rect;
diff -r 4ff6b0bfa42e -r aa0447480f67 Frameworks/Adium Framework/Source/AIListCell.m
--- a/Frameworks/Adium Framework/Source/AIListCell.m Sat Nov 21 16:58:09 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIListCell.m Sat Nov 21 18:15:12 2009 -0600
@@ -204,19 +204,6 @@
}
}
-#warning It's quite possible that we don't need to use this private method.
-//Custom highlighting (This is a private cell method we're overriding that handles selection drawing)
-- (void)_drawHighlightWithFrame:(NSRect)cellFrame inView:(NSView *)inControlView
-{
- //Cell spacing
- cellFrame.origin.y += [self topSpacing];
- cellFrame.size.height -= [self bottomSpacing] + [self topSpacing];
- cellFrame.origin.x += [self leftSpacing];
- cellFrame.size.width -= [self rightSpacing] + [self leftSpacing];
-
- [self drawSelectionWithFrame:cellFrame];
-}
-
//Draw Selection
- (void)drawSelectionWithFrame:(NSRect)rect {}
diff -r 4ff6b0bfa42e -r aa0447480f67 Frameworks/OAuthConsumer.framework/Versions/A/Headers/OAuthConsumer.h
--- a/Frameworks/OAuthConsumer.framework/Versions/A/Headers/OAuthConsumer.h Sat Nov 21 16:58:09 2009 -0500
+++ b/Frameworks/OAuthConsumer.framework/Versions/A/Headers/OAuthConsumer.h Sat Nov 21 18:15:12 2009 -0600
@@ -36,4 +36,4 @@
#import <OAuthConsumer/OARequestParameter.h>
#import <OAuthConsumer/OAServiceTicket.h>
#import <OAuthConsumer/OADataFetcher.h>
-#import <OAuthConsumer/OAAsynchronousDataFetcher.h>
\ No newline at end of file
+#import <OAuthConsumer/OAAsynchronousDataFetcher.h>
diff -r 4ff6b0bfa42e -r aa0447480f67 Source/AIListWindowController.h
--- a/Source/AIListWindowController.h Sat Nov 21 16:58:09 2009 -0500
+++ b/Source/AIListWindowController.h Sat Nov 21 18:15:12 2009 -0600
@@ -93,6 +93,7 @@
BOOL filterBarShownAutomatically;
NSViewAnimation *filterBarAnimation;
NSArray *filterBarPreviouslySelected;
+ BOOL typeToFindEnabled;
IBOutlet AIFilterBarView *filterBarView;
IBOutlet NSSearchField *searchField;
diff -r 4ff6b0bfa42e -r aa0447480f67 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Sat Nov 21 16:58:09 2009 -0500
+++ b/Source/AIListWindowController.m Sat Nov 21 18:15:12 2009 -0600
@@ -95,7 +95,8 @@
if ((self = [self initWithWindowNibName:[[self class] nibName]])) {
preventHiding = NO;
previousAlpha = 0;
-
+ typeToFindEnabled = ![[NSUserDefaults standardUserDefaults] boolForKey:@"AIDisableContactListTypeToFind"];
+
[NSBundle loadNibNamed:@"Filter Bar" owner:self];
[self setContactList:contactList];
@@ -1617,6 +1618,9 @@
*/
- (BOOL)forwardKeyEventToFindPanel:(NSEvent *)theEvent;
{
+ if (!typeToFindEnabled)
+ return NO;
+
//if we were not searching something before, we need to show the filter bar first without animation
NSString *charString = [theEvent charactersIgnoringModifiers];
unichar pressedChar = 0;
diff -r 4ff6b0bfa42e -r aa0447480f67 Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m Sat Nov 21 16:58:09 2009 -0500
+++ b/Source/AILoggerPlugin.m Sat Nov 21 18:15:12 2009 -0600
@@ -105,6 +105,10 @@
static NSString *logBasePath = nil; //The base directory of all logs
static NSString *logBaseAliasPath = nil; //If the usual Logs folder path refers to an alias file, this is that path, and logBasePath is the destination of the alias; otherwise, this is nil and logBasePath is the usual Logs folder path.
+ at interface NSOperationQueue (SnowLeopardMethodsICheckFor)
+- (void)setName:(NSString *)name;
+ at end
+
@implementation AILoggerPlugin
- (void)installPlugin
diff -r 4ff6b0bfa42e -r aa0447480f67 Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m Sat Nov 21 16:58:09 2009 -0500
+++ b/Source/AdiumPasswords.m Sat Nov 21 18:15:12 2009 -0600
@@ -43,6 +43,10 @@
- (void)_upgradeAccountPasswordKeychainEntries;
@end
+ at interface NSOperationQueue (SnowLeopardMethodsICheckFor)
+- (void)setName:(NSString *)name;
+ at end
+
@implementation AdiumPasswords
/*!
More information about the commits
mailing list