Revision: 12958
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12958&view=rev
Author: hofman
Date: 2008-03-03 15:17:46 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
Reinsert web view icon disabling.
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVWebViewIcon.m
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVWebViewIcon.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVWebViewIcon.m 2008-03-03
23:13:26 UTC (rev 12957)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVWebViewIcon.m 2008-03-03
23:17:46 UTC (rev 12958)
@@ -37,6 +37,7 @@
*/
#import "FVWebViewIcon.h"
+#import "FVTextIcon.h"
#import "FVFinderIcon.h"
#import "FVMIMEIcon.h"
#import <WebKit/WebKit.h>
@@ -44,6 +45,8 @@
@implementation FVWebViewIcon
+static BOOL FVWebIconDisabled = NO;
+
// webview pool variables to keep memory usage down; pool size is tunable
static NSInteger _maxWebViews = 5;
static NSMutableArray *_availableWebViews = nil;
@@ -60,6 +63,7 @@
{
FVINITIALIZE(FVWebViewIcon);
+ FVWebIconDisabled = [[NSUserDefaults standardUserDefaults]
boolForKey:@"FVWebIconDisabled"];
NSInteger maxViews = [[NSUserDefaults standardUserDefaults]
integerForKey:@"FVWebIconMaximumNumberOfWebViews"];
if (maxViews > 0)
_maxWebViews = maxViews;
@@ -97,10 +101,13 @@
NSParameterAssert(nil != [aURL scheme]);
// if this is not an http or file URL, return a finder icon instead
- if (NO == [[aURL scheme] isEqualToString:@"http"] && NO == [aURL
isFileURL]) {
+ if (FVWebIconDisabled || (NO == [[aURL scheme] isEqualToString:@"http"] &&
NO == [aURL isFileURL])) {
NSZone *zone = [self zone];
[self release];
- self = [[FVFinderIcon allocWithZone:zone]
initWithFinderIconOfURL:aURL];
+ if ([aURL isFileURL])
+ self = [[FVTextIcon allocWithZone:zone] initWithURL:aURL];
+ else
+ self = [[FVFinderIcon allocWithZone:zone]
initWithFinderIconOfURL:aURL];
}
else if ((self = [super init])) {
_httpURL = [aURL copy];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
