From bf02b8a46acd463319d8001fabe34e1667b07d21 Mon Sep 17 00:00:00 2001 From: "stuart.morgan%alumni.case.edu" Date: Fri, 17 Aug 2007 19:33:12 +0000 Subject: [PATCH] Camino only - Bug 357560: Switch to native NSSearchField in Privacy sheets. r=smurph sr=pink git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@232283 18797224-902f-48f8-a5cc-f745e15eee43 --- .../English.lproj/Privacy.nib/classes.nib | 8 +- .../English.lproj/Privacy.nib/info.nib | 5 +- .../Privacy.nib/keyedobjects.nib | Bin 28167 -> 29055 bytes .../PreferencePanes/Privacy/PrivacyPane.h | 11 ++- .../PreferencePanes/Privacy/PrivacyPane.mm | 83 +++++++++++------- 5 files changed, 64 insertions(+), 43 deletions(-) diff --git a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/classes.nib b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/classes.nib index 55409e4edba..f16e5aaf69d 100644 --- a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/classes.nib +++ b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/classes.nib @@ -1,5 +1,6 @@ { IBClasses = ( + {CLASS = CookieDateFormatter; LANGUAGE = ObjC; SUPERCLASS = NSDateFormatter; }, {CLASS = ExtendedTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { @@ -18,14 +19,15 @@ ACTIONS = { blockCookiesFromSites = id; clickAskAboutCookies = id; - clickAutoFillPasswords = id; clickCookieBehavior = id; clickStorePasswords = id; + cookieFilterChanged = id; editCookies = id; editCookiesDone = id; editPermissions = id; editPermissionsDone = id; launchKeychainAccess = id; + permissionFilterChanged = id; removeAllCookiePermissions = id; removeAllCookies = id; removeCookiePermissions = id; @@ -37,11 +39,11 @@ OUTLETS = { mAskAboutCookies = NSButton; mCookieBehavior = NSMatrix; - mCookiesFilterField = SearchTextField; + mCookiesFilterField = NSSearchField; mCookiesPanel = id; mCookiesTable = ExtendedTableView; mPermissionColumn = NSTableColumn; - mPermissionFilterField = SearchTextField; + mPermissionFilterField = NSSearchField; mPermissionsPanel = id; mPermissionsTable = ExtendedTableView; mStorePasswords = NSButton; diff --git a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib index 4fb16f82a93..f40c58a1864 100644 --- a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib +++ b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib @@ -13,12 +13,13 @@ IBFramework Version 446.1 + IBOldestOS + 3 IBOpenObjects - 401 5 IBSystem Version - 8J135 + 8R2232 diff --git a/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/keyedobjects.nib index d222766945579287d6d58c4a4aad03183adc269c..1c9c84730c53deb4e9cea0b6bea23b6183025242 100644 GIT binary patch delta 13941 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 diff --git a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h index e05f0edbaea..ae2dc529176 100644 --- a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h +++ b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.h @@ -42,9 +42,6 @@ #import "nsCOMArray.h" -#import "ExtendedTableView.h" -#import "SearchTextField.h" - class nsIPref; class nsIPermissionManager; class nsIPermission; @@ -84,14 +81,14 @@ typedef enum ECookiePolicyPopupIndex IBOutlet id mPermissionsPanel; IBOutlet ExtendedTableView* mPermissionsTable; IBOutlet NSTableColumn* mPermissionColumn; - IBOutlet SearchTextField* mPermissionFilterField; + IBOutlet NSSearchField* mPermissionFilterField; nsIPermissionManager* mPermissionManager; // STRONG (should be nsCOMPtr) nsCOMArray* mCachedPermissions; // parallel list for speed, STRONG // cookie sheet IBOutlet id mCookiesPanel; IBOutlet ExtendedTableView* mCookiesTable; - IBOutlet SearchTextField* mCookiesFilterField; + IBOutlet NSSearchField* mCookiesFilterField; nsICookieManager* mCookieManager; nsCOMArray* mCachedCookies; } @@ -133,7 +130,9 @@ typedef enum ECookiePolicyPopupIndex - (void)sortCookiesByColumn:(NSTableColumn *)aTableColumn inAscendingOrder:(BOOL)ascending; - (void)sortPermissionsByColumn:(NSTableColumn *)aTableColumn inAscendingOrder:(BOOL)ascending; - //filtering methods +// filtering methods +- (IBAction)cookieFilterChanged:(id)sender; +- (IBAction)permissionFilterChanged:(id)sender; - (void) filterCookiesPermissionsWithString: (NSString*) inFilterString; - (void) filterCookiesWithString: (NSString*) inFilterString; @end diff --git a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm index 11c7efcface..b1f851e0dad 100644 --- a/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm +++ b/mozilla/camino/PreferencePanes/Privacy/PrivacyPane.mm @@ -39,6 +39,7 @@ #import "NSString+Utils.h" #import "NSArray+Utils.h" +#import "ExtendedTableView.h" #include "nsCOMPtr.h" #include "nsServiceManagerUtils.h" @@ -59,8 +60,6 @@ // but that requires linkage and extra search paths. static NSString* XPCOMShutDownNotificationName = @"XPCOMShutDown"; -#import "ExtendedTableView.h" - // prefs for keychain password autofill static const char* const gUseKeychainPref = "chimera.store_passwords_with_keychain"; @@ -282,12 +281,8 @@ PR_STATIC_CALLBACK(int) compareValues(nsICookie* aCookie1, nsICookie* aCookie2, [popupButtonCell setEditable:YES]; [popupButtonCell addItemsWithTitles:[NSArray arrayWithObjects:[self getLocalizedString:@"Allow"], [self getLocalizedString:@"Allow for Session"], - [self getLocalizedString:@"Deny"], - nil]]; - - //remove the popup from the filter input fields - [[mPermissionFilterField cell] setHasPopUpButton: NO]; - [[mCookiesFilterField cell] setHasPopUpButton: NO]; + [self getLocalizedString:@"Deny"], + nil]]; } -(void) mapCookiePrefToGUI:(int)pref @@ -359,7 +354,7 @@ PR_STATIC_CALLBACK(int) compareValues(nsICookie* aCookie1, nsICookie* aCookie2, } //clear the filter field - [mCookiesFilterField setStringValue: @""]; + [mCookiesFilterField setStringValue:@""]; // we shouldn't need to do this, but the scrollbar won't enable unless we // force the table to reload its data. Oddly it gets the number of rows correct, @@ -553,7 +548,7 @@ PR_STATIC_CALLBACK(int) compareValues(nsICookie* aCookie1, nsICookie* aCookie2, [mPermissionsTable setUsesAlternatingRowBackgroundColors:YES]; //clear the filter field - [mPermissionFilterField setStringValue: @""]; + [mPermissionFilterField setStringValue:@""]; // we shouldn't need to do this, but the scrollbar won't enable unless we // force the table to reload its data. Oddly it gets the number of rows correct, @@ -960,32 +955,56 @@ PR_STATIC_CALLBACK(int) compareValues(nsICookie* aCookie1, nsICookie* aCookie2, } } -- (void)controlTextDidChange:(NSNotification *)aNotification -{ - NSString *filterString = [[aNotification object] stringValue]; +// Delegate method for the filter search fields. Watches for an Enter or +// Return in the filter, and passes it off to the sheet to trigger the default +// button to dismiss the sheet. +- (void)controlTextDidEndEditing:(NSNotification *)aNotification { + id source = [aNotification object]; + if (!(source == mCookiesFilterField || source == mPermissionFilterField)) + return; - // find out if we are filtering the permission or the cookies - if (([aNotification object] == mPermissionFilterField) && mCachedPermissions && mPermissionManager) { - // the user wants to filter down the list of cookies. Reinitialize the list of permission in case - // they deleted or replaced a letter. - [self filterCookiesPermissionsWithString:filterString]; - // re-sort - [self sortPermissionsByColumn:[mPermissionsTable highlightedTableColumn] inAscendingOrder:mSortedAscending]; - - [mPermissionsTable deselectAll: self]; // don't want any traces of previous selection - [mPermissionsTable reloadData]; - } - else if (([aNotification object] == mCookiesFilterField) && mCachedCookies && mCookieManager) { - // reinitialize the list of cookies in case user deleted a letter or replaced a letter - [self filterCookiesWithString:filterString]; - // re-sort - [self sortCookiesByColumn:[mCookiesTable highlightedTableColumn] inAscendingOrder:mSortedAscending]; - - [mCookiesTable deselectAll: self]; // don't want any traces of previous selection - [mCookiesTable reloadData]; + NSEvent* currentEvent = [NSApp currentEvent]; + if (([currentEvent type] == NSKeyDown) && [[currentEvent characters] length] > 0) { + unichar character = [[currentEvent characters] characterAtIndex:0]; + if ((character == NSCarriageReturnCharacter) || (character == NSEnterCharacter)) { + if (source == mCookiesFilterField) + [mCookiesPanel performKeyEquivalent:currentEvent]; + else + [mPermissionsPanel performKeyEquivalent:currentEvent]; + } } } +- (IBAction)cookieFilterChanged:(id)sender +{ + if (!mCachedCookies || !mCookieManager) + return; + + NSString* filterString = [sender stringValue]; + + // reinitialize the list of cookies in case user deleted or replaced a letter + [self filterCookiesWithString:filterString]; + // re-sort + [self sortCookiesByColumn:[mCookiesTable highlightedTableColumn] inAscendingOrder:mSortedAscending]; + [mCookiesTable deselectAll:self]; // don't want any traces of previous selection + [mCookiesTable reloadData]; +} + +- (IBAction)permissionFilterChanged:(id)sender +{ + if (!mCachedPermissions || !mPermissionManager) + return; + + NSString* filterString = [sender stringValue]; + + // reinitialize the list of permission in case user deleted or replaced a letter. + [self filterCookiesPermissionsWithString:filterString]; + // re-sort + [self sortPermissionsByColumn:[mPermissionsTable highlightedTableColumn] inAscendingOrder:mSortedAscending]; + [mPermissionsTable deselectAll:self]; // don't want any traces of previous selection + [mPermissionsTable reloadData]; +} + - (void) filterCookiesPermissionsWithString: (NSString*) inFilterString { // the user wants to filter down the list of cookies. Reinitialize the list of permission in case