Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow sorting in cookie sites sheet (bug 179054)

Browse Source
This commit is contained in:
pinkerton%aol.net 2004-01-13 22:42:07 +00:00
parent 3210019872
commit 19b5a07d8d
4 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib generated
View File

@ -3,24 +3,10 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>487 65 356 240 0 0 1280 832 </string>
<string>115 71 356 240 0 0 1152 848 </string>
<key>IBFramework Version</key>
<string>291.0</string>
<key>IBGroupedObjects</key>
<dict>
<key>3</key>
<array>
<string>0</string>
<string>0</string>
</array>
</dict>
<key>IBLastGroupID</key>
<string>4</string>
<key>IBOpenObjects</key>
<array>
<integer>287</integer>
</array>
<string>362.0</string>
<key>IBSystem Version</key>
<string>6I32</string>
<string>7B85</string>
</dict>
</plist>

BIN
camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/objects.nib generated
View File

Binary file not shown.

8
camino/PreferencePanes/Privacy/PrivacyPane.h
View File

@ -1,11 +1,12 @@
#import <Cocoa/Cocoa.h>
#import <PreferencePanes/NSPreferencePane.h>
#import "PreferencePaneBase.h"
#include "nsCOMArray.h"
class nsIPref;
class nsIPermissionManager;
class nsISimpleEnumerator;
class nsISupportsArray;
class nsIPermission;
@interface OrgMozillaChimeraPreferencePrivacy : PreferencePaneBase
{
@ -20,7 +21,7 @@ class nsISupportsArray;
IBOutlet NSTableView* mSiteTable;
nsIPermissionManager* mManager; // STRONG (should be nsCOMPtr)
nsISupportsArray* mCachedPermissions; // parallel list of permissions for speed, STRONG (should be nsCOMPtr)
nsCOMArray<nsIPermission>* mCachedPermissions; // parallel list of permissions for speed
}
-(IBAction) clearCookies:(id)aSender;
@ -33,6 +34,9 @@ class nsISupportsArray;
- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
// NSTableView delegate methods
- (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)aTableColumn;
-(IBAction) clickEnableCookies:(id)sender;
-(IBAction) clickAskAboutCookies:(id)sender;

93
camino/PreferencePanes/Privacy/PrivacyPane.mm
View File

@ -8,7 +8,6 @@
#include "nsIPermissionManager.h"
#include "nsISimpleEnumerator.h"
#include "nsIPermission.h"
#include "nsISupportsArray.h"
#include "nsString.h"
@ -20,6 +19,31 @@ const int kPromptForCookiesTag = 99;
const int kEnableAllCookies = 0;
const int kDisableAllCookies = 2;
// callbacks for sorting the permission list
PR_STATIC_CALLBACK(int) compareHosts(nsIPermission* aPerm1, nsIPermission* aPerm2, void* aData)
{
nsCAutoString host1;
NS_CONST_CAST(nsIPermission*, aPerm1)->GetHost(host1);
nsCAutoString host2;
NS_CONST_CAST(nsIPermission*, aPerm2)->GetHost(host2);
return Compare(host1, host2);
}
PR_STATIC_CALLBACK(int) compareCapabilities(nsIPermission* aPerm1, nsIPermission* aPerm2, void* aData)
{
PRUint32 cap1 = 0;
NS_CONST_CAST(nsIPermission*, aPerm1)->GetCapability(&cap1);
PRUint32 cap2 = 0;
NS_CONST_CAST(nsIPermission*, aPerm2)->GetCapability(&cap2);
if(cap1 == cap2)
return compareHosts(aPerm1, aPerm2, aData);
return (cap1 < cap2) ? -1 : 1;
}
@implementation OrgMozillaChimeraPreferencePrivacy
- (void) dealloc
@ -141,7 +165,7 @@ const int kDisableAllCookies = 2;
mManager->GetEnumerator(getter_AddRefs(permEnum));
// build parallel permission list for speed with a lot of blocked sites
NS_NewISupportsArray(&mCachedPermissions); // ADDREFs
mCachedPermissions = new nsCOMArray<nsIPermission>;
if ( mCachedPermissions && permEnum ) {
PRBool hasMoreElements = PR_FALSE;
permEnum->HasMoreElements(&hasMoreElements);
@ -153,21 +177,25 @@ const int kDisableAllCookies = 2;
nsCAutoString type;
currPerm->GetType(type);
if ( type.Equals(NS_LITERAL_CSTRING("cookie")) )
mCachedPermissions->AppendElement(curr);
mCachedPermissions->AppendObject(currPerm);
}
permEnum->HasMoreElements(&hasMoreElements);
}
}
mCachedPermissions->Sort(compareHosts, nsnull);
[NSApp beginSheet:mCookieSitePanel
modalForWindow:[mCookiesEnabled window] // any old window accessor
modalDelegate:self
didEndSelector:@selector(editCookieSitesSheetDidEnd:returnCode:contextInfo:)
contextInfo:NULL];
[NSApp beginSheet:mCookieSitePanel
modalForWindow:[mCookiesEnabled window] // any old window accessor
modalDelegate:self
didEndSelector:@selector(editCookieSitesSheetDidEnd:returnCode:contextInfo:)
contextInfo:NULL];
// ensure a row is selected (cocoa doesn't do this for us, but will keep
// us from unselecting a row once one is set; go figure).
[mSiteTable selectRow:0 byExtendingSelection:NO];
[mSiteTable setHighlightedTableColumn:[mSiteTable tableColumnWithIdentifier:@"Website"]];
// 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,
@ -182,7 +210,8 @@ const int kDisableAllCookies = 2;
[mCookieSitePanel orderOut:self];
[NSApp endSheet:mCookieSitePanel];
NS_IF_RELEASE(mCachedPermissions);
delete mCachedPermissions;
mCachedPermissions = nsnull;
}
- (void)editCookieSitesSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
@ -195,20 +224,19 @@ const int kDisableAllCookies = 2;
if ( mCachedPermissions && mManager ) {
// remove from parallel array and cookie permissions list
int row = [mSiteTable selectedRow];
// remove from permission manager (which is done by host, not by row), then
// remove it from our parallel array (which is done by row). Since we keep a
// parallel array, removing multiple items by row is very difficult since after
// deleting, the array is out of sync with the next cocoa row we're told to remove. Punt!
nsCOMPtr<nsISupports> rowItem = dont_AddRef(mCachedPermissions->ElementAt(row));
nsCOMPtr<nsIPermission> perm ( do_QueryInterface(rowItem) );
if ( perm ) {
nsCAutoString host;
nsCAutoString host;
nsIPermission* perm = mCachedPermissions->ObjectAt(row);
if (perm) {
perm->GetHost(host);
mManager->Remove(host, "cookie"); // could this api _be_ any worse? Come on!
mCachedPermissions->RemoveElementAt(row);
mManager->Remove(host, "cookie"); // could this api _be_ any worse? Come on!
mCachedPermissions->RemoveObjectAt(row);
}
[mSiteTable reloadData];
}
}
@ -222,7 +250,7 @@ const int kDisableAllCookies = 2;
{
PRUint32 numRows = 0;
if ( mCachedPermissions )
mCachedPermissions->Count(&numRows);
numRows = mCachedPermissions->Count();
return (int) numRows;
}
@ -231,24 +259,19 @@ const int kDisableAllCookies = 2;
{
NSString* retVal = nil;
if ( mCachedPermissions ) {
nsCOMPtr<nsISupports> rowItem = dont_AddRef(mCachedPermissions->ElementAt(rowIndex));
nsCOMPtr<nsIPermission> perm ( do_QueryInterface(rowItem) );
if ( perm ) {
if ( [[aTableColumn identifier] isEqualToString:@"Website"] ) {
if ( [[aTableColumn identifier] isEqualToString:@"Website"] ) {
// website url column
nsCAutoString host;
perm->GetHost(host);
mCachedPermissions->ObjectAt(rowIndex)->GetHost(host);
retVal = [NSString stringWithCString:host.get()];
}
else {
} else {
// allow/deny column
PRUint32 capability = PR_FALSE;
perm->GetCapability(&capability);
mCachedPermissions->ObjectAt(rowIndex)->GetCapability(&capability);
if ( capability == nsIPermissionManager::ALLOW_ACTION)
retVal = [self getLocalizedString:@"Allow"];
else
retVal = [self getLocalizedString:@"Deny"];
}
}
}
@ -256,6 +279,22 @@ const int kDisableAllCookies = 2;
}
// NSTableView delegate methods
- (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)aTableColumn
{
if( mCachedPermissions && aTableColumn != [aTableView highlightedTableColumn] ) {
if ( [[aTableColumn identifier] isEqualToString:@"Website"] )
mCachedPermissions->Sort(compareHosts, nsnull);
else
mCachedPermissions->Sort(compareCapabilities, nsnull);
[aTableView setHighlightedTableColumn:aTableColumn];
[aTableView reloadData];
}
}
//
// clickStorePasswords
//