Thread: [tcobrowser-cvs] SF.net SVN: tcobrowser: [268] trunk/bibdesk
Status: Beta
Brought to you by:
amaxwell
From: <ama...@us...> - 2008-02-03 23:09:56
|
Revision: 268 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=268&view=rev Author: amaxwell Date: 2008-02-03 15:00:55 -0800 (Sun, 03 Feb 2008) Log Message: ----------- change all projects to 10.5 SDK, target 10.5+ only remove latex2rtf project remove leopard bundle Modified Paths: -------------- trunk/bibdesk/BibDesk-Common.xcconfig trunk/bibdesk/BibDocument.m trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj Removed Paths: ------------- trunk/bibdesk/BibDocument_Leopard.h trunk/bibdesk/BibDocument_Leopard.m trunk/bibdesk/Leopard-Info.plist trunk/bibdesk/vendorsrc/latex2rtf_sourceforge/ Modified: trunk/bibdesk/BibDesk-Common.xcconfig =================================================================== --- trunk/bibdesk/BibDesk-Common.xcconfig 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/BibDesk-Common.xcconfig 2008-02-03 23:00:55 UTC (rev 268) @@ -1,6 +1,6 @@ -SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk +SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk DEBUG_INFORMATION_FORMAT = dwarf -MACOSX_DEPLOYMENT_TARGET = 10.4 +MACOSX_DEPLOYMENT_TARGET = 10.5 COPY_PHASE_STRIP = YES STRIP_INSTALLED_PRODUCT = YES STRIP_STYLE = all Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/BibDocument.m 2008-02-03 23:00:55 UTC (rev 268) @@ -940,6 +940,123 @@ [super runModalSavePanelForSaveOperation:saveOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo]; } +- (BOOL)writeSafelyToURL:(NSURL *)absoluteURL ofType:(NSString *)typeName forSaveOperation:(NSSaveOperationType)saveOperation error:(NSError **)outError; +{ + BOOL didSave = [super writeSafelyToURL:absoluteURL ofType:typeName forSaveOperation:saveOperation error:outError]; + + /* + This is a workaround for https://sourceforge.net/tracker/index.php?func=detail&aid=1867790&group_id=61487&atid=497423 + Filed as rdar://problem/5679370 + + I'm not sure what the semantics of this operation are for NSAutosaveOperation, so it's excluded (but uses a different code path anyway, at least on Leopard). This also doesn't get hit for save-as or save-to since they don't do a safe-save, but they're handled anyway. FSExchangeObjects apparently avoids the bugs in FSPathReplaceObject, but doesn't preserve all of the metadata that those do. It's a shame that Apple can't preserve the file content as well as they preserve the metadata; I'd rather lose the ACLs than lose my bibliography. + + TODO: xattr handling, package vs. flat file (overwrite directory)? + xattrs from BibDesk seem to be preserved, so I'm not going to bother with that. + + TESTED: On AFP volume served by 10.4.11 Server, saving from 10.5.1 client; on AFP volume served by 10.5.1 client, saving from 10.5.1 client. Autosave, Save-As, and Save were tested. Saving to a local HFS+ volume doesn't hit this code path, and neither does saving to a FAT-32 thumb drive. + + */ + + NSParameterAssert(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4); + + if (NO == didSave && [absoluteURL isFileURL] && NSAutosaveOperation != saveOperation) { + + NSFileManager *fileManager = [NSFileManager defaultManager]; + + // this will create a new file on the same volume as the original file, which we will overwrite + // FSExchangeObjects requires both files to be on the same volume + NSString *tmpPath = [fileManager temporaryPathForWritingToPath:[absoluteURL path] allowOriginalDirectory:YES error:outError]; + NSURL *saveToURL = nil; + + // at this point, we're guaranteed that absoluteURL is non-nil and is a fileURL, but the file may not exist + + // save to or save as; file doesn't exist, so overwrite it + if (NSSaveOperation != saveOperation) + saveToURL = absoluteURL; + else if (nil != tmpPath) + saveToURL = [NSURL fileURLWithPath:tmpPath]; + + // if tmpPath failed, saveToURL is nil + if (nil != saveToURL) + didSave = [self writeToURL:saveToURL ofType:typeName forSaveOperation:saveOperation originalContentsURL:absoluteURL error:outError]; + + if (didSave) { + NSMutableDictionary *fattrs = [NSMutableDictionary dictionary]; + [fattrs addEntriesFromDictionary:[self fileAttributesToWriteToURL:saveToURL ofType:typeName forSaveOperation:saveOperation originalContentsURL:absoluteURL error:outError]]; + + // copy POSIX permissions from the old file + NSNumber *posixPerms = nil; + + if ([fileManager fileExistsAtPath:[absoluteURL path]]) + posixPerms = [[fileManager fileAttributesAtPath:[absoluteURL path] traverseLink:YES] objectForKey:NSFilePosixPermissions]; + + if (nil != posixPerms) + [fattrs setObject:posixPerms forKey:NSFilePosixPermissions]; + + // not checking return value here; non-critical + if ([fattrs count]) + [fileManager changeFileAttributes:fattrs atPath:[saveToURL path]]; + } + + // If this is not an overwriting operation, we already saved to absoluteURL, and we're done + // If this is an overwriting operation, do an atomic swap of the files + if (didSave && NSSaveOperation == saveOperation) { + + FSRef originalRef, newRef; + OSStatus err = coreFoundationUnknownErr; + + FSCatalogInfo catalogInfo; + if (CFURLGetFSRef((CFURLRef)absoluteURL, &originalRef)) + err = noErr; + + if (noErr == err) + err = FSGetCatalogInfo(&originalRef, kFSCatInfoVolume, &catalogInfo, NULL, NULL, NULL); + + GetVolParmsInfoBuffer infoBuffer; + err = FSGetVolumeParms(catalogInfo.volume, &infoBuffer, sizeof(GetVolParmsInfoBuffer)); + + if (noErr == err) { + + // only meaningful in v3 or greater GetVolParmsInfoBuffer + SInt32 vmExtAttr = infoBuffer.vMExtendedAttributes; + + // in v2 or less or v3 without HFS+ support, the File Manager will implement FSExchangeObjects if bHasFileIDs is set + + // MoreFilesX.h has macros that show how to read the bitfields for the enums + if (infoBuffer.vMVersion > 2 && (vmExtAttr & (1L << bSupportsHFSPlusAPIs)) != 0 && (vmExtAttr & (1L << bSupportsFSExchangeObjects)) != 0) + err = noErr; + else if ((infoBuffer.vMVersion <= 2 || (vmExtAttr & (1L << bSupportsHFSPlusAPIs)) == 0) && (infoBuffer.vMAttrib & (1L << bHasFileIDs)) != 0) + err = noErr; + else + err = errFSUnknownCall; + + // do an atomic swap of the files + // On an AFP volume (Server 10.4.11), xattrs from the original file are preserved using either function + + if (noErr == err && CFURLGetFSRef((CFURLRef)saveToURL, &newRef)) { + // this avoids breaking aliases and FSRefs + err = FSExchangeObjects(&newRef, &originalRef); + } + else /* if we couldn't get an FSRef or bSupportsFSExchangeObjects is not supported */ { + // rename() is atomic, but it probably breaks aliases and FSRefs + // FSExchangeObjects() uses exchangedata() so there's no point in trying that + err = rename([[saveToURL path] fileSystemRepresentation], [[absoluteURL path] fileSystemRepresentation]); + } + } + + if (noErr != err) { + didSave = NO; + if (outError) *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:err userInfo:nil]; + } + else if ([self keepBackupFile] == NO) { + // not checking return value here; non-critical, and fails if rename() was used + [fileManager removeFileAtPath:[saveToURL path] handler:nil]; + } + } + } + return didSave; +} + - (BOOL)saveToURL:(NSURL *)absoluteURL ofType:(NSString *)typeName forSaveOperation:(NSSaveOperationType)saveOperation error:(NSError **)outError{ // Set the string encoding according to the popup. Deleted: trunk/bibdesk/BibDocument_Leopard.h =================================================================== --- trunk/bibdesk/BibDocument_Leopard.h 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/BibDocument_Leopard.h 2008-02-03 23:00:55 UTC (rev 268) @@ -1,44 +0,0 @@ -// -// BibDocument_Leopard.h -// Bibdesk -// -// Created by Adam Maxwell on 1/11/08. -/* - This software is Copyright (c) 2008 - Adam Maxwell. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import <Cocoa/Cocoa.h> -#import "BibDocument.h" - -@interface BibDocument (Leopard) - -@end Deleted: trunk/bibdesk/BibDocument_Leopard.m =================================================================== --- trunk/bibdesk/BibDocument_Leopard.m 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/BibDocument_Leopard.m 2008-02-03 23:00:55 UTC (rev 268) @@ -1,165 +0,0 @@ -// -// BibDocument_Leopard.m -// Bibdesk -// -// Created by Adam Maxwell on 1/11/08. -/* - This software is Copyright (c) 2008 - Adam Maxwell. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import "BibDocument_Leopard.h" - -// Omni's framework headers won't allow us to compile with 10.4 as min version and 10.5 as SDK. It may work to build this target with 10.5/10.5 settings and link against the Omni frameworks, but I'm not sure. -@interface NSFileManager (BDSKOFExtensions) -- (NSString *)temporaryPathForWritingToPath:(NSString *)aPath allowOriginalDirectory:(BOOL)allow error:(NSError **)outError; -@end - -@implementation BibDocument (Leopard) - -- (BOOL)writeSafelyToURL:(NSURL *)absoluteURL ofType:(NSString *)typeName forSaveOperation:(NSSaveOperationType)saveOperation error:(NSError **)outError; -{ - BOOL didSave = [super writeSafelyToURL:absoluteURL ofType:typeName forSaveOperation:saveOperation error:outError]; - - /* - This is a workaround for https://sourceforge.net/tracker/index.php?func=detail&aid=1867790&group_id=61487&atid=497423 - Filed as rdar://problem/5679370 - - I'm not sure what the semantics of this operation are for NSAutosaveOperation, so it's excluded (but uses a different code path anyway, at least on Leopard). This also doesn't get hit for save-as or save-to since they don't do a safe-save, but they're handled anyway. FSExchangeObjects apparently avoids the bugs in FSPathReplaceObject, but doesn't preserve all of the metadata that those do. It's a shame that Apple can't preserve the file content as well as they preserve the metadata; I'd rather lose the ACLs than lose my bibliography. - - TODO: xattr handling, package vs. flat file (overwrite directory)? - xattrs from BibDesk seem to be preserved, so I'm not going to bother with that. - - TESTED: On AFP volume served by 10.4.11 Server, saving from 10.5.1 client; on AFP volume served by 10.5.1 client, saving from 10.5.1 client. Autosave, Save-As, and Save were tested. Saving to a local HFS+ volume doesn't hit this code path, and neither does saving to a FAT-32 thumb drive. - - */ - - NSParameterAssert(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4); - - if (NO == didSave && [absoluteURL isFileURL] && NSAutosaveOperation != saveOperation) { - - NSFileManager *fileManager = [NSFileManager defaultManager]; - - // this will create a new file on the same volume as the original file, which we will overwrite - // FSExchangeObjects requires both files to be on the same volume - NSString *tmpPath = [fileManager temporaryPathForWritingToPath:[absoluteURL path] allowOriginalDirectory:YES error:outError]; - NSURL *saveToURL = nil; - - // at this point, we're guaranteed that absoluteURL is non-nil and is a fileURL, but the file may not exist - - // save to or save as; file doesn't exist, so overwrite it - if (NSSaveOperation != saveOperation) - saveToURL = absoluteURL; - else if (nil != tmpPath) - saveToURL = [NSURL fileURLWithPath:tmpPath]; - - // if tmpPath failed, saveToURL is nil - if (nil != saveToURL) - didSave = [self writeToURL:saveToURL ofType:typeName forSaveOperation:saveOperation originalContentsURL:absoluteURL error:outError]; - - if (didSave) { - NSMutableDictionary *fattrs = [NSMutableDictionary dictionary]; - [fattrs addEntriesFromDictionary:[self fileAttributesToWriteToURL:saveToURL ofType:typeName forSaveOperation:saveOperation originalContentsURL:absoluteURL error:outError]]; - - // copy POSIX permissions from the old file - NSNumber *posixPerms = nil; - - if ([fileManager fileExistsAtPath:[absoluteURL path]]) - posixPerms = [[fileManager fileAttributesAtPath:[absoluteURL path] traverseLink:YES] objectForKey:NSFilePosixPermissions]; - - if (nil != posixPerms) - [fattrs setObject:posixPerms forKey:NSFilePosixPermissions]; - - // not checking return value here; non-critical - if ([fattrs count]) - [fileManager changeFileAttributes:fattrs atPath:[saveToURL path]]; - } - - // If this is not an overwriting operation, we already saved to absoluteURL, and we're done - // If this is an overwriting operation, do an atomic swap of the files - if (didSave && NSSaveOperation == saveOperation) { - - FSRef originalRef, newRef; - OSStatus err = coreFoundationUnknownErr; - - FSCatalogInfo catalogInfo; - if (CFURLGetFSRef((CFURLRef)absoluteURL, &originalRef)) - err = noErr; - - if (noErr == err) - err = FSGetCatalogInfo(&originalRef, kFSCatInfoVolume, &catalogInfo, NULL, NULL, NULL); - - GetVolParmsInfoBuffer infoBuffer; - err = FSGetVolumeParms(catalogInfo.volume, &infoBuffer, sizeof(GetVolParmsInfoBuffer)); - - if (noErr == err) { - - // only meaningful in v3 or greater GetVolParmsInfoBuffer - SInt32 vmExtAttr = infoBuffer.vMExtendedAttributes; - - // in v2 or less or v3 without HFS+ support, the File Manager will implement FSExchangeObjects if bHasFileIDs is set - - // MoreFilesX.h has macros that show how to read the bitfields for the enums - if (infoBuffer.vMVersion > 2 && (vmExtAttr & (1L << bSupportsHFSPlusAPIs)) != 0 && (vmExtAttr & (1L << bSupportsFSExchangeObjects)) != 0) - err = noErr; - else if ((infoBuffer.vMVersion <= 2 || (vmExtAttr & (1L << bSupportsHFSPlusAPIs)) == 0) && (infoBuffer.vMAttrib & (1L << bHasFileIDs)) != 0) - err = noErr; - else - err = errFSUnknownCall; - - // do an atomic swap of the files - // On an AFP volume (Server 10.4.11), xattrs from the original file are preserved using either function - - if (noErr == err && CFURLGetFSRef((CFURLRef)saveToURL, &newRef)) { - // this avoids breaking aliases and FSRefs - err = FSExchangeObjects(&newRef, &originalRef); - } - else /* if we couldn't get an FSRef or bSupportsFSExchangeObjects is not supported */ { - // rename() is atomic, but it probably breaks aliases and FSRefs - // FSExchangeObjects() uses exchangedata() so there's no point in trying that - err = rename([[saveToURL path] fileSystemRepresentation], [[absoluteURL path] fileSystemRepresentation]); - } - } - - if (noErr != err) { - didSave = NO; - if (outError) *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:err userInfo:nil]; - } - else if ([self keepBackupFile] == NO) { - // not checking return value here; non-critical, and fails if rename() was used - [fileManager removeFileAtPath:[saveToURL path] handler:nil]; - } - } - } - return didSave; -} - -@end Modified: trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) @@ -305,7 +305,7 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH)"; MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -317,7 +317,7 @@ i386, ); MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Release; }; @@ -329,7 +329,7 @@ i386, ); MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Default; }; Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 44; objects = { /* Begin PBXAggregateTarget section */ @@ -41,7 +41,6 @@ F911D6C10CFE8EBD0009C77B /* PBXTargetDependency */, F9CA0C810CDF93E30059D36D /* PBXTargetDependency */, F9CA0C7F0CDF93D80059D36D /* PBXTargetDependency */, - F93C37D10D387D54006EB558 /* PBXTargetDependency */, ); name = "BibDesk+QuickLook"; productName = "BibDesk+QuickLook"; @@ -279,16 +278,10 @@ CED65DCD0907A338003EED90 /* BDSKScriptHook+Scripting.m in Sources */ = {isa = PBXBuildFile; fileRef = CED65DCB0907A338003EED90 /* BDSKScriptHook+Scripting.m */; }; CEDB58F40D3692A400E40354 /* ComplexStringEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = CEDB58F20D3692A400E40354 /* ComplexStringEditor.nib */; }; CEE22B210BFB7DA8002B746B /* RelNotes.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F994B8F607F5F65F00751DA1 /* RelNotes.rtf */; }; - CEE23BDB0BFBA768002B746B /* BibDeskInputManager in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022D2C0758069E00C3F701 /* BibDeskInputManager */; }; CEE23BDC0BFBA775002B746B /* Scripts in CopyFiles */ = {isa = PBXBuildFile; fileRef = CEE23BD50BFBA6D6002B746B /* Scripts */; }; CEE23BDD0BFBA781002B746B /* Templates in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE97A3B90A28F19A00CF2DF3 /* Templates */; }; CEE23BE40BFBA78F002B746B /* previewtemplate.tex in CopyFiles */ = {isa = PBXBuildFile; fileRef = F91B5CC7076579830011ED22 /* previewtemplate.tex */; }; CEE23BE50BFBA78F002B746B /* template.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = F91B5CE407657A200011ED22 /* template.txt */; }; - CEE23BEF0BFBA827002B746B /* direct.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022D4B0758073E00C3F701 /* direct.cfg */; }; - CEE23BF00BFBA827002B746B /* english.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022D4D0758073E00C3F701 /* english.cfg */; }; - CEE23BF10BFBA827002B746B /* fonts.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022D510758073E00C3F701 /* fonts.cfg */; }; - CEE23BF20BFBA827002B746B /* ignore.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022D560758073E00C3F701 /* ignore.cfg */; }; - CEE23BF30BFBA827002B746B /* style.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022D690758073E00C3F701 /* style.cfg */; }; CEEA4C6A0B57B0D400434059 /* BDSKBooleanValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEA4C680B57B0D400434059 /* BDSKBooleanValueTransformer.m */; }; CEEA5EA40B595EE200434059 /* ChangeFieldSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = CEEA5E9E0B595EE200434059 /* ChangeFieldSheet.nib */; }; CEEC6C55093A411E00A64F54 /* BDSKCollapsibleView.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEC6C53093A411E00A64F54 /* BDSKCollapsibleView.m */; }; @@ -414,7 +407,6 @@ F9025F310969D66F008A551C /* CFString_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F9025F2F0969D66F008A551C /* CFString_BDSKExtensions.m */; }; F90261AE096A0EF5008A551C /* OFCharacterSet_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F90261AC096A0EF5008A551C /* OFCharacterSet_BDSKExtensions.m */; }; F90B09420C283B5100144F1B /* BDSKLogUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F90B09400C283B5100144F1B /* BDSKLogUtilities.m */; }; - F90B13030C298FE900144F1B /* latex2rtf in Resources */ = {isa = PBXBuildFile; fileRef = F90B13010C298FC900144F1B /* latex2rtf */; }; F90C4ACE0C7395FC0035DD50 /* BDSKSciFinderParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F90C4ACC0C7395FB0035DD50 /* BDSKSciFinderParser.m */; }; F90C64070AC62B7B008B2DDA /* BDSKShellCommandFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F90C64050AC62B7B008B2DDA /* BDSKShellCommandFormatter.m */; }; F911D6BC0CFE8E690009C77B /* FileView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F911D6B40CFE8E420009C77B /* FileView.framework */; }; @@ -446,9 +438,6 @@ F92F4E470788DEDD001B8F82 /* genericBibDocIcon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F92F4E460788DEDD001B8F82 /* genericBibDocIcon.tiff */; }; F92F4E4F0788DEFC001B8F82 /* BibPref_Files.m in Sources */ = {isa = PBXBuildFile; fileRef = F92F4E4D0788DEFC001B8F82 /* BibPref_Files.m */; }; F938408A0906DD1F00FC37F2 /* scripthook.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F93840890906DD1F00FC37F2 /* scripthook.tiff */; }; - F93C37B70D387BCB006EB558 /* BibDocument_Leopard.m in Sources */ = {isa = PBXBuildFile; fileRef = F93C37B30D387B76006EB558 /* BibDocument_Leopard.m */; }; - F93C37E60D387EA5006EB558 /* Leopard.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = F93C37AC0D387AEE006EB558 /* Leopard.bundle */; }; - F93C38180D38820B006EB558 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; F940D10A0B5568E400B5917A /* BDSKReferParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F940D1080B5568E400B5917A /* BDSKReferParser.m */; }; F941135509B549BF00EE8463 /* BDSKEditorTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F941135309B549BF00EE8463 /* BDSKEditorTextView.m */; }; F941B7EB08AA574200F04ECD /* BDSKOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = F941B7E908AA574200F04ECD /* BDSKOverlay.m */; }; @@ -460,6 +449,7 @@ F94AA36B0BE8FD87007BCE2B /* Preferences.strings in Resources */ = {isa = PBXBuildFile; fileRef = F94AA3690BE8FD87007BCE2B /* Preferences.strings */; }; F94DB0F90B3E2FA1006F37A2 /* BDSKSearchGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = F94DB0F70B3E2FA1006F37A2 /* BDSKSearchGroup.m */; }; F94DE74C09CB46FF00B5FD51 /* BDSKPersistentSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = F94DE74A09CB46FF00B5FD51 /* BDSKPersistentSearch.m */; }; + F95B874E0D567E8E005DC4F3 /* BibDesk.qlgenerator in CopyFiles */ = {isa = PBXBuildFile; fileRef = F98C6FD00CDD30A2002FCAD8 /* BibDesk.qlgenerator */; }; F95CC0C3087F5378002C5694 /* NSFileManager_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F95CC0C1087F5378002C5694 /* NSFileManager_BDSKExtensions.m */; }; F95D3FA709DDF51D00D793A6 /* BibPref_Sharing.nib in Resources */ = {isa = PBXBuildFile; fileRef = F95D3FA509DDF51D00D793A6 /* BibPref_Sharing.nib */; }; F95D3FAF09DDF6A900D793A6 /* BibPref_Sharing.m in Sources */ = {isa = PBXBuildFile; fileRef = F95D3FAD09DDF6A900D793A6 /* BibPref_Sharing.m */; }; @@ -547,20 +537,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - F90B13000C298FC900144F1B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F90B12F90C298FC900144F1B /* latex2rtf.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8DD76FB20486AB0100D96B5E; - remoteInfo = latex2rtf; - }; - F90B13040C29900200144F1B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F90B12F90C298FC900144F1B /* latex2rtf.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8DD76FA90486AB0100D96B5E; - remoteInfo = latex2rtf; - }; F911D6B30CFE8E420009C77B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; @@ -610,13 +586,20 @@ remoteGlobalIDString = 8DD76F960486AA7600D96B5E; remoteInfo = SkimNotesAgent; }; - F93C37D00D387D54006EB558 /* PBXContainerItemProxy */ = { + F95B87410D567DC0005DC4F3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; proxyType = 1; - remoteGlobalIDString = F93C37AB0D387AEE006EB558; - remoteInfo = Leopard; + remoteGlobalIDString = F9F04CE10CE260EB00F28ED2 /* Framework + Plugin */; + remoteInfo = "Framework + Plugin"; }; + F95B87430D567DCC005DC4F3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F98C6FC80CDD30A2002FCAD8 /* QuickLook-BibDesk.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D57630D048677EA00EA77CD /* BibDesk */; + remoteInfo = BibDesk; + }; F95CC112087F54BF002C5694 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F95CC0C6087F53AE002C5694 /* BibImporter.xcodeproj */; @@ -666,13 +649,6 @@ remoteGlobalIDString = 4A4E05FE08AA72B10098FF0F; remoteInfo = OmniFoundation; }; - F9AF56330BEA4160009B16D5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F9F14A5A075811F9008BA22F /* BibDeskInputManager.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D5B49AC048680CD000E48DA; - remoteInfo = BibDeskInputManager; - }; F9AF56350BEA4160009B16D5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F911CB4008972F7300ABDAC6 /* AGRegex.xcodeproj */; @@ -701,13 +677,6 @@ remoteGlobalIDString = F935668E0912D570002B6957; remoteInfo = RegexTest; }; - F9C7E5510BEA3C2700D65C7F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F9F14A5A075811F9008BA22F /* BibDeskInputManager.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8D5B49B6048680CD000E48DA; - remoteInfo = BibDeskInputManager; - }; F9C7E55D0BEA3C4700D65C7F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F9AA030C092FA2E20094A059 /* OmniAppKit.xcodeproj */; @@ -864,17 +833,11 @@ dstPath = ""; dstSubfolderSpec = 12; files = ( - CEE23BDB0BFBA768002B746B /* BibDeskInputManager in CopyFiles */, CEE23BDC0BFBA775002B746B /* Scripts in CopyFiles */, CEE23BDD0BFBA781002B746B /* Templates in CopyFiles */, CEE23BE40BFBA78F002B746B /* previewtemplate.tex in CopyFiles */, CEE23BE50BFBA78F002B746B /* template.txt in CopyFiles */, CEF181BD0CEB711700716E85 /* Bookmarks.plist in CopyFiles */, - CEE23BEF0BFBA827002B746B /* direct.cfg in CopyFiles */, - CEE23BF00BFBA827002B746B /* english.cfg in CopyFiles */, - CEE23BF10BFBA827002B746B /* fonts.cfg in CopyFiles */, - CEE23BF20BFBA827002B746B /* ignore.cfg in CopyFiles */, - CEE23BF30BFBA827002B746B /* style.cfg in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -884,10 +847,19 @@ dstPath = BibDesk.app/Contents/Resources; dstSubfolderSpec = 16; files = ( - F93C37E60D387EA5006EB558 /* Leopard.bundle in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; + F95B874D0D567E84005DC4F3 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = Contents/Library/QuickLook; + dstSubfolderSpec = 1; + files = ( + F95B874E0D567E8E005DC4F3 /* BibDesk.qlgenerator in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F95CC0ED087F542F002C5694 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1375,11 +1347,6 @@ F9022D180758066000C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/ReadMe.rtf; sourceTree = "<group>"; }; F9022D1B0758066000C3F701 /* TypeInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = TypeInfo.plist; sourceTree = "<group>"; }; F9022D2C0758069E00C3F701 /* BibDeskInputManager */ = {isa = PBXFileReference; lastKnownFileType = folder; path = BibDeskInputManager; sourceTree = BUILT_PRODUCTS_DIR; }; - F9022D4B0758073E00C3F701 /* direct.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = direct.cfg; path = vendorsrc/latex2rtf_sourceforge/latex2rtf/cfg/direct.cfg; sourceTree = SOURCE_ROOT; }; - F9022D4D0758073E00C3F701 /* english.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = english.cfg; path = vendorsrc/latex2rtf_sourceforge/latex2rtf/cfg/english.cfg; sourceTree = SOURCE_ROOT; }; - F9022D510758073E00C3F701 /* fonts.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = fonts.cfg; path = vendorsrc/latex2rtf_sourceforge/latex2rtf/cfg/fonts.cfg; sourceTree = SOURCE_ROOT; }; - F9022D560758073E00C3F701 /* ignore.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = ignore.cfg; path = vendorsrc/latex2rtf_sourceforge/latex2rtf/cfg/ignore.cfg; sourceTree = SOURCE_ROOT; }; - F9022D690758073E00C3F701 /* style.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = style.cfg; path = vendorsrc/latex2rtf_sourceforge/latex2rtf/cfg/style.cfg; sourceTree = SOURCE_ROOT; }; F9022DA20758088000C3F701 /* Action_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Action_Pressed.tiff; path = Images/Action_Pressed.tiff; sourceTree = "<group>"; }; F9022DA30758088000C3F701 /* Action.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Action.tiff; path = Images/Action.tiff; sourceTree = "<group>"; }; F9022DA40758088000C3F701 /* Add_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Add_Pressed.tiff; path = Images/Add_Pressed.tiff; sourceTree = "<group>"; }; @@ -1428,7 +1395,6 @@ F90261AC096A0EF5008A551C /* OFCharacterSet_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OFCharacterSet_BDSKExtensions.m; sourceTree = "<group>"; }; F90B093F0C283B5100144F1B /* BDSKLogUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKLogUtilities.h; sourceTree = "<group>"; }; F90B09400C283B5100144F1B /* BDSKLogUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKLogUtilities.m; sourceTree = "<group>"; }; - F90B12F90C298FC900144F1B /* latex2rtf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = latex2rtf.xcodeproj; path = vendorsrc/latex2rtf_sourceforge/latex2rtf/latex2rtf.xcodeproj; sourceTree = "<group>"; }; F90C4ACB0C7395FB0035DD50 /* BDSKSciFinderParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKSciFinderParser.h; sourceTree = "<group>"; }; F90C4ACC0C7395FB0035DD50 /* BDSKSciFinderParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKSciFinderParser.m; sourceTree = "<group>"; }; F90C64040AC62B7B008B2DDA /* BDSKShellCommandFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKShellCommandFormatter.h; sourceTree = "<group>"; }; @@ -1489,10 +1455,6 @@ F9377F550B423A4C00ECCB3A /* yaz.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = yaz.xcodeproj; path = vendorsrc/indexdata/yaz/objc/yaz.xcodeproj; sourceTree = "<group>"; }; F93840890906DD1F00FC37F2 /* scripthook.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = scripthook.tiff; path = Images/scripthook.tiff; sourceTree = "<group>"; }; F93C35DF0D35D97B006EB558 /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BDSKFileMigration.nib; sourceTree = "<group>"; }; - F93C37AC0D387AEE006EB558 /* Leopard.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Leopard.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - F93C37AD0D387AEE006EB558 /* Leopard-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Leopard-Info.plist"; sourceTree = "<group>"; }; - F93C37B20D387B76006EB558 /* BibDocument_Leopard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BibDocument_Leopard.h; sourceTree = "<group>"; }; - F93C37B30D387B76006EB558 /* BibDocument_Leopard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BibDocument_Leopard.m; sourceTree = "<group>"; }; F940D1070B5568E400B5917A /* BDSKReferParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKReferParser.h; sourceTree = "<group>"; }; F940D1080B5568E400B5917A /* BDSKReferParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKReferParser.m; sourceTree = "<group>"; }; F941135209B549BF00EE8463 /* BDSKEditorTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKEditorTextView.h; sourceTree = "<group>"; }; @@ -1706,7 +1668,6 @@ F9EF94E40D15FE7400314058 /* BDSKFileMigrationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKFileMigrationController.m; sourceTree = "<group>"; }; F9EF94EA0D16014000314058 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BDSKFileMigration.nib; sourceTree = "<group>"; }; F9F0856808247BC800812F2A /* postprocess-nontitle.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = "postprocess-nontitle.py"; path = "BibDesk Help/postprocess-nontitle.py"; sourceTree = "<group>"; }; - F9F14A5A075811F9008BA22F /* BibDeskInputManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BibDeskInputManager.xcodeproj; path = inputmanager/BibDeskInputManager.xcodeproj; sourceTree = "<group>"; }; F9F5E20B0AE307C0007EBB31 /* NSError_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSError_BDSKExtensions.h; sourceTree = "<group>"; }; F9F5E20C0AE307C0007EBB31 /* NSError_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSError_BDSKExtensions.m; sourceTree = "<group>"; }; F9F5ECCF0AE5E7C8007EBB31 /* BDSKURLGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKURLGroup.h; sourceTree = "<group>"; }; @@ -1769,14 +1730,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - F93C37AA0D387AEE006EB558 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - F93C38180D38820B006EB558 /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -1823,7 +1776,6 @@ 8D1107320486CEB800E47090 /* BibDesk.app */, 275E270707838EE30070398A /* TestBibItem.bundle */, 27CD032407D82C7400806B7E /* TestComplexString.bundle */, - F93C37AC0D387AEE006EB558 /* Leopard.bundle */, ); name = Products; sourceTree = "<group>"; @@ -1882,7 +1834,6 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, F95C5EDE0D10F5F100C81970 /* Configurations */, - F93C37DD0D387DEE006EB558 /* Leopard */, ); name = BibDesk; sourceTree = "<group>"; @@ -2345,11 +2296,6 @@ F9022D410758073E00C3F701 /* cfg */ = { isa = PBXGroup; children = ( - F9022D4B0758073E00C3F701 /* direct.cfg */, - F9022D4D0758073E00C3F701 /* english.cfg */, - F9022D510758073E00C3F701 /* fonts.cfg */, - F9022D560758073E00C3F701 /* ignore.cfg */, - F9022D690758073E00C3F701 /* style.cfg */, ); name = cfg; path = ../../build/bibdesk_vendorsrc/latex2rtf_sourceforge/latex2rtf/cfg; @@ -2434,14 +2380,6 @@ name = Images; sourceTree = "<group>"; }; - F90B12FA0C298FC900144F1B /* Products */ = { - isa = PBXGroup; - children = ( - F90B13010C298FC900144F1B /* latex2rtf */, - ); - name = Products; - sourceTree = "<group>"; - }; F911D6A90CFE8E420009C77B /* Products */ = { isa = PBXGroup; children = ( @@ -2737,16 +2675,6 @@ name = Products; sourceTree = "<group>"; }; - F93C37DD0D387DEE006EB558 /* Leopard */ = { - isa = PBXGroup; - children = ( - F93C37B20D387B76006EB558 /* BibDocument_Leopard.h */, - F93C37B30D387B76006EB558 /* BibDocument_Leopard.m */, - F93C37AD0D387AEE006EB558 /* Leopard-Info.plist */, - ); - name = Leopard; - sourceTree = "<group>"; - }; F95C5EDE0D10F5F100C81970 /* Configurations */ = { isa = PBXGroup; children = ( @@ -2799,7 +2727,6 @@ children = ( F911D6A80CFE8E420009C77B /* FileView.xcodeproj */, F98C6FC80CDD30A2002FCAD8 /* QuickLook-BibDesk.xcodeproj */, - F90B12F90C298FC900144F1B /* latex2rtf.xcodeproj */, F92BACEA0BCC00D2008D5BC3 /* SkimNotesAgent.xcodeproj */, F9377F550B423A4C00ECCB3A /* yaz.xcodeproj */, F9AA030C092FA2E20094A059 /* OmniAppKit.xcodeproj */, @@ -2808,7 +2735,6 @@ F911CB4008972F7300ABDAC6 /* AGRegex.xcodeproj */, F95CC0C6087F53AE002C5694 /* BibImporter.xcodeproj */, F9ABECF2086E142100741FC5 /* BTParse.xcodeproj */, - F9F14A5A075811F9008BA22F /* BibDeskInputManager.xcodeproj */, ); name = Subprojects; sourceTree = "<group>"; @@ -2830,14 +2756,6 @@ name = Products; sourceTree = "<group>"; }; - F9C7E54D0BEA3C2700D65C7F /* Products */ = { - isa = PBXGroup; - children = ( - F9C7E5520BEA3C2700D65C7F /* BibDeskInputManager.bundle */, - ); - name = Products; - sourceTree = "<group>"; - }; F9C7E5570BEA3C4700D65C7F /* Products */ = { isa = PBXGroup; children = ( @@ -2977,6 +2895,7 @@ CE424A430D0F121400F824E7 /* Headers */, F91B5C4E076412A10011ED22 /* CopyFiles */, F95CC0ED087F542F002C5694 /* CopyFiles */, + F95B874D0D567E84005DC4F3 /* CopyFiles */, F9FF213B09E83BAB00BB1706 /* ShellScript */, F91E54660853576600208CDF /* ShellScript */, F95C5E850D10E52400C81970 /* ShellScript */, @@ -2985,7 +2904,6 @@ ); dependencies = ( F9EF0CE20B4EFC8F00A1F282 /* PBXTargetDependency */, - F9AF56340BEA4160009B16D5 /* PBXTargetDependency */, F92BACF40BCC00EB008D5BC3 /* PBXTargetDependency */, F9AF562E0BEA4160009B16D5 /* PBXTargetDependency */, F9AF56320BEA4160009B16D5 /* PBXTargetDependency */, @@ -2993,8 +2911,9 @@ F9AF56360BEA4160009B16D5 /* PBXTargetDependency */, F9AF56380BEA4160009B16D5 /* PBXTargetDependency */, F9AF562C0BEA4160009B16D5 /* PBXTargetDependency */, - F90B13050C29900200144F1B /* PBXTargetDependency */, F911D6BF0CFE8EAA0009C77B /* PBXTargetDependency */, + F95B87420D567DC0005DC4F3 /* PBXTargetDependency */, + F95B87440D567DCC005DC4F3 /* PBXTargetDependency */, ); name = BibDesk; productInstallPath = "$(HOME)/Applications"; @@ -3002,30 +2921,13 @@ productReference = 8D1107320486CEB800E47090 /* BibDesk.app */; productType = "com.apple.product-type.application"; }; - F93C37AB0D387AEE006EB558 /* Leopard */ = { - isa = PBXNativeTarget; - buildConfigurationList = F93C37B10D387AF4006EB558 /* Build configuration list for PBXNativeTarget "Leopard" */; - buildPhases = ( - F93C37A80D387AEE006EB558 /* Resources */, - F93C37A90D387AEE006EB558 /* Sources */, - F93C37AA0D387AEE006EB558 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Leopard; - productName = Leopard; - productReference = F93C37AC0D387AEE006EB558 /* Leopard.bundle */; - productType = "com.apple.product-type.bundle"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = F993F20208553A61007A7657 /* Build configuration list for PBXProject "Bibdesk" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* BibDesk */; projectDirPath = ""; @@ -3035,10 +2937,6 @@ ProjectRef = F911CB4008972F7300ABDAC6 /* AGRegex.xcodeproj */; }, { - ProductGroup = F9C7E54D0BEA3C2700D65C7F /* Products */; - ProjectRef = F9F14A5A075811F9008BA22F /* BibDeskInputManager.xcodeproj */; - }, - { ProductGroup = F95CC10F087F54BF002C5694 /* Products */; ProjectRef = F95CC0C6087F53AE002C5694 /* BibImporter.xcodeproj */; }, @@ -3051,10 +2949,6 @@ ProjectRef = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; }, { - ProductGroup = F90B12FA0C298FC900144F1B /* Products */; - ProjectRef = F90B12F90C298FC900144F1B /* latex2rtf.xcodeproj */; - }, - { ProductGroup = F9C7E5570BEA3C4700D65C7F /* Products */; ProjectRef = F9AA030C092FA2E20094A059 /* OmniAppKit.xcodeproj */; }, @@ -3087,19 +2981,11 @@ 275E270607838EE30070398A /* TestBibItem */, 27CD032307D82C7400806B7E /* TestComplexString */, F9CA0C7A0CDF93D10059D36D /* BibDesk+QuickLook */, - F93C37AB0D387AEE006EB558 /* Leopard */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - F90B13010C298FC900144F1B /* latex2rtf */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = latex2rtf; - remoteRef = F90B13000C298FC900144F1B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; F911D6B40CFE8E420009C77B /* FileView.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -3163,13 +3049,6 @@ remoteRef = F9C7E5480BEA3C0500D65C7F /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F9C7E5520BEA3C2700D65C7F /* BibDeskInputManager.bundle */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BibDeskInputManager.bundle; - remoteRef = F9C7E5510BEA3C2700D65C7F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; F9C7E55E0BEA3C4700D65C7F /* OmniAppKit.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -3346,7 +3225,6 @@ F9BF481F0BD69F700071094F /* MODS2MARC21slim.xsl in Resources */, CEEC72F7093BDCA200A64F54 /* BibDesk.sdef in Resources */, F92BACF50BCC0140008D5BC3 /* SkimNotesAgent in Resources */, - F90B13030C298FE900144F1B /* latex2rtf in Resources */, F9022DBD0758088000C3F701 /* Action_Pressed.tiff in Resources */, F9022DBE0758088000C3F701 /* Action.tiff in Resources */, F9022DBF0758088000C3F701 /* Add_Pressed.tiff in Resources */, @@ -3432,13 +3310,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - F93C37A80D387AEE006EB558 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXRezBuildPhase section */ @@ -3897,22 +3768,9 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - F93C37A90D387AEE006EB558 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - F93C37B70D387BCB006EB558 /* BibDocument_Leopard.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - F90B13050C29900200144F1B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = latex2rtf; - targetProxy = F90B13040C29900200144F1B /* PBXContainerItemProxy */; - }; F911D6BF0CFE8EAA0009C77B /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = FileView; @@ -3928,11 +3786,16 @@ name = SkimNotesAgent; targetProxy = F92BACF30BCC00EB008D5BC3 /* PBXContainerItemProxy */; }; - F93C37D10D387D54006EB558 /* PBXTargetDependency */ = { + F95B87420D567DC0005DC4F3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = F93C37AB0D387AEE006EB558 /* Leopard */; - targetProxy = F93C37D00D387D54006EB558 /* PBXContainerItemProxy */; + name = "Framework + Plugin"; + targetProxy = F95B87410D567DC0005DC4F3 /* PBXContainerItemProxy */; }; + F95B87440D567DCC005DC4F3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = BibDesk; + targetProxy = F95B87430D567DCC005DC4F3 /* PBXContainerItemProxy */; + }; F9AF562C0BEA4160009B16D5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BTParse; @@ -3953,11 +3816,6 @@ name = OmniFoundation; targetProxy = F9AF56310BEA4160009B16D5 /* PBXContainerItemProxy */; }; - F9AF56340BEA4160009B16D5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = BibDeskInputManager; - targetProxy = F9AF56330BEA4160009B16D5 /* PBXContainerItemProxy */; - }; F9AF56360BEA4160009B16D5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = AGRegex; @@ -4570,81 +4428,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - F93C37AE0D387AF4006EB558 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INFOPLIST_FILE = "Leopard-Info.plist"; - INSTALL_PATH = "$(HOME)/Library/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.4; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = Leopard; - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; - WRAPPER_EXTENSION = bundle; - ZERO_LINK = YES; - }; - name = Debug; - }; - F93C37AF0D387AF4006EB558 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INFOPLIST_FILE = "Leopard-Info.plist"; - INSTALL_PATH = "$(HOME)/Library/Bundles"; - MACOSX_DEPLOYMENT_TARGET = 10.4; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = Leopard; - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; - WRAPPER_EXTENSION = bundle; - ZERO_LINK = NO; - }; - name = Release; - }; - F93C37B00D387AF4006EB558 /* Test */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INFOPLIST_FILE = "Leopard-Info.plist"; - INSTALL_PATH = "$(HOME)/Library/Bundles"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = Leopard; - WRAPPER_EXTENSION = bundle; - ZERO_LINK = YES; - }; - name = Test; - }; F993F1BD08553A61007A7657 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = F95C5E970D10E87C00C81970 /* BibDesk-Debug.xcconfig */; @@ -5101,7 +4884,7 @@ GCC_AUTO_VECTORIZATION = NO; GCC_PREPROCESSOR_DEFINITIONS = ""; MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; VERSIONING_SYSTEM = "apple-generic"; WARNING_CFLAGS = ( "-Wall", @@ -5123,7 +4906,7 @@ GCC_AUTO_VECTORIZATION = NO; GCC_OPTIMIZATION_LEVEL = s; MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; @@ -5134,7 +4917,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Test; }; @@ -5170,16 +4953,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - F93C37B10D387AF4006EB558 /* Build configuration list for PBXNativeTarget "Leopard" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - F93C37AE0D387AF4006EB558 /* Debug */, - F93C37AF0D387AF4006EB558 /* Release */, - F93C37B00D387AF4006EB558 /* Test */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; F993F1BC08553A61007A7657 /* Build configuration list for PBXNativeTarget "BibDesk" */ = { isa = XCConfigurationList; buildConfigurations = ( Deleted: trunk/bibdesk/Leopard-Info.plist =================================================================== --- trunk/bibdesk/Leopard-Info.plist 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/Leopard-Info.plist 2008-02-03 23:00:55 UTC (rev 268) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIdentifier</key> - <string>net.sourceforge.bibdesk.leopard</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundlePackageType</key> - <string>BNDL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> -</dict> -</plist> Modified: trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) @@ -193,7 +193,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -203,7 +203,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Release; }; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig 2008-02-03 23:00:55 UTC (rev 268) @@ -4,8 +4,8 @@ // Common settings -SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk -MACOSX_DEPLOYMENT_TARGET = 10.4 +SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk +MACOSX_DEPLOYMENT_TARGET = 10.5 FRAMEWORK_SEARCH_PATHS = $(value) /Library/Frameworks BZ2_LDFLAGS = -lbz2 Modified: trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) @@ -471,7 +471,7 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH)"; MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -483,7 +483,7 @@ i386, ); MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Release; }; @@ -495,7 +495,7 @@ i386, ); MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Default; }; Modified: trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) @@ -840,7 +840,7 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -865,7 +865,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.4; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Release; }; Modified: trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) @@ -477,7 +477,7 @@ HEADER_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.4; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -493,7 +493,7 @@ HEADER_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.4; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Release; }; @@ -508,7 +508,7 @@ HEADER_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.3; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Default; }; Modified: trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj 2008-02-03 22:30:33 UTC (rev 267) +++ trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) @@ -1295,7 +1295,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.4; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -1306,7 +1306,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MAC... [truncated message content] |
From: <ama...@us...> - 2008-02-03 23:18:24
|
Revision: 269 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=269&view=rev Author: amaxwell Date: 2008-02-03 15:18:29 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove more latex2rtf and 10.4 stuff Modified Paths: -------------- trunk/bibdesk/BDSKEditorTextView.m trunk/bibdesk/BDSKItemPasteboardHelper.m trunk/bibdesk/BDSKLogUtilities.m trunk/bibdesk/BDSKTeXTask.h trunk/bibdesk/BDSKTeXTask.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/Bibdesk_Prefix.pch trunk/bibdesk/English.lproj/Credits.rtf trunk/bibdesk/NSDictionary_BDSKExtensions.m trunk/bibdesk/vendorsrc/amaxwell/FileView/FVIconQueue.m Modified: trunk/bibdesk/BDSKEditorTextView.m =================================================================== --- trunk/bibdesk/BDSKEditorTextView.m 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/BDSKEditorTextView.m 2008-02-03 23:18:29 UTC (rev 269) @@ -44,8 +44,6 @@ @interface BDSKEditorTextView (Private) - (void)handleFontChangedNotification:(NSNotification *)note; -- (NSString *)URLStringFromRange:(NSRange *)startRange inString:(NSString *)string; -- (void)fixAttributesForURLs; - (void)updateFontFromPreferences; - (void)doCommonSetup; @@ -85,31 +83,6 @@ [[OFPreferenceWrapper sharedPreferenceWrapper] setObject:[font fontName] forKey:BDSKEditorFontNameKey]; } -- (void)textStorageDidProcessEditing:(NSNotification *)notification -{ - NSTextStorage *textStorage = [notification object]; - NSString *string = [textStorage string]; - - NSRange editedRange = [textStorage editedRange]; - - // if this is > 1, it's likely a paste or initial insertion, so fix the whole thing - if(editedRange.length > 1){ - [self fixAttributesForURLs]; - } else if(editedRange.location != NSNotFound){ - NSString *editedWord = [self URLStringFromRange:&editedRange inString:string]; - if(editedWord && [editedWord rangeOfString:@"://"].length == 0) - editedWord = nil; - NSURL *url = editedWord ? [[NSURL alloc] initWithString:editedWord] : nil; - if(url != nil) - [textStorage addAttribute:NSLinkAttributeName value:url range:editedRange]; - else - [textStorage removeAttribute:NSLinkAttributeName range:editedRange]; - [url release]; - } else { - NSLog(@"I am confused: edited range is %@", NSStringFromRange(editedRange)); - } -} - // make sure the font and other attributes get fixed when pasting text - (void)paste:(id)sender { [self pasteAsPlainText:sender]; } @@ -123,108 +96,6 @@ [self updateFontFromPreferences]; } -// Determine if a % character is followed by two digits (valid in a URL) -static inline BOOL hasValidPercentEscapeFromIndex(NSString *string, unsigned startIndex) -{ - static NSCharacterSet *hexadecimalCharacterSet = nil; - if (hexadecimalCharacterSet == nil) { - NSMutableCharacterSet *tmpSet = [[NSCharacterSet decimalDigitCharacterSet] mutableCopy]; - [tmpSet addCharactersInRange:NSMakeRange('a', 6)]; - [tmpSet addCharactersInRange:NSMakeRange('A', 6)]; - hexadecimalCharacterSet = [tmpSet copy]; - [tmpSet release]; - } - - NSCParameterAssert(startIndex == 0 || [string length] > startIndex); - // require % and at least two additional chars - if([string isEqualToString:@""] || [string characterAtIndex:startIndex] != '%' || [string length] <= (startIndex + 2)) - return NO; - - // both characters following the % should be digits 0-9 - unichar ch1 = [string characterAtIndex:(startIndex + 1)]; - unichar ch2 = [string characterAtIndex:(startIndex + 2)]; - return ([hexadecimalCharacterSet characterIsMember:ch1] && [hexadecimalCharacterSet characterIsMember:ch2]) ? YES : NO; -} - -/* Starts in the middle of a "word" (some range of interest) and searches forward and backward to find boundaries marked by characters that would be illegal for a URL. Note that this may not be a valid URL in itself; it is just bounded by URL-like markers. -*/ -- (NSString *)URLStringFromRange:(NSRange *)startRange inString:(NSString *)string -{ - unsigned startIdx = NSNotFound, endIdx = NSNotFound; - NSRange range = NSMakeRange(0, startRange->location); - - do { - range = [string rangeOfCharacterFromSet:[NSURL illegalURLCharacterSet] options:NSBackwardsSearch range:range]; - - if(range.location != NSNotFound){ - // advance past the illegal character - startIdx = range.location + 1; - } else { - // this has a URL as the first word in the string - startIdx = 0; - break; - } - - // move the search range interval towards the beginning of the string - range = NSMakeRange(0, range.location); - - } while (startIdx != NSNotFound && hasValidPercentEscapeFromIndex(string, startIdx - 1)); - - NSString *lastWord = nil; - if(startIdx != NSNotFound){ - - range = NSMakeRange(startRange->location, [string length] - startRange->location); - - do { - range = [string rangeOfCharacterFromSet:[NSURL illegalURLCharacterSet] options:0 range:range]; - - // if the entire string is valid... - if(range.location == NSNotFound){ - endIdx = [string length]; - break; - } else { - endIdx = range.location; - } - - // move the search range interval towards the end of the string - range = NSMakeRange(range.location + 1, [string length] - range.location - 1); - - } while (endIdx != NSNotFound && hasValidPercentEscapeFromIndex(string, endIdx)); - - if(endIdx != NSNotFound && startIdx != NSNotFound && endIdx > startIdx){ - range = NSMakeRange(startIdx, endIdx - startIdx); - lastWord = [string substringWithRange:range]; - *startRange = range; - } - } - return lastWord; -} - -// fixes the attributes for the entire text storage; inefficient for large strings -- (void)fixAttributesForURLs; -{ - NSTextStorage *textStorage = [self textStorage]; - NSString *string = [textStorage string]; - - int start, length = [string length]; - NSRange range = NSMakeRange(0, 0); - NSString *urlString; - NSURL *url; - - do { - start = NSMaxRange(range); - range = [string rangeOfString:@"://" options:0 range:NSMakeRange(start, length - start)]; - - if(range.length){ - urlString = [self URLStringFromRange:&range inString:string]; - url = urlString ? [[NSURL alloc] initWithString:urlString] : nil; - if([url scheme]) [textStorage addAttribute:NSLinkAttributeName value:url range:range]; - [url release]; - } - - } while (range.length); -} - // used only for reading the default font from prefs and then changing the font of the text storage - (void)updateFontFromPreferences; { @@ -246,14 +117,7 @@ - (void)doCommonSetup; { OBPRECONDITION([self textStorage]); -#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) -#warning 10.5: remove URL detection -#endif - // use Apple's link detection on 10.5 and later - if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) - [[self textStorage] setDelegate:self]; - else - [self setAutomaticLinkDetectionEnabled:YES]; + [self setAutomaticLinkDetectionEnabled:YES]; [self updateFontFromPreferences]; [OFPreference addObserver:self selector:@selector(handleFontChangedNotification:) forPreference:[OFPreference preferenceForKey:BDSKEditorFontNameKey]]; } Modified: trunk/bibdesk/BDSKItemPasteboardHelper.m =================================================================== --- trunk/bibdesk/BDSKItemPasteboardHelper.m 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/BDSKItemPasteboardHelper.m 2008-02-03 23:18:29 UTC (rev 269) @@ -163,12 +163,6 @@ if([texTask runWithBibTeXString:bibString citeKeys:citeKeys generatedTypes:BDSKGeneratePDF]) data = [texTask PDFData]; [pboard setData:data forType:NSPDFPboardType]; - }else if([type isEqualToString:NSRTFPboardType]){ - OBASSERT(dragCopyType == BDSKRTFDragCopyType); - NSData *data = nil; - if([texTask runWithBibTeXString:bibString citeKeys:citeKeys generatedTypes:BDSKGenerateRTF]) - data = [texTask RTFData]; - [pboard setData:data forType:NSRTFPboardType]; }else if([type isEqualToString:NSStringPboardType]){ OBASSERT(dragCopyType == BDSKLTBDragCopyType || dragCopyType == BDSKLaTeXDragCopyType); NSString *string = nil; Modified: trunk/bibdesk/BDSKLogUtilities.m =================================================================== --- trunk/bibdesk/BDSKLogUtilities.m 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/BDSKLogUtilities.m 2008-02-03 23:18:29 UTC (rev 269) @@ -45,8 +45,6 @@ #define BDSK_ASL_SENDER "BibDesk" #define BDSK_ASL_FACILITY NULL -static BOOL isTiger = YES; - @interface BDSKLogMessage : NSObject { NSDate *date; @@ -58,23 +56,6 @@ - (id)initWithASLMessage:(aslmsg)msg; @end -static NSString *tigerASLHackaround(void) -{ - // find messages that we've logged - NSArray *args = [NSArray arrayWithObjects:@"-k", @ASL_KEY_SENDER, @BDSK_ASL_SENDER, @"-k", @ASL_KEY_UID, @"Neq", [NSString stringWithFormat:@"%d", getuid()], @"-k", @ASL_KEY_LEVEL, @"Nle", [NSString stringWithFormat:@"%d", ASL_LEVEL_DEBUG], @"-k", @ASL_KEY_TIME, @"ge", @"-24h", nil]; - - NSString *logString = nil; - @try{ - logString = [BDSKShellTask executeBinary:@"/usr/bin/syslog" inDirectory:nil withArguments:args environment:nil inputString:nil]; - } - @catch(id exception){ - logString = [NSString stringWithFormat:@"Caught exception \"%@\" when attempting to run /usr/bin/syslog.", exception]; - } - return logString; -} - -static Boolean disableASLLogging = TRUE; - static int new_default_asl_query(aslmsg *newQuery) { int err; @@ -106,15 +87,7 @@ } NSString *BDSKStandardErrorString(void) -{ - // sadly, repeated calls to asl_search() seem to corrupt memory on 10.4.9 rdar://problem/5276522 - // this is fixed on 10.5, but will not be fixed on 10.4 -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -#warning Tiger ASL hack -#endif - - if (isTiger) return (disableASLLogging ? @"Re-enable ASL logging with `defaults write edu.ucsd.cs.mmccrack.bibdesk BDSKDisableASLLogging -bool FALSE`" : tigerASLHackaround()); - +{ aslmsg query, msg; aslresponse response; @@ -187,156 +160,6 @@ return stderrString; } -// returns true if Gestalt() fails or if the major version is not 10 -static BOOL isRunningTiger(void) -{ - long majorVersion; - long minorVersion; - OSStatus err; - err = Gestalt(gestaltSystemVersionMajor, &majorVersion); - if (noErr == err) - Gestalt(gestaltSystemVersionMinor, &minorVersion); - return (noErr != err || (10 == majorVersion && 4 == minorVersion)); -} - -static void *copyStandardErrorToASL(void *unused); -static int32_t continueLogging = 1; - -__attribute__((constructor)) -static void startASLThread(void) -{ - // avoid Cocoa in this function - - // make this check regardless, since it affects reading from the log - isTiger = isRunningTiger(); - -// for debug builds, allow Xcode to display stderr, since we usually won't be calling for stderr logs from code anyway -#if(!OMNI_FORCE_ASSERTIONS) - if (isTiger) { - - disableASLLogging = CFPreferencesGetAppBooleanValue(CFSTR("BDSKDisableASLLogging"), kCFPreferencesCurrentApplication, NULL); - - // log to the automatic client/message; we're thread safe here - if (disableASLLogging) { - asl_log(NULL, NULL, ASL_LEVEL_ERR, "%s", "*** Disabled ASL logging ***\n\nTo re-enable, use\n\t`defaults write edu.ucsd.cs.mmccrack.bibdesk BDSKDisableASLLogging -bool FALSE`\n"); - } else { - - // start copying standard error - pthread_attr_t attr; - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - pthread_t thread; - - pthread_create(&thread, &attr, ©StandardErrorToASL, NULL); - - asl_log(NULL, NULL, ASL_LEVEL_ERR, "%s", "*** Enabled ASL logging ***\n\nTo disable, use\n\t`defaults write edu.ucsd.cs.mmccrack.bibdesk BDSKDisableASLLogging -bool TRUE`\n"); - } - } - -#endif -} - -__attribute__((destructor)) -static void stopASLThread(void) -{ - OSAtomicDecrement32Barrier(&continueLogging); -} - -#define STACK_BUFFER_SIZE 2048 - -// This thread runs in order to catch relevant items written directly to stderr; NSLog & NSLogv are handled specially, so we can reformat their output to remove redundant information. -static void *copyStandardErrorToASL(void *unused) -{ - int pipefds[2]; - - if (pipe(pipefds) < 0) { - perror("pipe"); - return NULL; - } - - if (dup2(pipefds[1], STDERR_FILENO) < 0) { - perror("dup2"); - return NULL; - } - - // create a new client for this thread - aslclient client = asl_open(BDSK_ASL_SENDER, BDSK_ASL_FACILITY, ASL_OPT_NO_DELAY); - aslmsg m = asl_new(ASL_TYPE_MSG); - asl_set(m, ASL_KEY_SENDER, BDSK_ASL_SENDER); - - FILE *stream = fdopen(pipefds[0], "r"); - if (NULL == stream) { - perror("fdopen"); - return NULL; - } - - char *line, buf[STACK_BUFFER_SIZE]; - - // NSLogv() logs with priority LOG_ERR; note that if the level is too high, it won't show up in the console log - while (continueLogging && NULL != (line = fgets(buf, sizeof(buf), stream))) - asl_log(client, m, ASL_LEVEL_ERR, "%s", buf); - - fclose(stream); - asl_free(m); - asl_close(client); - return NULL; -} - -BDSK_PRIVATE_EXTERN void BDSKLog(NSString *format, ...) -{ - va_list list; - va_start(list, format); - // this will be redefined as BDSKLogv (see Bibdesk_Prefix.pch) - NSLogv(format, list); - va_end(list); -} - -// override to avoid passing additional info in the message string, since ASL handles that for us -BDSK_PRIVATE_EXTERN void BDSKLogv(NSString *format, va_list argList) -{ - -// we want to call the real NSLog if we're not on Tiger, or if ASL logging is disabled on Tiger -#ifdef NSLogv -#undef NSLogv - if (NO == isTiger || TRUE == disableASLLogging) { - NSLogv(format, argList); - return; - } -#endif - - NSString *logString = [[NSString alloc] initWithFormat:format arguments:argList]; - - // create a new client since we may be calling this from an arbitrary thread - aslclient client = asl_open(BDSK_ASL_SENDER, BDSK_ASL_FACILITY, ASL_OPT_NO_DELAY); - - aslmsg m = asl_new(ASL_TYPE_MSG); - asl_set(m, ASL_KEY_SENDER, BDSK_ASL_SENDER); - - char *buf; - char stackBuf[STACK_BUFFER_SIZE]; - - // nothing to prepend (pid, host, etc.) since ASL takes care of that for us; just convert the string to UTF-8 - - // add 1 for the NULL terminator (length arg to getCString:maxLength:encoding: needs to include space for this) - unsigned requiredLength = ([logString maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1); - - if (requiredLength <= STACK_BUFFER_SIZE && [logString getCString:stackBuf maxLength:STACK_BUFFER_SIZE encoding:NSUTF8StringEncoding]) { - buf = stackBuf; - } else if (NULL != (buf = NSZoneMalloc(NULL, requiredLength * sizeof(char))) ){ - [logString getCString:buf maxLength:requiredLength encoding:NSUTF8StringEncoding]; - } else { - asl_log(client, m, ASL_LEVEL_EMERG, "%s", "unable to allocate log buffer"); - abort(); - } - [logString release]; - - asl_log(client, m, ASL_LEVEL_ERR, "%s", buf); - - if (buf != stackBuf) NSZoneFree(NULL, buf); - asl_free(m); - asl_close(client); -} - #pragma mark - @implementation BDSKLogMessage Modified: trunk/bibdesk/BDSKTeXTask.h =================================================================== --- trunk/bibdesk/BDSKTeXTask.h 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/BDSKTeXTask.h 2008-02-03 23:18:29 UTC (rev 269) @@ -44,14 +44,12 @@ BDSKGenerateLTB = 0, BDSKGenerateLaTeX = 1, BDSKGeneratePDF = 2, - BDSKGenerateRTF = 3, }; typedef struct _BDSKTeXTaskFlags { volatile int32_t hasLTB __attribute__ ((aligned (4))); volatile int32_t hasLaTeX __attribute__ ((aligned (4))); volatile int32_t hasPDFData __attribute__ ((aligned (4))); - volatile int32_t hasRTFData __attribute__ ((aligned (4))); } BDSKTeXTaskFlags; @class BDSKTeXPath; @@ -94,18 +92,15 @@ - (NSString *)LTBString; - (NSString *)LaTeXString; - (NSData *)PDFData; -- (NSData *)RTFData; - (NSString *)logFilePath; - (NSString *)LTBFilePath; - (NSString *)LaTeXFilePath; - (NSString *)PDFFilePath; -- (NSString *)RTFFilePath; - (BOOL)hasLTB; - (BOOL)hasLaTeX; - (BOOL)hasPDFData; -- (BOOL)hasRTFData; - (BOOL)isProcessing; Modified: trunk/bibdesk/BDSKTeXTask.m =================================================================== --- trunk/bibdesk/BDSKTeXTask.m 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/BDSKTeXTask.m 2008-02-03 23:18:29 UTC (rev 269) @@ -58,7 +58,6 @@ - (NSString *)bibFilePath; - (NSString *)bblFilePath; - (NSString *)pdfFilePath; -- (NSString *)rtfFilePath; - (NSString *)logFilePath; - (NSString *)blgFilePath; - (NSString *)auxFilePath; @@ -78,40 +77,14 @@ - (int)runTeXTasksForPDF; -- (int)runTeXTaskForRTF; - - (int)runPDFTeXTask; - (int)runBibTeXTask; -- (int)runLaTeX2RTFTask; - - (int)runTask:(NSString *)binPath withArguments:(NSArray *)arguments; @end -// modify the TeX template in application support -static void upgradeTemplate() -{ - NSString *texTemplatePath = [[[NSFileManager defaultManager] currentApplicationSupportPathForCurrentUser] stringByAppendingPathComponent:@"previewtemplate.tex"]; - NSStringEncoding encoding = [[OFPreferenceWrapper sharedPreferenceWrapper] integerForKey:BDSKTeXPreviewFileEncodingKey]; - - NSMutableString *texFile = [[NSMutableString alloc] initWithContentsOfFile:texTemplatePath encoding:encoding error:NULL]; - - // This is a change required for latex2rtf compatibility. Old versions used a peculiar "%latex2rtf:" comment at the beginning of a line to indicate a command or section that was needed for latex2rtf. The latest version (in our vendorsrc tree as of 15 Dec 2007) uses a more typical \if\else\fi construct. - NSString *oldString = @"%% The following command is provided for LaTeX2RTF compatibility\n" - @"%% with amslatex. DO NOT UNCOMMENT THE NEXT LINE!\n" - @"%latex2rtf:\\providecommand{\\bysame}{\\_\\_\\_\\_\\_}"; - NSString *newString = @"% The following command is provided for LaTeX2RTF compatibility with amslatex.\n" - @"\\newif\\iflatextortf\n" - @"\\iflatextortf\n" - @"\\providecommand{\\bysame}{\\_\\_\\_\\_\\_}\n" - @"\\fi"; - if ([texFile replaceOccurrencesOfString:oldString withString:newString options:0 range:NSMakeRange(0, [texFile length])]) - [texFile writeToFile:texTemplatePath atomically:YES encoding:encoding error:NULL]; - [texFile release]; -} - static double runLoopTimeout = 30; @implementation BDSKTeXTask @@ -123,9 +96,6 @@ // returns 0 if the key doesn't exist if ([[NSUserDefaults standardUserDefaults] floatForKey:@"BDSKTeXTaskRunLoopTimeout"] > 1) runLoopTimeout = [[NSUserDefaults standardUserDefaults] floatForKey:@"BDSKTeXTaskRunLoopTimeout"]; - - upgradeTemplate(); - } - (id)init{ @@ -240,11 +210,11 @@ #pragma mark TeX Tasks - (BOOL)runWithBibTeXString:(NSString *)bibStr{ - return [self runWithBibTeXString:bibStr citeKeys:nil generatedTypes:BDSKGenerateRTF]; + return [self runWithBibTeXString:bibStr citeKeys:nil generatedTypes:BDSKGeneratePDF]; } - (BOOL)runWithBibTeXString:(NSString *)bibStr citeKeys:(NSArray *)citeKeys{ - return [self runWithBibTeXString:bibStr citeKeys:citeKeys generatedTypes:BDSKGenerateRTF]; + return [self runWithBibTeXString:bibStr citeKeys:citeKeys generatedTypes:BDSKGeneratePDF]; } - (BOOL)runWithBibTeXString:(NSString *)bibStr generatedTypes:(int)flag{ @@ -276,7 +246,6 @@ OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasLTB); OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasLaTeX); OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasPDFData); - OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasRTFData); @try{ // make sure the PATH environment variable is set correctly @@ -313,14 +282,6 @@ if((rv & 2) == 0){ OSAtomicCompareAndSwap32Barrier(0, 1, (int32_t *)&flags.hasPDFData); - - if(flag > BDSKGeneratePDF){ - rv |= [self runTeXTaskForRTF]; - - if((rv & 2) == 0){ - OSAtomicCompareAndSwap32Barrier(0, 1, (int32_t *)&flags.hasRTFData); - } - } } } } @@ -332,7 +293,6 @@ OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasLTB); OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasLaTeX); OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasPDFData); - OSAtomicCompareAndSwap32Barrier(1, 0, (int32_t *)&flags.hasRTFData); } if (nil != taskFinishedInvocation) { @@ -410,15 +370,6 @@ return data; } -- (NSData *)RTFData{ - NSData *data = nil; - if ([self hasRTFData] && 0 == pthread_rwlock_tryrdlock(&dataFileLock)) { - data = [NSData dataWithContentsOfFile:[texPath rtfFilePath]]; - pthread_rwlock_unlock(&dataFileLock); - } - return data; -} - - (NSString *)logFilePath{ return [texPath logFilePath]; } @@ -435,10 +386,6 @@ return [self hasPDFData] ? [texPath pdfFilePath] : nil; } -- (NSString *)RTFFilePath{ - return [self hasRTFData] ? [texPath rtfFilePath] : nil; -} - - (BOOL)hasLTB{ OSMemoryBarrier(); return 1 == flags.hasLTB; @@ -454,11 +401,6 @@ return 1 == flags.hasPDFData; } -- (BOOL)hasRTFData{ - OSMemoryBarrier(); - return 1 == flags.hasRTFData; -} - - (BOOL)isProcessing{ // just see if we can get the lock, otherwise we are processing if(OFSimpleLockTry(&processingLock)){ @@ -579,7 +521,7 @@ const FSRef fileRef; static NSSet *filesToRemove = nil; if (nil == filesToRemove) - filesToRemove = [[NSSet alloc] initWithObjects:[texPath blgFilePath], [texPath logFilePath], [texPath bblFilePath], [texPath auxFilePath], [texPath pdfFilePath], [texPath rtfFilePath], nil]; + filesToRemove = [[NSSet alloc] initWithObjects:[texPath blgFilePath], [texPath logFilePath], [texPath bblFilePath], [texPath auxFilePath], [texPath pdfFilePath], nil]; NSEnumerator *e = [filesToRemove objectEnumerator]; NSString *path; @@ -650,28 +592,6 @@ return rv; } -- (int)runTeXTaskForRTF{ - volatile int lockStatus; - volatile int rv; - rv = 0; - - lockStatus = pthread_rwlock_wrlock(&dataFileLock); - if(lockStatus){ - NSLog(@"error %d occurred locking in %@", lockStatus, self); - return 2; - } - - rv = [self runLaTeX2RTFTask]; - - lockStatus = pthread_rwlock_unlock(&dataFileLock); - if(lockStatus){ - NSLog(@"error %d occurred locking in %@", lockStatus, self); - rv = 2; - } - - return rv; -} - - (int)runPDFTeXTask{ NSString *command = [[OFPreferenceWrapper sharedPreferenceWrapper] objectForKey:BDSKTeXBinPathKey]; @@ -698,14 +618,6 @@ return [self runTask:bibtexbinpath withArguments:args]; } -- (int)runLaTeX2RTFTask{ - NSString *latex2rtfpath = [[NSBundle mainBundle] pathForResource:@"latex2rtf" ofType:nil]; - - // This task runs latex2rtf on our tex file to generate tmpbib.rtf - // the arguments: it needs -P "path" which is the path to the cfg files in the app wrapper - return [self runTask:latex2rtfpath withArguments:[NSArray arrayWithObjects:@"-P", [[NSBundle mainBundle] sharedSupportPath], [texPath baseNameWithoutExtension], nil]]; -} - - (int)runTask:(NSString *)binPath withArguments:(NSArray *)arguments{ currentTask = [[NSTask alloc] init]; [currentTask setCurrentDirectoryPath:[texPath workingDirectory]]; @@ -778,7 +690,6 @@ - (NSString *)bibFilePath { return [fullPathWithoutExtension stringByAppendingPathExtension:@"bib"]; } - (NSString *)bblFilePath { return [fullPathWithoutExtension stringByAppendingPathExtension:@"bbl"]; } - (NSString *)pdfFilePath { return [fullPathWithoutExtension stringByAppendingPathExtension:@"pdf"]; } -- (NSString *)rtfFilePath { return [fullPathWithoutExtension stringByAppendingPathExtension:@"rtf"]; } - (NSString *)logFilePath { return [fullPathWithoutExtension stringByAppendingPathExtension:@"log"]; } - (NSString *)blgFilePath { return [fullPathWithoutExtension stringByAppendingPathExtension:@"blg"]; } - (NSString *)auxFilePath { return [fullPathWithoutExtension stringByAppendingPathExtension:@"aux"]; } Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-03 23:18:29 UTC (rev 269) @@ -25,26 +25,10 @@ F98870D307580E94001D4D49 /* ShellScript */, ); dependencies = ( - F9CA0C830CDF93F90059D36D /* PBXTargetDependency */, ); name = DiskImage; productName = DiskImage; }; - F9CA0C7A0CDF93D10059D36D /* BibDesk+QuickLook */ = { - isa = PBXAggregateTarget; - buildConfigurationList = F9CA0C8A0CDF944C0059D36D /* Build configuration list for PBXAggregateTarget "BibDesk+QuickLook" */; - buildPhases = ( - F9CA0C890CDF944C0059D36D /* CopyFiles */, - F93C37D70D387DB0006EB558 /* CopyFiles */, - ); - dependencies = ( - F911D6C10CFE8EBD0009C77B /* PBXTargetDependency */, - F9CA0C810CDF93E30059D36D /* PBXTargetDependency */, - F9CA0C7F0CDF93D80059D36D /* PBXTargetDependency */, - ); - name = "BibDesk+QuickLook"; - productName = "BibDesk+QuickLook"; - }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -506,7 +490,6 @@ F9BE68350B80F92900B2597C /* FileMatcherConfigSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = F9BE68330B80F92800B2597C /* FileMatcherConfigSheet.nib */; }; F9BE68380B80F94000B2597C /* BDSKFileMatchConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = F9BE68360B80F94000B2597C /* BDSKFileMatchConfigController.m */; }; F9BF481F0BD69F700071094F /* MODS2MARC21slim.xsl in Resources */ = {isa = PBXBuildFile; fileRef = F9BF481E0BD69F6F0071094F /* MODS2MARC21slim.xsl */; }; - F9CA0C870CDF94280059D36D /* BibDesk.qlgenerator in CopyFiles */ = {isa = PBXBuildFile; fileRef = F98C6FD00CDD30A2002FCAD8 /* BibDesk.qlgenerator */; }; F9CE58EC0842411D0072DF55 /* ArrowImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9CE58EB0842411D0072DF55 /* ArrowImage.tiff */; }; F9CEFCBC0A90090B00A0E54E /* BDSKOrphanedFileServer.m in Sources */ = {isa = PBXBuildFile; fileRef = F9CEFCBA0A90090B00A0E54E /* BDSKOrphanedFileServer.m */; }; F9D0E5370BF92768001C6C22 /* BDSKMODSParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D0E5350BF92768001C6C22 /* BDSKMODSParser.m */; }; @@ -565,13 +548,6 @@ remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = FileView; }; - F911D6C00CFE8EBD0009C77B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = F9F04CE10CE260EB00F28ED2; - remoteInfo = "Framework + Plugin"; - }; F92BACF10BCC00D2008D5BC3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F92BACEA0BCC00D2008D5BC3 /* SkimNotesAgent.xcodeproj */; @@ -768,27 +744,6 @@ remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteInfo = yaz; }; - F9CA0C7E0CDF93D80059D36D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D1107260486CEB800E47090; - remoteInfo = BibDesk; - }; - F9CA0C800CDF93E30059D36D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F98C6FC80CDD30A2002FCAD8 /* QuickLook-BibDesk.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D57630D048677EA00EA77CD; - remoteInfo = BibDesk; - }; - F9CA0C820CDF93F90059D36D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = F9CA0C7A0CDF93D10059D36D; - remoteInfo = "BibDesk+QuickLook"; - }; F9EF0CE10B4EFC8F00A1F282 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F95CC0C6087F53AE002C5694 /* BibImporter.xcodeproj */; @@ -841,15 +796,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - F93C37D70D387DB0006EB558 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = BibDesk.app/Contents/Resources; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; F95B874D0D567E84005DC4F3 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -870,16 +816,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - F9CA0C890CDF944C0059D36D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = BibDesk.app/Contents/Library/QuickLook; - dstSubfolderSpec = 16; - files = ( - F9CA0C870CDF94280059D36D /* BibDesk.qlgenerator in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -2980,7 +2916,6 @@ F98870D407580E94001D4D49 /* DiskImage */, 275E270607838EE30070398A /* TestBibItem */, 27CD032307D82C7400806B7E /* TestComplexString */, - F9CA0C7A0CDF93D10059D36D /* BibDesk+QuickLook */, ); }; /* End PBXProject section */ @@ -3776,11 +3711,6 @@ name = FileView; targetProxy = F911D6BE0CFE8EAA0009C77B /* PBXContainerItemProxy */; }; - F911D6C10CFE8EBD0009C77B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Framework + Plugin"; - targetProxy = F911D6C00CFE8EBD0009C77B /* PBXContainerItemProxy */; - }; F92BACF40BCC00EB008D5BC3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SkimNotesAgent; @@ -3826,21 +3756,6 @@ name = yaz; targetProxy = F9AF56370BEA4160009B16D5 /* PBXContainerItemProxy */; }; - F9CA0C7F0CDF93D80059D36D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D1107260486CEB800E47090 /* BibDesk */; - targetProxy = F9CA0C7E0CDF93D80059D36D /* PBXContainerItemProxy */; - }; - F9CA0C810CDF93E30059D36D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = BibDesk; - targetProxy = F9CA0C800CDF93E30059D36D /* PBXContainerItemProxy */; - }; - F9CA0C830CDF93F90059D36D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = F9CA0C7A0CDF93D10059D36D /* BibDesk+QuickLook */; - targetProxy = F9CA0C820CDF93F90059D36D /* PBXContainerItemProxy */; - }; F9EF0CE20B4EFC8F00A1F282 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BibImporter; @@ -4921,35 +4836,6 @@ }; name = Test; }; - F9CA0C7B0CDF93D20059D36D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "BibDesk+QuickLook"; - }; - name = Debug; - }; - F9CA0C7C0CDF93D20059D36D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = "BibDesk+QuickLook"; - ZERO_LINK = NO; - }; - name = Release; - }; - F9CA0C7D0CDF93D20059D36D /* Test */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - PRODUCT_NAME = "BibDesk+QuickLook"; - }; - name = Test; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -5013,16 +4899,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - F9CA0C8A0CDF944C0059D36D /* Build configuration list for PBXAggregateTarget "BibDesk+QuickLook" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - F9CA0C7B0CDF93D20059D36D /* Debug */, - F9CA0C7C0CDF93D20059D36D /* Release */, - F9CA0C7D0CDF93D20059D36D /* Test */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; /* End XCConfigurationList section */ }; rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; Modified: trunk/bibdesk/Bibdesk_Prefix.pch =================================================================== --- trunk/bibdesk/Bibdesk_Prefix.pch 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/Bibdesk_Prefix.pch 2008-02-03 23:18:29 UTC (rev 269) @@ -34,91 +34,6 @@ #define __FILENAMEASNSSTRING__ \ [[NSString stringWithFileSystemRepresentation:__FILE__] lastPathComponent] -// -// everything inside this #define should be removed when we start using the 10.5 SDK -// -#if !defined(MAC_OS_X_VERSION_10_5) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) - -#ifndef NSAppKitVersionNumber10_4 -#define NSAppKitVersionNumber10_4 824 -#endif - -// From NSObjCRuntime.h -#ifndef NSINTEGER_DEFINED -typedef int NSInteger; -typedef unsigned int NSUInteger; -#define NSIntegerMax LONG_MAX -#define NSIntegerMin LONG_MIN -#define NSUIntegerMax ULONG_MAX -#define NSINTEGER_DEFINED 1 -#endif /* NSINTEGER_DEFINED */ - -// From CGBase.h -#ifndef CGFLOAT_DEFINED -typedef float CGFloat; -#define CGFLOAT_MIN FLT_MIN -#define CGFLOAT_MAX FLT_MAX -#define CGFLOAT_IS_DOUBLE 0 -#define CGFLOAT_DEFINED 1 -#endif /* CGFLOAT_DEFINED */ - -enum { - // An empty area, or did not hit in the cell - NSCellHitNone = 0, - // A content area in the cell - NSCellHitContentArea = 1 << 0, - // An editable text area of the cell - NSCellHitEditableTextArea = 1 << 1, - // A trackable area in the cell - NSCellHitTrackableArea = 1 << 2, -}; - -enum { - NSBackgroundStyleLight = 0, // The background is a light color. Dark content contrasts well with this background. - NSBackgroundStyleDark, // The background is a dark color. Light content contrasts well with this background. - NSBackgroundStyleRaised, // The background is intended to appear higher than the content drawn on it. Content might need to be inset. - NSBackgroundStyleLowered // The background is intended to appear lower than the content drawn on it. Content might need to be embossed. -}; -typedef NSInteger NSBackgroundStyle; - -@interface NSCell (BDSKLeopard) -- (NSBackgroundStyle)backgroundStyle; -- (NSBackgroundStyle)interiorBackgroundStyle; -- (NSUInteger)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView; -- (NSRect)expansionFrameWithFrame:(NSRect)aRect inView:(NSView *)controlView; -@end - -#import <WebKit/WebKit.h> -enum { - WebCacheModelDocumentViewer = 0, - WebCacheModelDocumentBrowser = 1, - WebCacheModelPrimaryWebBrowser = 2 -}; -@interface WebPreferences (BDSKLeopardOnly) -- (void)setCacheModel:(int)cacheModel; -@end - -@interface NSTextView (BDSKLeopardOnly) -- (void)setAutomaticLinkDetectionEnabled:(BOOL)flag; -@end - -#define NSImageNameFollowLinkFreestandingTemplate @"NSFollowLinkFreestandingTemplate" - -#else -#warning 10.5: remove this -#endif // end of 10.4 transition defines - -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -#warning 10.5: remove ASL hacks -#else -BDSK_PRIVATE_EXTERN void BDSKLog(NSString *format, ...); -BDSK_PRIVATE_EXTERN void BDSKLogv(NSString *format, va_list argList); - -// these are only needed on Tiger; Leopard logs to asl by default -#define NSLog BDSKLog -#define NSLogv BDSKLogv -#endif - #if defined (OMNI_ASSERTIONS_ON) #define log_method() \ Modified: trunk/bibdesk/English.lproj/Credits.rtf =================================================================== --- trunk/bibdesk/English.lproj/Credits.rtf 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/English.lproj/Credits.rtf 2008-02-03 23:18:29 UTC (rev 269) @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf230 +{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf270 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural @@ -36,7 +36,6 @@ Donald E. Knuth, Leslie Lamport.\ Gregory P. Ward, whose btparse library made the hard bits easy.\ Buzz Andersen for the NSString+Templating class that made the HTML Export trivial.\ - The latex2rtf project for conversion of TeX preview to RTF.\ Frans Faase for the code which converts HTML to TeX in the RIS parser.\ Aram Greenman for the AGRegex framework, which provides a Cocoa interface to PCRE.\ M. Uli Kusterer for UKDirectoryEnumerator.\ @@ -81,78 +80,4 @@ d. Include notice in any work based on the Software that the work includes software developed by The Omni Group.\ 3. You may not charge a fee for the Software or claim that the Software is yours.\ 4. You may not use the name The Omni Group or Omni Development to endorse or promote products derived from the Software without prior written permission.\ -5. THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. UNDER NO CIRCUMSTANCES SHALL OMNI DEVELOPMENT BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY KIND RELATED TO OR ARISING OUT OF YOUR USE OF THE SOFTWARE, EVEN IF OMNI DEVELOPMENT HAS BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.\ -\ - -\b This software contains a binary distribution of LaTeX2rtf. Source code is available from the BibDesk project CVS repository.\ -\ -The following Copyright notice was taken from LaTeX2rtf 1.9.15: -\b0 \ -\ -LaTeX2rtf is ``free,'' this means that everyone is free to use it and\ -free to redistribute it on certain conditions. LaTeX2rtf is not in the\ -public domain; it is copyrighted and there are restrictions on its\ -distribution.\ - \ -The changes from 1.8a and upwards will fall under the GNU General Public\ -License and are \ -\ -Copyright (c) Scott Prahl\ -\ -In 1998 Georg Lehner <gl...@un...> updated and extended\ -the program and took over maintainence from Ralf Schlatterbeck\ -<ra...@zo...>.\ -\ -The changes from Version 1.7 upwards will fall under the GNU General\ -Public License and are\ -\ -Copyright (c) Georg Lehner.\ -\ -For the authors of the older versions and their copying policy see\ -their Copyright Note at the bottom of this file.\ -\ ---- GPL Stuff --->\ -This program is free software; you can redistribute it and/or modify\ -it under the terms of the GNU General Public License as published by\ -the Free Software Foundation; either version 2 of the License, or (at\ -your option) any later version.\ - \ -This program is distributed in the hope that it will be useful, but\ -WITHOUT ANY WARRANTY; without even the implied warranty of\ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\ -General Public License for more details.\ - \ -A copy of the GNU General Public License is available with the sources\ -in the file "doc/copying.txt". You can also obtain it by writing to\ -the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\ -USA.\ ---- original Copyright note form the authors -->\ -\ -All files in this distribution are\ -Copyright (c) 1994 Andreas Granzer and Fernando Dorner\ - 1995 Friedrich Polzer and Gerhard Trisko\ -All rights reserved.\ -\ -Redistribution and use in source and binary forms, with or without\ -modification, are permitted provided that the following conditions are\ -met: 1. Redistributions of source code must retain the above copyright\ -notice, this list of conditions and the following disclaimer. 2.\ -Redistributions in binary form must reproduce the above copyright notice,\ -this list of conditions and the following disclaimer in the documentation\ -and/or other materials provided with the distribution. 3. Neither the\ -name of the Author nor the names of its contributors may be used to\ -endorse or promote products derived from this software without specific\ -prior written permission.\ -\ -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY\ -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\ -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\ -DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR\ -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\ -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\ -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\ -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\ -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\ -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\ -SUCH DAMAGE. \ -} \ No newline at end of file +5. THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. UNDER NO CIRCUMSTANCES SHALL OMNI DEVELOPMENT BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY KIND RELATED TO OR ARISING OUT OF YOUR USE OF THE SOFTWARE, EVEN IF OMNI DEVELOPMENT HAS BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.} \ No newline at end of file Modified: trunk/bibdesk/NSDictionary_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSDictionary_BDSKExtensions.m 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/NSDictionary_BDSKExtensions.m 2008-02-03 23:18:29 UTC (rev 269) @@ -48,19 +48,3 @@ } @end - -@implementation NSDictionary (BDSKExtensions) - -// ARM: Apple's implementation of -[NSDictionary valueForKey:] doesn't check [key length] -// before using characterAtIndex:, so an empty string will raise an exception. We reimplement -// it as specified in the docs to avoid this problem. rdar://problem/4759413 (fixed on 10.5) -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -#warning fixed on 10.5 -#endif - -- (id)valueForKey:(NSString *)key -{ - return ([key length] && [key characterAtIndex:0] == '@') ? [super valueForKey:[key substringFromIndex:1]] : [self objectForKey:key]; -} - -@end Modified: trunk/bibdesk/vendorsrc/amaxwell/FileView/FVIconQueue.m =================================================================== --- trunk/bibdesk/vendorsrc/amaxwell/FileView/FVIconQueue.m 2008-02-03 23:00:55 UTC (rev 268) +++ trunk/bibdesk/vendorsrc/amaxwell/FileView/FVIconQueue.m 2008-02-03 23:18:29 UTC (rev 269) @@ -38,16 +38,7 @@ #import "FVIconQueue.h" -#if !defined(MAC_OS_X_VERSION_10_5) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) -@interface NSThread (BDSKLeopardOnly) -- (NSString *)name; -- (void)setName:(NSString *)newName; -@end -#else -#warning 10.5: remove this -#endif - @implementation FVIconQueue static id sharedInstance = nil; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-03 23:37:35
|
Revision: 271 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=271&view=rev Author: amaxwell Date: 2008-02-03 15:37:37 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove deprecated code, use NSShouldRetainWithZone() Modified Paths: -------------- trunk/bibdesk/BDSKComplexString.m trunk/bibdesk/BDSKLinkedFile.m trunk/bibdesk/NSFileManager_BDSKExtensions.m Modified: trunk/bibdesk/BDSKComplexString.m =================================================================== --- trunk/bibdesk/BDSKComplexString.m 2008-02-03 23:36:46 UTC (rev 270) +++ trunk/bibdesk/BDSKComplexString.m 2008-02-03 23:37:37 UTC (rev 271) @@ -187,13 +187,8 @@ } /* NSCopying protocol */ -// NSShouldRetainWithZone returns NO on 10.4.4 for NULL or NSDefaultMallocZone rdar://problem/4409099 -// note: this radar is fixed in 10.5.0, but probably not worth checking the version here - (id)copyWithZone:(NSZone *)zone{ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -#warning use NSShouldRetainWithZone -#endif - return [self retain]; + return NSShouldRetainWithZone(self, zone) ? [self retain] : [[[self class] allocWithZone:zone] initWithNodes:nodes macroResolver:macroResolver]; } /* NSCoding protocol */ Modified: trunk/bibdesk/BDSKLinkedFile.m =================================================================== --- trunk/bibdesk/BDSKLinkedFile.m 2008-02-03 23:36:46 UTC (rev 270) +++ trunk/bibdesk/BDSKLinkedFile.m 2008-02-03 23:37:37 UTC (rev 271) @@ -90,7 +90,7 @@ short aliasCount = 1; // it would be preferable to search the (relative) path before the fileID, but than links to symlinks will always be resolved to the target - err = FSMatchAliasNoUI(inBaseRef, kARMNoUI | kARMSearch | kARMSearchRelFirst | kARMTryFileIDFirst, inAlias, &aliasCount, outRef, shouldUpdate, NULL, NULL); + err = FSMatchAliasBulk(inBaseRef, kARMNoUI | kARMSearch | kARMSearchRelFirst | kARMTryFileIDFirst, inAlias, &aliasCount, outRef, shouldUpdate, NULL, NULL); return noErr == err; } Modified: trunk/bibdesk/NSFileManager_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSFileManager_BDSKExtensions.m 2008-02-03 23:36:46 UTC (rev 270) +++ trunk/bibdesk/NSFileManager_BDSKExtensions.m 2008-02-03 23:37:37 UTC (rev 271) @@ -297,62 +297,14 @@ // note: IC is not thread safe - (NSURL *)downloadFolderURL; { - if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) { - const OSType dlFolder = 'down'; // 10.5 Folders.h: kDownloadsFolderType = 'down' /* Refers to the ~/Downloads folder*/ - FSRef folderRef; - OSStatus err = FSFindFolder(kUserDomain, dlFolder, TRUE, &folderRef); - CFURLRef folderURL = NULL; - if (noErr == err) - folderURL = CFURLCreateFromFSRef(CFAllocatorGetDefault(), &folderRef); - - if (NULL != folderURL) - return [(id)folderURL autorelease]; - - // otherwise continue and try IC, which has been deprecated for years and leaks like a sieve - } + FSRef folderRef; + OSStatus err = FSFindFolder(kUserDomain, kDownloadsFolderType, TRUE, &folderRef); + CFURLRef folderURL = NULL; + if (noErr == err) + folderURL = CFURLCreateFromFSRef(CFAllocatorGetDefault(), &folderRef); - NSAssert([NSThread inMainThread], @"InternetConfig is not thread safe"); - OSStatus err; - ICInstance inst; - ICAttr junk = 0; - ICFileSpec spec; - - static CFURLRef pathURL = NULL; - static BOOL alreadyTried = NO; - - if (NO == alreadyTried) { - - alreadyTried = YES; - - long size = sizeof(ICFileSpec); - FSRef pathRef; - - err = ICStart(&inst, 'BDSK'); - - if (noErr == err) - err = ICBegin(inst, icReadOnlyPerm); - - if (err == noErr) - { - //Get the downloads folder - err = ICGetPref(inst, kICDownloadFolder, &junk, &spec, &size); - - if (noErr == err) { - ICEnd(inst); - ICStop(inst); - } - - // convert FSSpec to FSRef - err = FSpMakeFSRef(&(spec.fss), &pathRef); - - if(err == noErr) - pathURL = CFURLCreateFromFSRef(CFAllocatorGetDefault(), &pathRef); - - - } - } - return (NSURL *)pathURL; + return [(id)folderURL autorelease]; } - (NSString *)newestLyXPipePath { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-03 23:51:38
|
Revision: 272 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=272&view=rev Author: amaxwell Date: 2008-02-03 15:51:40 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove remaining RTF preview code Modified Paths: -------------- trunk/bibdesk/BDSKPreviewer.h trunk/bibdesk/BDSKPreviewer.m trunk/bibdesk/BibDocument+Menus.m trunk/bibdesk/BibDocument.h trunk/bibdesk/BibDocument.m trunk/bibdesk/English.lproj/Previewer.nib/classes.nib trunk/bibdesk/English.lproj/Previewer.nib/info.nib trunk/bibdesk/English.lproj/Previewer.nib/keyedobjects.nib Modified: trunk/bibdesk/BDSKPreviewer.h =================================================================== --- trunk/bibdesk/BDSKPreviewer.h 2008-02-03 23:37:37 UTC (rev 271) +++ trunk/bibdesk/BDSKPreviewer.h 2008-02-03 23:51:40 UTC (rev 272) @@ -56,7 +56,6 @@ */ @interface BDSKPreviewer : NSWindowController { IBOutlet BDSKZoomablePDFView *pdfView; - IBOutlet NSTextView *rtfPreviewView; IBOutlet NSTextView *logView; IBOutlet NSTabView *tabView; IBOutlet NSProgressIndicator *progressIndicator; @@ -76,13 +75,10 @@ + (BDSKPreviewer *)sharedPreviewer; - (PDFView *)pdfView; -- (NSTextView *)textView; - (BDSKOverlay *)progressOverlay; - (float)PDFScaleFactor; - (void)setPDFScaleFactor:(float)scaleFactor; -- (float)RTFScaleFactor; -- (void)setRTFScaleFactor:(float)scaleFactor; - (BOOL)isVisible; - (void)handleMainDocumentDidChangeNotification:(NSNotification *)notification; @@ -126,14 +122,6 @@ - (NSData *)PDFData; /*! - @method RTFData - @abstract Returns the RTF data in the preview if it is valid. Otherwise returns nil. - @discussion Any data is considered invalid if the previews were reset, our window is not visible, - or there are updates waiting. This should be thread safe. -*/ -- (NSData *)RTFData; - -/*! @method LaTeXString @abstract Returns the LaTeX string for the preview if it is valid. Otherwise returns nil. @discussion Any data is considered invalid if the previews were reset, our window is not visible, Modified: trunk/bibdesk/BDSKPreviewer.m =================================================================== --- trunk/bibdesk/BDSKPreviewer.m 2008-02-03 23:37:37 UTC (rev 271) +++ trunk/bibdesk/BDSKPreviewer.m 2008-02-03 23:51:40 UTC (rev 272) @@ -118,7 +118,6 @@ - (void)awakeFromNib{ float pdfScaleFactor = 0.0; - float rtfScaleFactor = 1.0; BDSKCollapsibleView *collapsibleView = (BDSKCollapsibleView *)[[[progressOverlay contentView] subviews] firstObject]; NSSize minSize = [progressIndicator frame].size; NSRect rect = [warningImageView bounds]; @@ -151,7 +150,6 @@ [progressOverlay overlayView:[[self window] contentView]]; pdfScaleFactor = [[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKPreviewPDFScaleFactorKey]; - rtfScaleFactor = [[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKPreviewRTFScaleFactorKey]; // register to observe when the preview needs to be updated (handle this here rather than on a per document basis as the preview is currently global for the application) [[NSNotificationCenter defaultCenter] addObserver:self @@ -170,12 +168,10 @@ // don't reset the scale factor until there's a document loaded, or else we get a huge gray border [pdfView setScaleFactor:pdfScaleFactor]; - [(BDSKZoomableScrollView *)[rtfPreviewView enclosingScrollView] setScaleFactor:rtfScaleFactor]; [self displayPreviewsForState:BDSKEmptyPreviewState success:YES]; [pdfView retain]; - [[rtfPreviewView enclosingScrollView] retain]; } - (NSString *)windowNibName @@ -197,8 +193,6 @@ int tabIndex = [tabView indexOfTabViewItem:[tabView selectedTabViewItem]]; if(tabIndex == 0) path = [[server texTask] PDFFilePath]; - else if(tabIndex == 1) - path = [[server texTask] RTFFilePath]; else path = [[server texTask] logFilePath]; } @@ -216,12 +210,6 @@ return pdfView; } -- (NSTextView *)textView; -{ - [self window]; - return rtfPreviewView; -} - - (BDSKOverlay *)progressOverlay; { [self window]; @@ -240,20 +228,8 @@ [pdfView setScaleFactor:scaleFactor]; } -- (float)RTFScaleFactor; -{ - [self window]; - return [(BDSKZoomableScrollView *)[rtfPreviewView enclosingScrollView] scaleFactor]; -} - -- (void)setRTFScaleFactor:(float)scaleFactor; -{ - [self window]; - [(BDSKZoomableScrollView *)[rtfPreviewView enclosingScrollView] setScaleFactor:scaleFactor]; -} - - (BOOL)isVisible{ - return [[pdfView window] isVisible] || [[rtfPreviewView window] isVisible]; + return [[pdfView window] isVisible]; } #pragma mark Actions @@ -288,18 +264,6 @@ - (void)printDocument:(id)sender{ if([tabView indexOfTabViewItem:[tabView selectedTabViewItem]] == 0){ [pdfView printWithInfo:[NSPrintInfo sharedPrintInfo] autoRotate:NO]; - }else{ - BDSKPrintableView *printableView = [[[BDSKPrintableView alloc] initForScreenDisplay:NO] autorelease]; - [printableView setAttributedString:[rtfPreviewView textStorage]]; - - // Construct the print operation and setup Print panel - NSPrintOperation *op = [NSPrintOperation printOperationWithView:printableView - printInfo:[NSPrintInfo sharedPrintInfo]]; - [op setShowPanels:YES]; - [op setCanSpawnSeparateThread:YES]; - - // Run operation, which shows the Print panel if showPanels was YES - [op runOperationModalForWindow:[self window] delegate:nil didRunSelector:NULL contextInfo:NULL]; } } @@ -347,12 +311,6 @@ // get the data to display if(state == BDSKShowingPreviewState){ - - NSData *rtfData = [self RTFData]; - if(rtfData != nil) - attrString = [[NSAttributedString alloc] initWithRTF:rtfData documentAttributes:NULL]; - else - message = NSLocalizedString(@"***** ERROR: unable to create preview *****", @"Preview message"); logString = [[server texTask] logFileString]; if (nil == logString) @@ -407,18 +365,6 @@ [pdfView setDocument:pdfDocument]; [pdfDocument release]; - // draw the RTF preview - [rtfPreviewView setString:@""]; - [rtfPreviewView setTextContainerInset:NSMakeSize(20,20)]; // pad the edges of the text - if(attrString){ - [[rtfPreviewView textStorage] appendAttributedString:attrString]; - [attrString release]; - } else if (message){ - NSTextStorage *ts = [rtfPreviewView textStorage]; - [[ts mutableString] setString:message]; - [ts addAttribute:NSForegroundColorAttributeName value:[NSColor grayColor] range:NSMakeRange(0, [ts length])]; - } - [logView setString:@""]; [logView setTextContainerInset:NSMakeSize(20,20)]; // pad the edges of the text [logView setString:logString]; @@ -464,12 +410,6 @@ return [[server texTask] PDFData]; } -- (NSData *)RTFData{ - if(previewState != BDSKShowingPreviewState || [self isVisible] == NO) - return nil; - return [[server texTask] RTFData]; -} - - (NSString *)LaTeXString{ if(previewState != BDSKShowingPreviewState || [self isVisible] == NO) return nil; @@ -492,9 +432,6 @@ if (fabsf(scaleFactor - [[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKPreviewPDFScaleFactorKey]) > 0.01) [[OFPreferenceWrapper sharedPreferenceWrapper] setFloat:scaleFactor forKey:BDSKPreviewPDFScaleFactorKey]; - scaleFactor = [(BDSKZoomableScrollView*)[rtfPreviewView enclosingScrollView] scaleFactor]; - if (fabsf(scaleFactor - [[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKPreviewRTFScaleFactorKey]) > 0.01) - [[OFPreferenceWrapper sharedPreferenceWrapper] setFloat:scaleFactor forKey:BDSKPreviewRTFScaleFactorKey]; // make sure we don't process anything else; the TeX task will take care of its own cleanup [server stopDOServer]; @@ -508,7 +445,6 @@ [server stopDOServer]; [server release]; [pdfView release]; - [[rtfPreviewView enclosingScrollView] release]; [super dealloc]; } Modified: trunk/bibdesk/BibDocument+Menus.m =================================================================== --- trunk/bibdesk/BibDocument+Menus.m 2008-02-03 23:37:37 UTC (rev 271) +++ trunk/bibdesk/BibDocument+Menus.m 2008-02-03 23:51:40 UTC (rev 272) @@ -282,12 +282,8 @@ // see comments on exception in -printableView, which is the main motivation for this validation else if([currentPreviewView isEqual:previewerBox]) return [[previewer pdfView] document] != nil; - else if ([currentPreviewView isEqual:previewBox]) - return [previewPdfView document] != nil; - else if ([[previewer textView] isEqual:previewBox]) - return [[previewer textView] textStorage] != nil; else - return [previewTextView textStorage] != nil; + return [previewPdfView document] != nil; } - (BOOL) validateToggleToggleCustomCiteDrawerMenuItem:(NSMenuItem*) menuItem { Modified: trunk/bibdesk/BibDocument.h =================================================================== --- trunk/bibdesk/BibDocument.h 2008-02-03 23:37:37 UTC (rev 271) +++ trunk/bibdesk/BibDocument.h 2008-02-03 23:51:40 UTC (rev 272) @@ -77,7 +77,6 @@ BDSKAbstractPreviewDisplay = 2, BDSKTemplatePreviewDisplay = 3, BDSKPDFPreviewDisplay = 4, - BDSKRTFPreviewDisplay = 5, BDSKLinkedFilePreviewDisplay = 6 }; Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2008-02-03 23:37:37 UTC (rev 271) +++ trunk/bibdesk/BibDocument.m 2008-02-03 23:51:40 UTC (rev 272) @@ -663,7 +663,6 @@ if(previewer){ [dictionary setFloatValue:[previewer PDFScaleFactor] forKey:BDSKPreviewPDFScaleFactorKey]; - [dictionary setFloatValue:[previewer RTFScaleFactor] forKey:BDSKPreviewRTFScaleFactorKey]; } if(fileSearchController){ @@ -2981,16 +2980,15 @@ previewer = [[BDSKPreviewer alloc] init]; NSDictionary *xatrrDefaults = [self mainWindowSetupDictionaryFromExtendedAttributes]; [previewer setPDFScaleFactor:[xatrrDefaults floatForKey:BDSKPreviewPDFScaleFactorKey defaultValue:0.0]]; - [previewer setRTFScaleFactor:[xatrrDefaults floatForKey:BDSKPreviewRTFScaleFactorKey defaultValue:1.0]]; previewerBox = [[BDSKEdgeView alloc] init]; [previewerBox setEdges:BDSKEveryEdgeMask]; [previewerBox setColor:[NSColor lightGrayColor] forEdge:NSMaxYEdge]; [previewerBox setContentView:[previewer pdfView]]; } - // may be the pdflatex or latex2rtf generated preview + // the pdflatex generated preview int displayType = [[OFPreferenceWrapper sharedPreferenceWrapper] integerForKey:BDSKPreviewDisplayKey]; - NSView *view = displayType == BDSKRTFPreviewDisplay ? (NSView *)[[previewer textView] enclosingScrollView] : (NSView *)previewerBox; + NSView *view = (NSView *)previewerBox; if(currentPreviewView != view){ [view setFrame:[currentPreviewView frame]]; [[currentPreviewView superview] replaceSubview:currentPreviewView with:view]; @@ -3352,7 +3350,7 @@ - (void)updatePreviewPane{ int displayType = [[OFPreferenceWrapper sharedPreferenceWrapper] integerForKey:BDSKPreviewDisplayKey]; - if(displayType == BDSKPDFPreviewDisplay || displayType == BDSKRTFPreviewDisplay){ + if(displayType == BDSKPDFPreviewDisplay){ [self displayTeXPreviewInPreviewPane]; }else if(displayType == BDSKLinkedFilePreviewDisplay){ [self displayLinkedFileInPreviewPane]; @@ -3594,15 +3592,6 @@ if(displayType == BDSKPDFPreviewDisplay || displayType == BDSKLinkedFilePreviewDisplay){ // we don't reach this, we let the pdfView do the printing return currentPreviewView; - }else if(displayType == BDSKRTFPreviewDisplay){ - // user reported an NSBigMutableString nil replacement exception when printing; it's not immediately clear which view he was printing, or under what conditions it returns nil, so we'll check for this and print an error - BDSKPrintableView *printableView = [[BDSKPrintableView alloc] initForScreenDisplay:NO]; - NSTextStorage *ts = [[previewer textView] textStorage]; - if (ts) - [printableView setAttributedString:ts]; - else - [printableView setString:NSLocalizedString(@"Error: nothing to print from latex2rtf preview", @"printing error")]; - return [printableView autorelease]; }else{ BDSKPrintableView *printableView = [[BDSKPrintableView alloc] initForScreenDisplay:NO]; NSTextStorage *ts = [previewTextView textStorage]; Modified: trunk/bibdesk/English.lproj/Previewer.nib/classes.nib =================================================================== --- trunk/bibdesk/English.lproj/Previewer.nib/classes.nib 2008-02-03 23:37:37 UTC (rev 271) +++ trunk/bibdesk/English.lproj/Previewer.nib/classes.nib 2008-02-03 23:51:40 UTC (rev 272) @@ -5,23 +5,15 @@ <key>IBClasses</key> <array> <dict> - <key>CLASS</key> - <string>BDSKCollapsibleView</string> - <key>LANGUAGE</key> - <string>ObjC</string> - <key>SUPERCLASS</key> - <string>BDSKContainerView</string> - </dict> - <dict> <key>ACTIONS</key> <dict> - <key>scalePopUpAction:</key> + <key>scalePopUpAction</key> <string>id</string> - <key>zoomIn:</key> + <key>zoomIn</key> <string>id</string> - <key>zoomOut:</key> + <key>zoomOut</key> <string>id</string> - <key>zoomToActualSize:</key> + <key>zoomToActualSize</key> <string>id</string> </dict> <key>CLASS</key> @@ -33,34 +25,74 @@ </dict> <dict> <key>CLASS</key> - <string>PDFImageView</string> + <string>NSMenu</string> <key>LANGUAGE</key> <string>ObjC</string> <key>SUPERCLASS</key> - <string>NSImageView</string> + <string>NSObject</string> </dict> <dict> + <key>CLASS</key> + <string>NSControl</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> <key>ACTIONS</key> <dict> - <key>scalePopUpAction:</key> + <key>hideWindow</key> <string>id</string> + <key>toggleShowingWindow</key> + <string>id</string> </dict> <key>CLASS</key> - <string>BDSKZoomablePDFView</string> + <string>NSWindowController</string> <key>LANGUAGE</key> <string>ObjC</string> <key>SUPERCLASS</key> - <string>PDFView</string> + <string>NSResponder</string> </dict> <dict> <key>CLASS</key> - <string>BDSKZoomImageView</string> + <string>NSObject</string> <key>LANGUAGE</key> <string>ObjC</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKOverlay</string> + <key>LANGUAGE</key> + <string>ObjC</string> <key>SUPERCLASS</key> - <string>NSImageView</string> + <string>NSPanel</string> </dict> <dict> + <key>CLASS</key> + <string>NSWindow</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSScrollView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKCollapsibleView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>BDSKContainerView</string> + </dict> + <dict> <key>ACTIONS</key> <dict> <key></key> @@ -75,16 +107,24 @@ </dict> <dict> <key>CLASS</key> - <string>BDSKContainerView</string> + <string>BDSKZoomableTextView</string> <key>LANGUAGE</key> <string>ObjC</string> - <key>OUTLETS</key> + <key>SUPERCLASS</key> + <string>NSTextView</string> + </dict> + <dict> + <key>ACTIONS</key> <dict> - <key>contentView</key> + <key>scalePopUpAction</key> <string>id</string> </dict> + <key>CLASS</key> + <string>BDSKZoomablePDFView</string> + <key>LANGUAGE</key> + <string>ObjC</string> <key>SUPERCLASS</key> - <string>NSView</string> + <string>PDFView</string> </dict> <dict> <key>CLASS</key> @@ -115,19 +155,24 @@ </dict> <dict> <key>CLASS</key> - <string>BDSKOverlay</string> + <string>NSTextView</string> <key>LANGUAGE</key> <string>ObjC</string> <key>SUPERCLASS</key> - <string>NSPanel</string> + <string>NSText</string> </dict> <dict> <key>CLASS</key> - <string>BDSKZoomableTextView</string> + <string>BDSKContainerView</string> <key>LANGUAGE</key> <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>contentView</key> + <string>id</string> + </dict> <key>SUPERCLASS</key> - <string>NSTextView</string> + <string>NSView</string> </dict> <dict> <key>CLASS</key> @@ -137,42 +182,6 @@ <key>SUPERCLASS</key> <string>NSView</string> </dict> - <dict> - <key>ACTIONS</key> - <dict> - <key>checkForUpdates:</key> - <string>id</string> - <key>showPreferencePanel:</key> - <string>id</string> - <key>showReadMeFile:</key> - <string>id</string> - <key>showRelNotes:</key> - <string>id</string> - <key>toggleShowingErrorPanel:</key> - <string>id</string> - <key>toggleShowingOrphanedFilesPanel:</key> - <string>id</string> - <key>toggleShowingPreviewPanel:</key> - <string>id</string> - <key>visitWebSite:</key> - <string>id</string> - </dict> - <key>CLASS</key> - <string>BibAppController</string> - <key>LANGUAGE</key> - <string>ObjC</string> - <key>OUTLETS</key> - <dict> - <key>columnsMenu</key> - <string>NSMenu</string> - <key>copyAsTemplateMenu</key> - <string>NSMenu</string> - <key>groupSortMenu</key> - <string>NSMenu</string> - </dict> - <key>SUPERCLASS</key> - <string>NSObject</string> - </dict> </array> <key>IBVersion</key> <string>1</string> Modified: trunk/bibdesk/English.lproj/Previewer.nib/info.nib =================================================================== --- trunk/bibdesk/English.lproj/Previewer.nib/info.nib 2008-02-03 23:37:37 UTC (rev 271) +++ trunk/bibdesk/English.lproj/Previewer.nib/info.nib 2008-02-03 23:51:40 UTC (rev 272) @@ -3,14 +3,15 @@ <plist version="1.0"> <dict> <key>IBFramework Version</key> - <string>592</string> + <string>629</string> + <key>IBOldestOS</key> + <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>85</integer> - <integer>5</integer> + <integer>64</integer> </array> <key>IBSystem Version</key> - <string>9A377a</string> + <string>9C27</string> <key>targetFramework</key> <string>IBCocoaFramework</string> </dict> Modified: trunk/bibdesk/English.lproj/Previewer.nib/keyedobjects.nib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-03 23:56:06
|
Revision: 273 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=273&view=rev Author: amaxwell Date: 2008-02-03 15:56:09 -0800 (Sun, 03 Feb 2008) Log Message: ----------- delete input manager Modified Paths: -------------- trunk/bibdesk/BDSKAppController.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/English.lproj/PreferenceSearchTerms.plist trunk/bibdesk/French.lproj/PreferenceSearchTerms.plist trunk/bibdesk/Info.plist Removed Paths: ------------- trunk/bibdesk/BibPref_InputManager.h trunk/bibdesk/BibPref_InputManager.m trunk/bibdesk/English.lproj/BibPref_InputManager.nib/ trunk/bibdesk/French.lproj/BibPref_InputManager.nib/ trunk/bibdesk/inputmanager/ Modified: trunk/bibdesk/BDSKAppController.m =================================================================== --- trunk/bibdesk/BDSKAppController.m 2008-02-03 23:51:40 UTC (rev 272) +++ trunk/bibdesk/BDSKAppController.m 2008-02-03 23:56:09 UTC (rev 273) @@ -313,10 +313,6 @@ [[BDSKUpdateChecker sharedChecker] scheduleUpdateCheckIfNeeded]; - BOOL inputManagerIsCurrent; - if([self isInputManagerInstalledAndCurrent:&inputManagerIsCurrent] && inputManagerIsCurrent == NO) - [self showInputManagerUpdateAlert]; - // Ensure the previewer and TeX task get created now in order to avoid a spurious "unable to copy helper file" warning when quit->document window closes->first call to [BDSKPreviewer sharedPreviewer] if([[OFPreferenceWrapper sharedPreferenceWrapper] boolForKey:BDSKUsesTeXKey]) [BDSKPreviewer sharedPreviewer]; @@ -902,55 +898,6 @@ [[BDSKUpdateChecker sharedChecker] checkForUpdates:sender]; } -#pragma mark Input manager - -- (BOOL)isInputManagerInstalledAndCurrent:(BOOL *)current{ - NSParameterAssert(current != NULL); - - // Someone may be mad enough to install this in NSLocalDomain or NSNetworkDomain, but we don't support that since it would require admin rights. As of 10.5, input managers must be installed in NSLocalDomain, and have certain permissions set. Because of this, and because the input manager has been a PITA to support, we ignore it on 10.5. - NSString *inputManagerBundlePath = [[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"/InputManagers/BibDeskInputManager/BibDeskInputManager.bundle"]; - - NSString *bundlePath = [[[NSBundle mainBundle] sharedSupportPath] stringByAppendingPathComponent:@"BibDeskInputManager/BibDeskInputManager.bundle"]; - NSString *bundledVersion = [[[NSBundle bundleWithPath:bundlePath] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey]; - NSString *installedVersion = [[[NSBundle bundleWithPath:inputManagerBundlePath] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey]; - - // one-time alert when launching on Leopard - if (nil != installedVersion && floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) { - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BDSKShowedLeopardInputManagerAlert"] == NO) { - - NSString *folderPath = [inputManagerBundlePath stringByDeletingLastPathComponent]; - - NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Completion Plugin is Disabled", @"Leopard warning") defaultButton:NSLocalizedString(@"Show", @"") alternateButton:NSLocalizedString(@"Ignore",@"") otherButton:nil informativeTextWithFormat:NSLocalizedString(@"Due to security restrictions in Mac OS X 10.5, the completion plugin located in %@ is now disabled and will no longer be supported. Show in Finder?", @"input manager warning"), [folderPath stringByAbbreviatingWithTildeInPath]]; - int rv = [alert runModal]; - if (NSAlertDefaultReturn == rv) - [[NSWorkspace sharedWorkspace] selectFile:folderPath inFileViewerRootedAtPath:@""]; - } - - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"BDSKShowedLeopardInputManagerAlert"]; - - // set installed version to nil, so we never display an update alert - installedVersion = nil; - } - - *current = [bundledVersion isEqualToString:installedVersion]; - return installedVersion == nil ? NO : YES; -} - -- (void)showInputManagerUpdateAlert{ - NSAlert *anAlert = [NSAlert alertWithMessageText:NSLocalizedString(@"Autocomplete Plugin Needs Update", @"Message in alert dialog when plugin version") - defaultButton:[NSLocalizedString(@"Open", @"Button title") stringByAppendingString:[NSString horizontalEllipsisString]] - alternateButton:NSLocalizedString(@"Cancel", @"Button title") - otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"You appear to be using the BibDesk autocompletion plugin, and a newer version is available. Would you like to open the completion preferences so that you can update the plugin?", @"Informative text in alert dialog")]; - int rv = [anAlert runModal]; - if(rv == NSAlertDefaultReturn){ - [[BDSKPreferenceController sharedPreferenceController] showPreferencesPanel:nil]; - [[BDSKPreferenceController sharedPreferenceController] setCurrentClientByClassName:@"BibPref_InputManager"]; - } - -} - #pragma mark Panels - (IBAction)showReadMeFile:(id)sender{ Deleted: trunk/bibdesk/BibPref_InputManager.h =================================================================== --- trunk/bibdesk/BibPref_InputManager.h 2008-02-03 23:51:40 UTC (rev 272) +++ trunk/bibdesk/BibPref_InputManager.h 2008-02-03 23:56:09 UTC (rev 273) @@ -1,63 +0,0 @@ -// -// BibPref_InputManager.h -// BibDesk -// -// Created by Adam Maxwell on Fri Aug 27 2004. -// Copyright (c) 2004 Adam R. Maxwell. All rights reserved. -/* - This software is Copyright (c) 2004-2008 - Adam Maxwell. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import <Cocoa/Cocoa.h> -#import "BDSKStringConstants.h" -#import <OmniAppKit/OAGradientTableView.h> -#import <OmniAppKit/OATextWithIconCell.h> - -@interface BibPref_InputManager : OAPreferenceClient -{ - IBOutlet OAGradientTableView *tableView; - IBOutlet NSButton *enableButton; - IBOutlet NSArrayController *arrayController; - NSString *inputManagerPath; - NSMutableArray *applications; -} - -- (void)addApplicationsWithIdentifiers:(NSArray *)identifiers; -- (void)synchronizePreferences; - -- (IBAction)enableAutocompletion:(id)sender; -- (IBAction)addApplication:(id)sender; -- (IBAction)removeApplication:(id)sender; - -- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; - -@end Deleted: trunk/bibdesk/BibPref_InputManager.m =================================================================== --- trunk/bibdesk/BibPref_InputManager.m 2008-02-03 23:51:40 UTC (rev 272) +++ trunk/bibdesk/BibPref_InputManager.m 2008-02-03 23:56:09 UTC (rev 273) @@ -1,273 +0,0 @@ -// -// BibPref_InputManager.m -// BibDesk -// -// Created by Adam Maxwell on Fri Aug 27 2004. -/* - This software is Copyright (c) 2004-2008 - Adam Maxwell. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - - -#import "BibPref_InputManager.h" -#import "BDSKTypeManager.h" -#import "NSImage_BDSKExtensions.h" -#import "BDSKTextWithIconCell.h" -#import "NSSet_BDSKExtensions.h" -#import "BDSKAppController.h" -#import "NSURL_BDSKExtensions.h" -#import "NSWorkspace_BDSKExtensions.h" -#import "NSFileManager_BDSKExtensions.h" - -CFStringRef BDSKInputManagerID = CFSTR("net.sourceforge.bibdesk.inputmanager"); -CFStringRef BDSKInputManagerLoadableApplications = CFSTR("Application bundles that we recognize"); - -static NSString *BDSKBundleIdentifierKey = @"bundleIdentifierKey"; -static int tableIconSize = 24; - -@implementation BibPref_InputManager - -- (void)awakeFromNib{ - [super awakeFromNib]; - - NSString *libraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0]; - inputManagerPath = [[libraryPath stringByAppendingPathComponent:@"/InputManagers/BibDeskInputManager"] retain]; - - applications = [[NSMutableArray alloc] initWithCapacity:3]; - - CFPropertyListRef prefs = CFPreferencesCopyAppValue(BDSKInputManagerLoadableApplications, BDSKInputManagerID ); - - if(prefs != nil){ - [self addApplicationsWithIdentifiers:(NSArray *)prefs]; - CFRelease(prefs); - } - - BDSKTextWithIconCell *cell = [[[BDSKTextWithIconCell alloc] init] autorelease]; - [cell setDrawsHighlight:NO]; - [[tableView tableColumnWithIdentifier:@"AppList"] setDataCell:cell]; - [tableView setRowHeight:(tableIconSize + 2)]; - - NSSortDescriptor *sort = [[[NSSortDescriptor alloc] initWithKey:OATextWithIconCellStringKey ascending:YES selector:@selector(localizedCaseInsensitiveCompare:)] autorelease]; - [arrayController setSortDescriptors:[NSArray arrayWithObject:sort]]; - - [self updateUI]; -} - -- (void)addApplicationsWithIdentifiers:(NSArray *)identifiers{ - NSParameterAssert(identifiers); - - NSString *bundleID; - - // use a set so we don't add duplicate items to the array (not that it's particularly harmful) - NSMutableSet *currentBundleIdentifiers = [NSMutableSet caseInsensitiveStringSet]; - [currentBundleIdentifiers addObjectsFromArray:[[arrayController content] valueForKey:OATextWithIconCellStringKey]]; - - NSEnumerator *identifierE = [identifiers objectEnumerator]; - - while((bundleID = [identifierE nextObject]) && ([currentBundleIdentifiers containsObject:bundleID] == NO)){ - - CFURLRef theURL = nil; - NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] initWithCapacity:2]; - - OSStatus err = LSFindApplicationForInfo( kLSUnknownCreator, - (CFStringRef)bundleID, - NULL, - NULL, - &theURL ); - - if(err == noErr){ - [dictionary setValue:[[(NSURL *)theURL lastPathComponent] stringByDeletingPathExtension] forKey:OATextWithIconCellStringKey]; - [dictionary setValue:[[NSWorkspace sharedWorkspace] iconForFileURL:(NSURL *)theURL] forKey:OATextWithIconCellImageKey]; - [dictionary setValue:bundleID forKey:BDSKBundleIdentifierKey]; - } else { - // if LS failed us (my cache was corrupt when I wrote this code, so it's been tested) - [dictionary setValue:[NSString stringWithFormat:@"%@ \"%@\"", NSLocalizedString(@"Unable to find icon for",@"Message when unable to find app for plugin"), bundleID] forKey:OATextWithIconCellStringKey]; - [dictionary setValue:[NSImage iconWithSize:NSMakeSize(tableIconSize, tableIconSize) forToolboxCode:kGenericApplicationIcon] forKey:OATextWithIconCellImageKey]; - [dictionary setValue:bundleID forKey:BDSKBundleIdentifierKey]; - } - - [arrayController addObject:dictionary]; - [dictionary release]; - - } - [arrayController rearrangeObjects]; - [self synchronizePreferences]; -} - -// writes current displayed list to preferences -- (void)synchronizePreferences{ - - // this should be a unique list of the identifiers that we previously had in prefs; bundles are compared case-insensitively - NSMutableSet *applicationSet = [NSMutableSet caseInsensitiveStringSet]; - [applicationSet addObjectsFromArray:[[arrayController content] valueForKey:BDSKBundleIdentifierKey]]; - - CFPreferencesSetAppValue(BDSKInputManagerLoadableApplications, (CFArrayRef)[applicationSet allObjects], BDSKInputManagerID); - BOOL success = CFPreferencesAppSynchronize( (CFStringRef)BDSKInputManagerID ); - if(success == NO) - NSLog(@"Failed to synchronize preferences for %@", BDSKInputManagerID); - -} - -- (void)dealloc{ - [inputManagerPath release]; - [applications release]; - [arrayController release]; - [super dealloc]; -} - -- (void)updateUI{ - BOOL isCurrent; - if([[NSApp delegate] isInputManagerInstalledAndCurrent:&isCurrent]) - [enableButton setTitle:isCurrent ? NSLocalizedString(@"Reinstall",@"Button title") : NSLocalizedString(@"Update", @"Button title")]; - - // this is a hack to show the blue highlight for the tableview, since it keeps losing first responder status - [[controlBox window] makeFirstResponder:tableView]; -} - -#pragma mark Citekey autocompletion - -- (void)enableCompletionSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo{ - - if(returnCode == NSAlertAlternateReturn){ - // set tableview as first responder - [self updateUI]; - return; // do nothing; user chickened out - } - - NSFileManager *fm = [NSFileManager defaultManager]; - BOOL err = NO; - NSString *libraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) objectAtIndex:0]; - - if(![fm fileExistsAtPath:[libraryPath stringByAppendingPathComponent:@"InputManagers"]]){ - if(![fm createDirectoryAtPath:[libraryPath stringByAppendingPathComponent:@"InputManagers"] attributes:nil]){ - NSLog(@"Unable to create the InputManagers folder at path @%",[libraryPath stringByAppendingPathComponent:@"InputManagers"]); - err = YES; - } - } - - if(err == NO && [fm fileExistsAtPath:inputManagerPath] && ([fm isDeletableFileAtPath:inputManagerPath] == NO || [fm removeFileAtPath:inputManagerPath handler:nil] == NO)){ - NSLog(@"Error occurred while removing file %@", inputManagerPath); - err = YES; - } - - if(err == NO){ - [fm copyPath:[[[NSBundle mainBundle] sharedSupportPath] stringByAppendingPathComponent:@"BibDeskInputManager"] toPath:inputManagerPath handler:nil]; - } else { - NSAlert *anAlert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error!",@"Message in alert dialog when an error occurs") - defaultButton:nil - alternateButton:nil - otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"Unable to install plugin at %@, please check file or directory permissions.", @"Informative text in alert dialog"), inputManagerPath]; - [anAlert beginSheetModalForWindow:[[BDSKPreferenceController sharedPreferenceController] window] - modalDelegate:nil - didEndSelector:nil - contextInfo:nil]; - } - [self updateUI]; // change button to "Reinstall" - -} - -- (IBAction)enableAutocompletion:(id)sender{ - - NSBeginAlertSheet(NSLocalizedString(@"Warning!", @"Message in alert dialog"), NSLocalizedString(@"Proceed", @"Button title"), NSLocalizedString(@"Cancel", @"Button title"), nil, [[self controlBox] window], self, @selector(enableCompletionSheetDidEnd:returnCode:contextInfo:), NULL, NULL, NSLocalizedString(@"This will install a plugin bundle in ~/Library/InputManagers/BibDeskInputManager. If you experience text input problems or strange application behavior after installing the plugin, try removing the \"BibDeskInputManager\" subfolder.", @"Informative text in alert dialog")); - -} - -- (IBAction)addApplication:(id)sender{ - - NSOpenPanel *op = [NSOpenPanel openPanel]; - [op setCanChooseDirectories:NO]; - [op setAllowsMultipleSelection:NO]; - [op setPrompt:NSLocalizedString(@"Add", @"Prompt for dialog to add an app for plugin")]; - [op beginSheetForDirectory:[[NSFileManager defaultManager] applicationsDirectory] - file:nil - types:[NSArray arrayWithObject:@"app"] - modalForWindow:[[BDSKPreferenceController sharedPreferenceController] window] - modalDelegate:self - didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) - contextInfo:nil]; -} - -- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo{ - if(returnCode == NSOKButton){ - - // check to see if it's a Cocoa application (returns no for BBEdit Lite and MS Word, but yes for Carbon Emacs and Aqua LyX, so it's not foolproof) - NSString *fileType = nil; - [[NSWorkspace sharedWorkspace] getInfoForFile:[[sheet filenames] objectAtIndex:0] - application:nil - type:&fileType]; - if(![fileType isEqualToString:NSApplicationFileType]){ - [sheet orderOut:nil]; - NSAlert *anAlert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error!",@"Message in alert dialog when an error occurs") - defaultButton:nil - alternateButton:nil - otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"%@ is not a Cocoa application.", @"Informative text in alert dialog"), [[sheet filenames] objectAtIndex:0]]; - [anAlert beginSheetModalForWindow:[[BDSKPreferenceController sharedPreferenceController] window] - modalDelegate:nil - didEndSelector:nil - contextInfo:nil]; - return; - } - - // LaTeX Equation Editor is Cocoa, but doesn't have a CFBundleIdentifier! Perhaps there are others... - NSString *bundleID = [[NSBundle bundleWithPath:[[sheet filenames] objectAtIndex:0]] bundleIdentifier]; - if(bundleID == nil){ - [sheet orderOut:nil]; - NSAlert *anAlert = [NSAlert alertWithMessageText:NSLocalizedString(@"No Bundle Identifier!",@"Message in alert dialog when no bundle identifier could be found for application to set for plugin") - defaultButton:nil - alternateButton:nil - otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"The selected application does not have a bundle identifier. Please inform the author of %@.", @"Informative text in alert dialog"), [[sheet filenames] objectAtIndex:0]]; - [anAlert beginSheetModalForWindow:[[BDSKPreferenceController sharedPreferenceController] window] - modalDelegate:nil - didEndSelector:nil - contextInfo:nil]; - return; - } else { - [self addApplicationsWithIdentifiers:[NSArray arrayWithObject:bundleID]]; - [self updateUI]; - } - } else if(returnCode == NSCancelButton){ - // do nothing - } -} - -- (IBAction)removeApplication:(id)sender{ - unsigned int selIndex = [arrayController selectionIndex]; - if (NSNotFound != selIndex) - [arrayController removeObjectAtArrangedObjectIndex:selIndex]; - [self synchronizePreferences]; - [self updateUI]; -} - -@end Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-03 23:51:40 UTC (rev 272) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-03 23:56:09 UTC (rev 273) @@ -319,7 +319,6 @@ F9022C88075802E300C3F701 /* BibPref_CiteKey.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022C76075802E300C3F701 /* BibPref_CiteKey.m */; }; F9022C8D0758034000C3F701 /* BibDocument+Menus.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022C8A0758034000C3F701 /* BibDocument+Menus.m */; }; F9022C8E0758034000C3F701 /* BibDocumentView_Toolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022C8C0758034000C3F701 /* BibDocumentView_Toolbar.m */; }; - F9022CA80758038000C3F701 /* BibPref_InputManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022C900758038000C3F701 /* BibPref_InputManager.m */; }; F9022CAA0758038000C3F701 /* BDSKStringConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022C940758038000C3F701 /* BDSKStringConstants.m */; }; F9022CAB0758038000C3F701 /* BDSKBibTeXParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022C960758038000C3F701 /* BDSKBibTeXParser.m */; }; F9022CAC0758038000C3F701 /* BDSKTypeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022C980758038000C3F701 /* BDSKTypeManager.m */; }; @@ -339,7 +338,6 @@ F9022CD9075804E400C3F701 /* BibPref_CiteKey.nib in Resources */ = {isa = PBXBuildFile; fileRef = F9022CD1075804E400C3F701 /* BibPref_CiteKey.nib */; }; F9022CDA075804E400C3F701 /* BibPref_Defaults.nib in Resources */ = {isa = PBXBuildFile; fileRef = F9022CD3075804E400C3F701 /* BibPref_Defaults.nib */; }; F9022CE90758050E00C3F701 /* BibPref_General.nib in Resources */ = {isa = PBXBuildFile; fileRef = F9022CDB0758050E00C3F701 /* BibPref_General.nib */; }; - F9022CEA0758050E00C3F701 /* BibPref_InputManager.nib in Resources */ = {isa = PBXBuildFile; fileRef = F9022CDD0758050E00C3F701 /* BibPref_InputManager.nib */; }; F9022CEC0758050E00C3F701 /* BibPref_TeX.nib in Resources */ = {isa = PBXBuildFile; fileRef = F9022CE10758050E00C3F701 /* BibPref_TeX.nib */; }; F9022CED0758050E00C3F701 /* BibTeXKeys.strings in Resources */ = {isa = PBXBuildFile; fileRef = F9022CE30758050E00C3F701 /* BibTeXKeys.strings */; }; F9022CEE0758050E00C3F701 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F9022CE50758050E00C3F701 /* Credits.rtf */; }; @@ -359,7 +357,6 @@ F9022DC80758088000C3F701 /* editdoc.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DAD0758088000C3F701 /* editdoc.tiff */; }; F9022DC90758088000C3F701 /* find.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DAE0758088000C3F701 /* find.tiff */; }; F9022DCA0758088000C3F701 /* FolderPenIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = F9022DAF0758088000C3F701 /* FolderPenIcon.icns */; }; - F9022DCB0758088000C3F701 /* inputmanager.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB00758088000C3F701 /* inputmanager.tiff */; }; F9022DCC0758088000C3F701 /* key.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB10758088000C3F701 /* key.tiff */; }; F9022DCD0758088000C3F701 /* newdoc.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB20758088000C3F701 /* newdoc.tiff */; }; F9022DCE0758088000C3F701 /* preview.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB30758088000C3F701 /* preview.tiff */; }; @@ -1239,8 +1236,6 @@ F9022C8A0758034000C3F701 /* BibDocument+Menus.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = "BibDocument+Menus.m"; sourceTree = "<group>"; }; F9022C8B0758034000C3F701 /* BibDocumentView_Toolbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BibDocumentView_Toolbar.h; sourceTree = "<group>"; }; F9022C8C0758034000C3F701 /* BibDocumentView_Toolbar.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BibDocumentView_Toolbar.m; sourceTree = "<group>"; }; - F9022C8F0758038000C3F701 /* BibPref_InputManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BibPref_InputManager.h; sourceTree = "<group>"; }; - F9022C900758038000C3F701 /* BibPref_InputManager.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BibPref_InputManager.m; sourceTree = "<group>"; }; F9022C930758038000C3F701 /* BDSKStringConstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = BDSKStringConstants.h; sourceTree = "<group>"; }; F9022C940758038000C3F701 /* BDSKStringConstants.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKStringConstants.m; sourceTree = "<group>"; }; F9022C950758038000C3F701 /* BDSKBibTeXParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BDSKBibTeXParser.h; sourceTree = "<group>"; }; @@ -1274,7 +1269,6 @@ F9022CD2075804E400C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BibPref_CiteKey.nib; sourceTree = SOURCE_ROOT; }; F9022CD4075804E400C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BibPref_Defaults.nib; sourceTree = SOURCE_ROOT; }; F9022CDC0758050E00C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BibPref_General.nib; sourceTree = SOURCE_ROOT; }; - F9022CDE0758050E00C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BibPref_InputManager.nib; sourceTree = SOURCE_ROOT; }; F9022CE20758050E00C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BibPref_TeX.nib; sourceTree = SOURCE_ROOT; }; F9022CE40758050E00C3F701 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/BibTeXKeys.strings; sourceTree = SOURCE_ROOT; }; F9022CE60758050E00C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = SOURCE_ROOT; }; @@ -1282,7 +1276,6 @@ F9022D150758066000C3F701 /* CharacterConversion.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = CharacterConversion.plist; sourceTree = "<group>"; }; F9022D180758066000C3F701 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/ReadMe.rtf; sourceTree = "<group>"; }; F9022D1B0758066000C3F701 /* TypeInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = TypeInfo.plist; sourceTree = "<group>"; }; - F9022D2C0758069E00C3F701 /* BibDeskInputManager */ = {isa = PBXFileReference; lastKnownFileType = folder; path = BibDeskInputManager; sourceTree = BUILT_PRODUCTS_DIR; }; F9022DA20758088000C3F701 /* Action_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Action_Pressed.tiff; path = Images/Action_Pressed.tiff; sourceTree = "<group>"; }; F9022DA30758088000C3F701 /* Action.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Action.tiff; path = Images/Action.tiff; sourceTree = "<group>"; }; F9022DA40758088000C3F701 /* Add_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Add_Pressed.tiff; path = Images/Add_Pressed.tiff; sourceTree = "<group>"; }; @@ -1296,7 +1289,6 @@ F9022DAD0758088000C3F701 /* editdoc.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = editdoc.tiff; path = Images/editdoc.tiff; sourceTree = "<group>"; }; F9022DAE0758088000C3F701 /* find.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = find.tiff; path = Images/find.tiff; sourceTree = "<group>"; }; F9022DAF0758088000C3F701 /* FolderPenIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = FolderPenIcon.icns; path = Images/FolderPenIcon.icns; sourceTree = "<group>"; }; - F9022DB00758088000C3F701 /* inputmanager.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = inputmanager.tiff; path = Images/inputmanager.tiff; sourceTree = "<group>"; }; F9022DB10758088000C3F701 /* key.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = key.tiff; path = Images/key.tiff; sourceTree = "<group>"; }; F9022DB20758088000C3F701 /* newdoc.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = newdoc.tiff; path = Images/newdoc.tiff; sourceTree = "<group>"; }; F9022DB30758088000C3F701 /* preview.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = preview.tiff; path = Images/preview.tiff; sourceTree = "<group>"; }; @@ -1537,7 +1529,6 @@ F9C7D3E40BE927E200D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibPref_Export.nib; sourceTree = "<group>"; }; F9C7D3E50BE927E200D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibPref_Files.nib; sourceTree = "<group>"; }; F9C7D3E60BE927E200D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibPref_General.nib; sourceTree = SOURCE_ROOT; }; - F9C7D3E70BE927E200D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibPref_InputManager.nib; sourceTree = SOURCE_ROOT; }; F9C7D3E80BE927E300D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibPref_ScriptHooks.nib; sourceTree = "<group>"; }; F9C7D3E90BE927E300D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibPref_Sharing.nib; sourceTree = "<group>"; }; F9C7D3EA0BE927E300D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibPref_TeX.nib; sourceTree = SOURCE_ROOT; }; @@ -1823,7 +1814,6 @@ F963E4470A1D7E1300695DDC /* BibPref_Export.nib */, F92F4E430788DEC5001B8F82 /* BibPref_Files.nib */, F9022CDB0758050E00C3F701 /* BibPref_General.nib */, - F9022CDD0758050E00C3F701 /* BibPref_InputManager.nib */, CED65AC10906BE65003EED90 /* BibPref_ScriptHooks.nib */, F95D3FA509DDF51D00D793A6 /* BibPref_Sharing.nib */, F9022CE10758050E00C3F701 /* BibPref_TeX.nib */, @@ -2218,7 +2208,6 @@ CEE23BAE0BFBA5FE002B746B /* Shared Support */ = { isa = PBXGroup; children = ( - F9022D2C0758069E00C3F701 /* BibDeskInputManager */, CEE23BD50BFBA6D6002B746B /* Scripts */, CE97A3B90A28F19A00CF2DF3 /* Templates */, F91B5CC7076579830011ED22 /* previewtemplate.tex */, @@ -2286,7 +2275,6 @@ CE7E1BB40A0B8EE7009D04C3 /* GroupAdd.tiff */, CE7E1C390A0B9E94009D04C3 /* GroupAdd_Pressed.tiff */, CE2C18910A0A43BE006F0A73 /* importFolderIcon.tiff */, - F9022DB00758088000C3F701 /* inputmanager.tiff */, F9022DB10758088000C3F701 /* key.tiff */, F9FF241209E873A300BB1706 /* networkIcon.tiff */, F9022DB20758088000C3F701 /* newdoc.tiff */, @@ -2545,7 +2533,6 @@ CED65ABD0906BE1F003EED90 /* BibPref_ScriptHooks.h */, F95D3FAC09DDF6A900D793A6 /* BibPref_Sharing.h */, F9022CB8075803AC00C3F701 /* BibPref_TeX.h */, - F9022C8F0758038000C3F701 /* BibPref_InputManager.h */, F9025F2E0969D66F008A551C /* CFString_BDSKExtensions.h */, CE7E29D60A0E84AA009D04C3 /* CIImage_BDSKExtensions.h */, F9022C9B0758038000C3F701 /* html2tex.h */, @@ -2644,7 +2631,6 @@ CED65ABE0906BE1F003EED90 /* BibPref_ScriptHooks.m */, F95D3FAD09DDF6A900D793A6 /* BibPref_Sharing.m */, F9022CB9075803AC00C3F701 /* BibPref_TeX.m */, - F9022C900758038000C3F701 /* BibPref_InputManager.m */, F9022C940758038000C3F701 /* BDSKStringConstants.m */, ); name = Preferences; @@ -3105,7 +3091,6 @@ F9022CD9075804E400C3F701 /* BibPref_CiteKey.nib in Resources */, F9022CDA075804E400C3F701 /* BibPref_Defaults.nib in Resources */, F9022CE90758050E00C3F701 /* BibPref_General.nib in Resources */, - F9022CEA0758050E00C3F701 /* BibPref_InputManager.nib in Resources */, F9022CEC0758050E00C3F701 /* BibPref_TeX.nib in Resources */, F9022CEF0758050E00C3F701 /* Previewer.nib in Resources */, F92F4E450788DEC5001B8F82 /* BibPref_Files.nib in Resources */, @@ -3173,7 +3158,6 @@ F9022DC80758088000C3F701 /* editdoc.tiff in Resources */, F9022DC90758088000C3F701 /* find.tiff in Resources */, F9022DCA0758088000C3F701 /* FolderPenIcon.icns in Resources */, - F9022DCB0758088000C3F701 /* inputmanager.tiff in Resources */, F9022DCC0758088000C3F701 /* key.tiff in Resources */, F9022DCD0758088000C3F701 /* newdoc.tiff in Resources */, F9022DCE0758088000C3F701 /* preview.tiff in Resources */, @@ -3461,7 +3445,6 @@ F9022C88075802E300C3F701 /* BibPref_CiteKey.m in Sources */, F9022C8D0758034000C3F701 /* BibDocument+Menus.m in Sources */, F9022C8E0758034000C3F701 /* BibDocumentView_Toolbar.m in Sources */, - F9022CA80758038000C3F701 /* BibPref_InputManager.m in Sources */, F9022CAA0758038000C3F701 /* BDSKStringConstants.m in Sources */, F9022CAB0758038000C3F701 /* BDSKBibTeXParser.m in Sources */, F9022CAC0758038000C3F701 /* BDSKTypeManager.m in Sources */, @@ -4178,15 +4161,6 @@ name = BibPref_General.nib; sourceTree = "<group>"; }; - F9022CDD0758050E00C3F701 /* BibPref_InputManager.nib */ = { - isa = PBXVariantGroup; - children = ( - F9022CDE0758050E00C3F701 /* English */, - F9C7D3E70BE927E200D65C7F /* French */, - ); - name = BibPref_InputManager.nib; - sourceTree = "<group>"; - }; F9022CE10758050E00C3F701 /* BibPref_TeX.nib */ = { isa = PBXVariantGroup; children = ( Modified: trunk/bibdesk/English.lproj/PreferenceSearchTerms.plist =================================================================== --- trunk/bibdesk/English.lproj/PreferenceSearchTerms.plist 2008-02-03 23:51:40 UTC (rev 272) +++ trunk/bibdesk/English.lproj/PreferenceSearchTerms.plist 2008-02-03 23:56:09 UTC (rev 273) @@ -93,14 +93,6 @@ <string>Groups</string> <string>Mail, E-mail, Email, Template</string> </array> - <key>edu.ucsd.cs.mmccrack.bibdesk.prefpane.inputmanager</key> - <array> - <string>InputManager (input manager)</string> - <string>External completion</string> - <string>Autocomplete</string> - <string>TeXShop, iTeXMac, TextEdit, Xcode</string> - <string>Update or reinstall</string> - </array> <key>edu.ucsd.cs.mmccrack.bibdesk.prefpane.sharing</key> <array> <string>File sharing</string> Modified: trunk/bibdesk/French.lproj/PreferenceSearchTerms.plist =================================================================== --- trunk/bibdesk/French.lproj/PreferenceSearchTerms.plist 2008-02-03 23:51:40 UTC (rev 272) +++ trunk/bibdesk/French.lproj/PreferenceSearchTerms.plist 2008-02-03 23:56:09 UTC (rev 273) @@ -93,14 +93,6 @@ <string>Groupes</string> <string>Mail, E-mail, Email, Modèles</string> </array> - <key>edu.ucsd.cs.mmccrack.bibdesk.prefpane.inputmanager</key> - <array> - <string>InputManager (input manager)</string> - <string>Complétion externe</string> - <string>Autocomplétion</string> - <string>TeXShop, iTeXMac, TextEdit, Xcode</string> - <string>Mettre à jour ou réinstaller</string> - </array> <key>edu.ucsd.cs.mmccrack.bibdesk.prefpane.sharing</key> <array> <string>Partage de fichier</string> Modified: trunk/bibdesk/Info.plist =================================================================== --- trunk/bibdesk/Info.plist 2008-02-03 23:51:40 UTC (rev 272) +++ trunk/bibdesk/Info.plist 2008-02-03 23:56:09 UTC (rev 273) @@ -1028,34 +1028,6 @@ <key>title</key> <string>General [LONG]</string> </dict> - <key>BibPref_InputManager</key> - <dict> - <key>category</key> - <string>Application Preferences</string> - <key>categoryPriority</key> - <integer>2</integer> - <key>defaultsDictionary</key> - <dict> - <key>BDSKEditorFormShouldAutoCompleteKey</key> - <true/> - </dict> - <key>helpURL</key> - <string>AutocompletionPreferences</string> - <key>icon</key> - <string>inputmanager.tiff</string> - <key>identifier</key> - <string>edu.ucsd.cs.mmccrack.bibdesk.prefpane.inputmanager</string> - <key>nib</key> - <string>BibPref_InputManager</string> - <key>ordering</key> - <string>91</string> - <key>shortTitle</key> - <string>Completion [SHORT]</string> - <key>title</key> - <string>Completion [LONG]</string> - <key>maximumOSVersion</key> - <string>10.4.15</string> - </dict> <key>BibPref_ScriptHooks</key> <dict> <key>category</key> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 00:02:28
|
Revision: 274 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=274&view=rev Author: amaxwell Date: 2008-02-03 16:02:27 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove some unused code Modified Paths: -------------- trunk/bibdesk/BDSKAppController.h trunk/bibdesk/BDSKTextWithIconCell.m trunk/bibdesk/NSImage_BDSKExtensions.h trunk/bibdesk/NSImage_BDSKExtensions.m Modified: trunk/bibdesk/BDSKAppController.h =================================================================== --- trunk/bibdesk/BDSKAppController.h 2008-02-03 23:56:09 UTC (rev 273) +++ trunk/bibdesk/BDSKAppController.h 2008-02-04 00:02:27 UTC (rev 274) @@ -127,9 +127,6 @@ - (IBAction)showBookmarks:(id)sender; -- (BOOL)isInputManagerInstalledAndCurrent:(BOOL *)current; -- (void)showInputManagerUpdateAlert; - - (IBAction)toggleShowingOrphanedFilesPanel:(id)sender; // ---------------------------------------------------------------------------------------- Modified: trunk/bibdesk/BDSKTextWithIconCell.m =================================================================== --- trunk/bibdesk/BDSKTextWithIconCell.m 2008-02-03 23:56:09 UTC (rev 273) +++ trunk/bibdesk/BDSKTextWithIconCell.m 2008-02-04 00:02:27 UTC (rev 274) @@ -164,7 +164,7 @@ NSBitmapImageRep *rep = [img bestImageRepForSize:drawFrame.size device:nil]; // draw the image rep directly to avoid creating a new NSImage and adding the rep to it - if (0 && rep) { + if (rep) { srcRect.size = [rep size]; float ratio = fminf(NSWidth(drawFrame) / srcRect.size.width, NSHeight(drawFrame) / srcRect.size.height); Modified: trunk/bibdesk/NSImage_BDSKExtensions.h =================================================================== --- trunk/bibdesk/NSImage_BDSKExtensions.h 2008-02-03 23:56:09 UTC (rev 273) +++ trunk/bibdesk/NSImage_BDSKExtensions.h 2008-02-04 00:02:27 UTC (rev 274) @@ -45,9 +45,8 @@ + (NSImage *)iconWithSize:(NSSize)iconSize forToolboxCode:(OSType) code; + (NSImage *)imageWithLargeIconForToolboxCode:(OSType) code; + (NSImage *)missingFileImage; - + (NSImage *)imageForURL:(NSURL *)aURL; -+ (NSImage *)imageForFile:(NSString *)path; + + (NSImage *)paperclipImage; + (NSImage *)redPaperclipImage; Modified: trunk/bibdesk/NSImage_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSImage_BDSKExtensions.m 2008-02-03 23:56:09 UTC (rev 273) +++ trunk/bibdesk/NSImage_BDSKExtensions.m 2008-02-04 00:02:27 UTC (rev 274) @@ -111,81 +111,6 @@ else return [self genericInternetLocationImage]; } -+ (NSImage *)imageForFile:(NSString *)path{ - - /* It turns out that -[NSWorkspace iconForFileType:] doesn't cache previously returned values, so we cache them here. Mainly useful for tableview datasource methods. - - This caching is problematic in that it - a) doesn't allow for per-file application bindings - b) if the user changes a LS binding while this app is open, we still show the stale value - c) custom icons are not handled correctly - d) it doesn't consider the custom file opening pref that overrides LS (there's no way to account for that) - - */ - - static NSMutableDictionary *imageDictionary = nil; - id image = nil; - - if (!path) - return nil; - - // if no file type, we'll just cache the path and waste some memory - if (imageDictionary == nil) - imageDictionary = [[NSMutableDictionary alloc] init]; - - NSString *pathExtension = [path pathExtension]; - -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 // Uses API deprecated on 10.5 -#warning Omni disables IconFamily on 10.5 - // .app is a valid path extension to pass here, but we must not cache the icon based on that extension! - if(![pathExtension isEqualToString:@""] && ![@"app" isEqualToString:pathExtension]) { - image = [imageDictionary objectForKey:pathExtension]; - if (image == nil) { - image = [[NSWorkspace sharedWorkspace] iconForFileType:pathExtension]; - [image setFlipped:NO]; - if (image == nil) - image = [NSNull null]; - [imageDictionary setObject:image forKey:pathExtension]; - } - } else { - image = [imageDictionary objectForKey:path]; - if (image == nil) { - image = [[NSWorkspace sharedWorkspace] iconForFile:path]; - [image setFlipped:NO]; - if (image == nil) - image = [NSNull null]; - [imageDictionary setObject:image forKey:path]; - } - } -#else - // .app is a valid path extension to pass here, but we must not cache the icon based on that extension! - if(![pathExtension isEqualToString:@""] && ![@"app" isEqualToString:pathExtension]) { - image = [imageDictionary objectForKey:pathExtension]; - if (image == nil) { - IconFamily *iconFamily = [[IconFamily alloc] initWithIconOfFile:path]; - image = [iconFamily imageWithAllReps]; - [image setFlipped:NO]; - if (image == nil) - image = [NSNull null]; - [imageDictionary setObject:image forKey:pathExtension]; - [iconFamily release]; - } - } else { - image = [imageDictionary objectForKey:path]; - if (image == nil) { - IconFamily *iconFamily = [[IconFamily alloc] initWithIconOfFile:path]; - image = [iconFamily imageWithAllReps]; - [image setFlipped:NO]; - if (image == nil) - image = [NSNull null]; - [imageDictionary setObject:image forKey:path]; - [iconFamily release]; - } - } -#endif - return image != [NSNull null] ? image : nil; -} - static NSImage *createPaperclipImageWithColor(NSColor *color) { NSSize size = NSMakeSize(32.0, 32.0); NSImage *image = [[NSImage alloc] initWithSize:size]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 00:49:13
|
Revision: 275 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=275&view=rev Author: amaxwell Date: 2008-02-03 16:49:17 -0800 (Sun, 03 Feb 2008) Log Message: ----------- Remove some images and use Apple supplied templates. Not fully correct yet. Modified Paths: -------------- trunk/bibdesk/BDSKEditor.m trunk/bibdesk/BDSKEditorTextFieldCell.m trunk/bibdesk/BDSKMainTableView.m trunk/bibdesk/BDSKTextImportController.m trunk/bibdesk/BibDocument.m trunk/bibdesk/BibDocument_DataSource.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib trunk/bibdesk/English.lproj/BDSKEditor.nib/keyedobjects.nib trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib trunk/bibdesk/English.lproj/BibDocument.nib/info.nib trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib Removed Paths: ------------- trunk/bibdesk/Images/Add.tiff trunk/bibdesk/Images/Add_Pressed.tiff trunk/bibdesk/Images/Add_Small.tiff trunk/bibdesk/Images/ArrowImage.tiff trunk/bibdesk/Images/ArrowImage_Pressed.tiff trunk/bibdesk/Images/GroupAdd.tiff trunk/bibdesk/Images/GroupAddSmart.tiff trunk/bibdesk/Images/GroupAddSmart_Pressed.tiff trunk/bibdesk/Images/GroupAdd_Pressed.tiff Modified: trunk/bibdesk/BDSKEditor.m =================================================================== --- trunk/bibdesk/BDSKEditor.m 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/BDSKEditor.m 2008-02-04 00:49:17 UTC (rev 275) @@ -3316,7 +3316,6 @@ } - (void)setupActionButton { - [actionButton setAlternateImage:[NSImage imageNamed:@"GroupAction_Pressed"]]; [actionButton setArrowImage:nil]; [actionButton setShowsMenuWhenIconClicked:YES]; [[actionButton cell] setAltersStateOfSelectedItem:NO]; Modified: trunk/bibdesk/BDSKEditorTextFieldCell.m =================================================================== --- trunk/bibdesk/BDSKEditorTextFieldCell.m 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/BDSKEditorTextFieldCell.m 2008-02-04 00:49:17 UTC (rev 275) @@ -48,16 +48,11 @@ [self setBezeled:YES]; [self setDrawsBackground:YES]; [self setHasButton:NO]; - NSImage *arrowImage = [NSImage imageNamed:NSImageNameFollowLinkFreestandingTemplate]; - if (arrowImage) { - arrowImage = [[arrowImage copy] autorelease]; - [arrowImage setScalesWhenResized:YES]; - [arrowImage setSize:NSMakeSize(12, 12)]; - buttonCell = [[NSButtonCell alloc] initImageCell:arrowImage]; - } else { - buttonCell = [[NSButtonCell alloc] initImageCell:[NSImage imageNamed:@"ArrowImage"]]; - [buttonCell setAlternateImage:[NSImage imageNamed:@"ArrowImage_Pressed"]]; - } + NSImage *arrowImage = [[[NSImage imageNamed:NSImageNameFollowLinkFreestandingTemplate] copy] autorelease]; + [arrowImage setScalesWhenResized:YES]; + [arrowImage setSize:NSMakeSize(12, 12)]; + buttonCell = [[NSButtonCell alloc] initImageCell:arrowImage]; + [buttonCell setButtonType:NSMomentaryChangeButton]; [buttonCell setBordered:NO]; [buttonCell setImagePosition:NSImageOnly]; Modified: trunk/bibdesk/BDSKMainTableView.m =================================================================== --- trunk/bibdesk/BDSKMainTableView.m 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/BDSKMainTableView.m 2008-02-04 00:49:17 UTC (rev 275) @@ -343,18 +343,6 @@ [levelCell setMaxHeight:(17.0 * 0.7)]; [tc setDataCell:levelCell]; [levelCell release]; - }else if ([colName isEqualToString:BDSKCrossrefString]) { - NSButtonCell *crossrefButtonCell = [[[NSButtonCell alloc] initTextCell:@""] autorelease]; - [crossrefButtonCell setButtonType:NSMomentaryChangeButton]; - [crossrefButtonCell setBordered:NO]; - [crossrefButtonCell setImagePosition:NSImageOnly]; - [crossrefButtonCell setControlSize:NSSmallControlSize]; - [crossrefButtonCell setImage:[NSImage imageNamed:@"ArrowImage"]]; - [crossrefButtonCell setAlternateImage:[NSImage imageNamed:@"ArrowImage_Pressed"]]; - [crossrefButtonCell setAction:@selector(openParentItem:)]; - [crossrefButtonCell setTarget:self]; - [tc setDataCell:crossrefButtonCell]; - [tc setWidth:[crossrefButtonCell cellSize].width]; }else{ // this is our default cell; need to explicitly set if changing column type from e.g. image->text NSTextFieldCell *textFieldCell = [[[NSTextFieldCell alloc] initTextCell:@""] autorelease]; @@ -500,7 +488,7 @@ NSImage *paperclip = [[[NSImage paperclipImage] copy] autorelease]; [paperclip setScalesWhenResized:YES]; [paperclip setSize:NSMakeSize(16, 16)]; - NSMutableDictionary *tmpDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:[NSImage imageNamed:@"TinyFile"], BDSKLocalUrlString, paperclip, BDSKLocalFileString, [NSImage imageNamed:@"ArrowImage"], BDSKCrossrefString, nil]; + NSMutableDictionary *tmpDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:[NSImage imageNamed:@"TinyFile"], BDSKLocalUrlString, paperclip, BDSKLocalFileString, nil]; if (paths) { NSEnumerator *keyEnum = [paths keyEnumerator]; NSString *key, *path; @@ -552,7 +540,7 @@ - (void)columnsMenuAddTableColumn:(id)sender{ // first we fill the popup BDSKTypeManager *typeMan = [BDSKTypeManager sharedManager]; - NSArray *colNames = [typeMan allFieldNamesIncluding:[NSArray arrayWithObjects:BDSKPubTypeString, BDSKCiteKeyString, BDSKPubDateString, BDSKDateAddedString, BDSKDateModifiedString, BDSKFirstAuthorString, BDSKSecondAuthorString, BDSKThirdAuthorString, BDSKLastAuthorString, BDSKFirstAuthorEditorString, BDSKSecondAuthorEditorString, BDSKThirdAuthorEditorString, BDSKAuthorEditorString, BDSKLastAuthorEditorString, BDSKItemNumberString, BDSKContainerString, BDSKCrossrefString, BDSKLocalFileString, BDSKRemoteURLString, nil] + NSArray *colNames = [typeMan allFieldNamesIncluding:[NSArray arrayWithObjects:BDSKPubTypeString, BDSKCiteKeyString, BDSKPubDateString, BDSKDateAddedString, BDSKDateModifiedString, BDSKFirstAuthorString, BDSKSecondAuthorString, BDSKThirdAuthorString, BDSKLastAuthorString, BDSKFirstAuthorEditorString, BDSKSecondAuthorEditorString, BDSKThirdAuthorEditorString, BDSKAuthorEditorString, BDSKLastAuthorEditorString, BDSKItemNumberString, BDSKContainerString, BDSKLocalFileString, BDSKRemoteURLString, nil] excluding:[self tableColumnIdentifiers]]; BDSKAddFieldSheetController *addFieldController = [[BDSKAddFieldSheetController alloc] initWithPrompt:NSLocalizedString(@"Name of column to add:", @"Label for adding column") Modified: trunk/bibdesk/BDSKTextImportController.m =================================================================== --- trunk/bibdesk/BDSKTextImportController.m 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/BDSKTextImportController.m 2008-02-04 00:49:17 UTC (rev 275) @@ -177,7 +177,6 @@ [self setWindowFrameAutosaveName:@"BDSKTextImportController Frame Autosave Name"]; // Set the properties of actionMenuButton that cannot be set in IB - [actionMenuButton setAlternateImage:[NSImage imageNamed:@"Action_Pressed"]]; [actionMenuButton setArrowImage:nil]; [actionMenuButton setShowsMenuWhenIconClicked:YES]; [[actionMenuButton cell] setAltersStateOfSelectedItem:NO]; Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/BibDocument.m 2008-02-04 00:49:17 UTC (rev 275) @@ -508,7 +508,6 @@ [[groupActionMenuButton cell] setRefreshesMenu:NO]; [groupActionButton setArrowImage:nil]; - [groupActionButton setAlternateImage:[NSImage imageNamed:@"GroupAction_Pressed"]]; [groupActionButton setShowsMenuWhenIconClicked:YES]; [[groupActionButton cell] setAltersStateOfSelectedItem:NO]; [[groupActionButton cell] setAlwaysUsesFirstItemAsSelected:NO]; @@ -2890,12 +2889,8 @@ unsigned int modifierFlags = [NSApp currentModifierFlags]; if (modifierFlags & NSAlternateKeyMask) { - [groupAddButton setImage:[NSImage imageNamed:@"GroupAddSmart"]]; - [groupAddButton setAlternateImage:[NSImage imageNamed:@"GroupAddSmart_Pressed"]]; [groupAddButton setToolTip:NSLocalizedString(@"Add new smart group.", @"Tool tip message")]; } else { - [groupAddButton setImage:[NSImage imageNamed:@"GroupAdd"]]; - [groupAddButton setAlternateImage:[NSImage imageNamed:@"GroupAdd_Pressed"]]; [groupAddButton setToolTip:NSLocalizedString(@"Add new group.", @"Tool tip message")]; } } Modified: trunk/bibdesk/BibDocument_DataSource.m =================================================================== --- trunk/bibdesk/BibDocument_DataSource.m 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/BibDocument_DataSource.m 2008-02-04 00:49:17 UTC (rev 275) @@ -207,16 +207,6 @@ if([aCell isKindOfClass:[NSButtonCell class]]){ if ([[aTableColumn identifier] isEqualToString:BDSKImportOrderString]) { [aCell setEnabled:[[shownPublications objectAtIndex:row] isImported] == NO]; - } else if ([[aTableColumn identifier] isEqualToString:BDSKCrossrefString]) { - if ([[shownPublications objectAtIndex:row] crossrefParent]) { - [aCell setEnabled:YES]; - [aCell setImage:[NSImage imageNamed:@"ArrowImage"]]; - [aCell setAlternateImage:[NSImage imageNamed:@"ArrowImage_Pressed"]]; - } else { - [aCell setEnabled:YES]; - [aCell setImage:nil]; - [aCell setAlternateImage:nil]; - } } else { [aCell setEnabled:[self hasExternalGroupsSelected] == NO]; } Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 00:49:17 UTC (rev 275) @@ -220,11 +220,7 @@ CE7A4A8F0B0B475B00D1B333 /* BDSKCustomCiteDrawerController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE7A4A8D0B0B475B00D1B333 /* BDSKCustomCiteDrawerController.m */; }; CE7A4AA50B0B480100D1B333 /* BDSKCustomCiteDrawer.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE7A4AA40B0B480100D1B333 /* BDSKCustomCiteDrawer.nib */; }; CE7E1BB50A0B8EE7009D04C3 /* GroupAction.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7E1BB30A0B8EE7009D04C3 /* GroupAction.tiff */; }; - CE7E1BB60A0B8EE7009D04C3 /* GroupAdd.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7E1BB40A0B8EE7009D04C3 /* GroupAdd.tiff */; }; CE7E1C3A0A0B9E94009D04C3 /* GroupAction_Pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7E1C380A0B9E94009D04C3 /* GroupAction_Pressed.tiff */; }; - CE7E1C3B0A0B9E94009D04C3 /* GroupAdd_Pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7E1C390A0B9E94009D04C3 /* GroupAdd_Pressed.tiff */; }; - CE7E207E0A0BF833009D04C3 /* GroupAddSmart_Pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7E207C0A0BF833009D04C3 /* GroupAddSmart_Pressed.tiff */; }; - CE7E207F0A0BF833009D04C3 /* GroupAddSmart.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7E207D0A0BF833009D04C3 /* GroupAddSmart.tiff */; }; CE7EA95D0AAC55B2000FE8FD /* NSWindowController_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE7EA95B0AAC55B2000FE8FD /* NSWindowController_BDSKExtensions.m */; }; CE7F5E480B3F5F1800A919D0 /* searchFolderIcon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7F5E470B3F5F1800A919D0 /* searchFolderIcon.tiff */; }; CE7F64C40B41694A00A919D0 /* BDSKSearchGroupView.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE7F64C20B41694A00A919D0 /* BDSKSearchGroupView.nib */; }; @@ -346,8 +342,6 @@ F9022D270758066000C3F701 /* TypeInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = F9022D1B0758066000C3F701 /* TypeInfo.plist */; }; F9022DBD0758088000C3F701 /* Action_Pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DA20758088000C3F701 /* Action_Pressed.tiff */; }; F9022DBE0758088000C3F701 /* Action.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DA30758088000C3F701 /* Action.tiff */; }; - F9022DBF0758088000C3F701 /* Add_Pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DA40758088000C3F701 /* Add_Pressed.tiff */; }; - F9022DC00758088000C3F701 /* Add.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DA50758088000C3F701 /* Add.tiff */; }; F9022DC20758088000C3F701 /* autofile.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DA70758088000C3F701 /* autofile.tiff */; }; F9022DC30758088000C3F701 /* bibDocIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = F9022DA80758088000C3F701 /* bibDocIcon.icns */; }; F9022DC40758088000C3F701 /* citation.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DA90758088000C3F701 /* citation.tiff */; }; @@ -487,14 +481,12 @@ F9BE68350B80F92900B2597C /* FileMatcherConfigSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = F9BE68330B80F92800B2597C /* FileMatcherConfigSheet.nib */; }; F9BE68380B80F94000B2597C /* BDSKFileMatchConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = F9BE68360B80F94000B2597C /* BDSKFileMatchConfigController.m */; }; F9BF481F0BD69F700071094F /* MODS2MARC21slim.xsl in Resources */ = {isa = PBXBuildFile; fileRef = F9BF481E0BD69F6F0071094F /* MODS2MARC21slim.xsl */; }; - F9CE58EC0842411D0072DF55 /* ArrowImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9CE58EB0842411D0072DF55 /* ArrowImage.tiff */; }; F9CEFCBC0A90090B00A0E54E /* BDSKOrphanedFileServer.m in Sources */ = {isa = PBXBuildFile; fileRef = F9CEFCBA0A90090B00A0E54E /* BDSKOrphanedFileServer.m */; }; F9D0E5370BF92768001C6C22 /* BDSKMODSParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F9D0E5350BF92768001C6C22 /* BDSKMODSParser.m */; }; F9DB895D08A54BBA00CB3D53 /* BDSKTeXTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F9DB895B08A54BBA00CB3D53 /* BDSKTeXTask.m */; }; F9DCEA50094B7D1100AEE662 /* BDSKTextWithIconCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F9DCEA4E094B7D1100AEE662 /* BDSKTextWithIconCell.m */; }; F9DE8DFB087F74D3006F0427 /* BibImporter.mdimporter in CopyFiles */ = {isa = PBXBuildFile; fileRef = F95CC113087F54BF002C5694 /* BibImporter.mdimporter */; }; F9DE8E56087F81A4006F0427 /* cacheDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = F9DE8E55087F81A4006F0427 /* cacheDoc.icns */; }; - F9DE8E9808801F13006F0427 /* ArrowImage_Pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9DE8E9708801F13006F0427 /* ArrowImage_Pressed.tiff */; }; F9DF3BC209B7605E00342ADE /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9DF3BC109B7605E00342ADE /* SystemConfiguration.framework */; }; F9E069B70981A03B00AEFBE7 /* BDSKWebOfScienceParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F9E069B50981A03B00AEFBE7 /* BDSKWebOfScienceParser.m */; }; F9E07C8509202309007BCDD4 /* BibDocument_Groups.m in Sources */ = {isa = PBXBuildFile; fileRef = F9E07C8309202309007BCDD4 /* BibDocument_Groups.m */; }; @@ -1062,11 +1054,7 @@ CE7A4A8D0B0B475B00D1B333 /* BDSKCustomCiteDrawerController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKCustomCiteDrawerController.m; sourceTree = "<group>"; }; CE7A4A900B0B476400D1B333 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BDSKCustomCiteDrawer.nib; sourceTree = "<group>"; }; CE7E1BB30A0B8EE7009D04C3 /* GroupAction.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GroupAction.tiff; path = Images/GroupAction.tiff; sourceTree = "<group>"; }; - CE7E1BB40A0B8EE7009D04C3 /* GroupAdd.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GroupAdd.tiff; path = Images/GroupAdd.tiff; sourceTree = "<group>"; }; CE7E1C380A0B9E94009D04C3 /* GroupAction_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GroupAction_Pressed.tiff; path = Images/GroupAction_Pressed.tiff; sourceTree = "<group>"; }; - CE7E1C390A0B9E94009D04C3 /* GroupAdd_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GroupAdd_Pressed.tiff; path = Images/GroupAdd_Pressed.tiff; sourceTree = "<group>"; }; - CE7E207C0A0BF833009D04C3 /* GroupAddSmart_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GroupAddSmart_Pressed.tiff; path = Images/GroupAddSmart_Pressed.tiff; sourceTree = "<group>"; }; - CE7E207D0A0BF833009D04C3 /* GroupAddSmart.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GroupAddSmart.tiff; path = Images/GroupAddSmart.tiff; sourceTree = "<group>"; }; CE7E29D60A0E84AA009D04C3 /* CIImage_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CIImage_BDSKExtensions.h; sourceTree = "<group>"; }; CE7E29D70A0E84AB009D04C3 /* CIImage_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CIImage_BDSKExtensions.m; sourceTree = "<group>"; }; CE7EA95A0AAC55B2000FE8FD /* NSWindowController_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSWindowController_BDSKExtensions.h; sourceTree = "<group>"; }; @@ -1278,8 +1266,6 @@ F9022D1B0758066000C3F701 /* TypeInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = TypeInfo.plist; sourceTree = "<group>"; }; F9022DA20758088000C3F701 /* Action_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Action_Pressed.tiff; path = Images/Action_Pressed.tiff; sourceTree = "<group>"; }; F9022DA30758088000C3F701 /* Action.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Action.tiff; path = Images/Action.tiff; sourceTree = "<group>"; }; - F9022DA40758088000C3F701 /* Add_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Add_Pressed.tiff; path = Images/Add_Pressed.tiff; sourceTree = "<group>"; }; - F9022DA50758088000C3F701 /* Add.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Add.tiff; path = Images/Add.tiff; sourceTree = "<group>"; }; F9022DA70758088000C3F701 /* autofile.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = autofile.tiff; path = Images/autofile.tiff; sourceTree = "<group>"; }; F9022DA80758088000C3F701 /* bibDocIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = bibDocIcon.icns; path = Images/bibDocIcon.icns; sourceTree = "<group>"; }; F9022DA90758088000C3F701 /* citation.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = citation.tiff; path = Images/citation.tiff; sourceTree = "<group>"; }; @@ -1553,7 +1539,6 @@ F9C7D4090BE9285500D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = French; path = French.lproj/Credits.rtf; sourceTree = SOURCE_ROOT; }; F9C7D40A0BE9285500D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = French; path = French.lproj/ReadMe.rtf; sourceTree = "<group>"; }; F9C7D4310BE93D7D00D65C7F /* French */ = {isa = PBXFileReference; lastKnownFileType = folder; name = French; path = "French.lproj/BibDesk Help"; sourceTree = "<group>"; }; - F9CE58EB0842411D0072DF55 /* ArrowImage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ArrowImage.tiff; path = Images/ArrowImage.tiff; sourceTree = "<group>"; }; F9CEFCB90A90090B00A0E54E /* BDSKOrphanedFileServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKOrphanedFileServer.h; sourceTree = "<group>"; }; F9CEFCBA0A90090B00A0E54E /* BDSKOrphanedFileServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKOrphanedFileServer.m; sourceTree = "<group>"; }; F9D0E5340BF92768001C6C22 /* BDSKMODSParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKMODSParser.h; sourceTree = "<group>"; }; @@ -1565,7 +1550,6 @@ F9DCEA4D094B7D1100AEE662 /* BDSKTextWithIconCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKTextWithIconCell.h; sourceTree = "<group>"; }; F9DCEA4E094B7D1100AEE662 /* BDSKTextWithIconCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKTextWithIconCell.m; sourceTree = "<group>"; }; F9DE8E55087F81A4006F0427 /* cacheDoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = cacheDoc.icns; path = Images/cacheDoc.icns; sourceTree = "<group>"; }; - F9DE8E9708801F13006F0427 /* ArrowImage_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ArrowImage_Pressed.tiff; path = Images/ArrowImage_Pressed.tiff; sourceTree = "<group>"; }; F9DF3BC109B7605E00342ADE /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; }; F9E069B40981A03B00AEFBE7 /* BDSKWebOfScienceParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKWebOfScienceParser.h; sourceTree = "<group>"; }; F9E069B50981A03B00AEFBE7 /* BDSKWebOfScienceParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKWebOfScienceParser.m; sourceTree = "<group>"; }; @@ -2235,15 +2219,9 @@ CE2A198D0CE499AD00A0499B /* SmallMenu.tiff */, CE2A195D0CE4969800A0499B /* NewFolder.tiff */, CE2A195E0CE4969800A0499B /* NewSeparator.tiff */, - CE7E207C0A0BF833009D04C3 /* GroupAddSmart_Pressed.tiff */, - CE7E207D0A0BF833009D04C3 /* GroupAddSmart.tiff */, F9022DA20758088000C3F701 /* Action_Pressed.tiff */, F9022DA30758088000C3F701 /* Action.tiff */, - F9022DA40758088000C3F701 /* Add_Pressed.tiff */, - F9022DA50758088000C3F701 /* Add.tiff */, CE023F5C0CC50F86003F52E5 /* Add_Small.tiff */, - F9CE58EB0842411D0072DF55 /* ArrowImage.tiff */, - F9DE8E9708801F13006F0427 /* ArrowImage_Pressed.tiff */, F9022DA70758088000C3F701 /* autofile.tiff */, 3DFF355E0816B5460052F37C /* back_small.tiff */, F9022DA80758088000C3F701 /* bibDocIcon.icns */, @@ -2272,8 +2250,6 @@ F97BEBB4090886E50063504B /* genericFolderIcon.tiff */, CE7E1BB30A0B8EE7009D04C3 /* GroupAction.tiff */, CE7E1C380A0B9E94009D04C3 /* GroupAction_Pressed.tiff */, - CE7E1BB40A0B8EE7009D04C3 /* GroupAdd.tiff */, - CE7E1C390A0B9E94009D04C3 /* GroupAdd_Pressed.tiff */, CE2C18910A0A43BE006F0A73 /* importFolderIcon.tiff */, F9022DB10758088000C3F701 /* key.tiff */, F9FF241209E873A300BB1706 /* networkIcon.tiff */, @@ -3147,8 +3123,6 @@ F92BACF50BCC0140008D5BC3 /* SkimNotesAgent in Resources */, F9022DBD0758088000C3F701 /* Action_Pressed.tiff in Resources */, F9022DBE0758088000C3F701 /* Action.tiff in Resources */, - F9022DBF0758088000C3F701 /* Add_Pressed.tiff in Resources */, - F9022DC00758088000C3F701 /* Add.tiff in Resources */, F9022DC20758088000C3F701 /* autofile.tiff in Resources */, F9022DC30758088000C3F701 /* bibDocIcon.icns in Resources */, F9022DC40758088000C3F701 /* citation.tiff in Resources */, @@ -3181,10 +3155,8 @@ 3DFF355F0816B5460052F37C /* back_small.tiff in Resources */, 3DFF35610816B55B0052F37C /* forward_small.tiff in Resources */, 3DFF35630816B5780052F37C /* reload_small.tiff in Resources */, - F9CE58EC0842411D0072DF55 /* ArrowImage.tiff in Resources */, 3D7C78E2084F4A3A0026D861 /* crossref.tiff in Resources */, F9DE8E56087F81A4006F0427 /* cacheDoc.icns in Resources */, - F9DE8E9808801F13006F0427 /* ArrowImage_Pressed.tiff in Resources */, F938408A0906DD1F00FC37F2 /* scripthook.tiff in Resources */, F97BEBB5090886E50063504B /* genericFolderIcon.tiff in Resources */, F97BF344090B19520063504B /* smartFolderIcon.tiff in Resources */, @@ -3197,11 +3169,7 @@ CE2C16F90A0A149E006F0A73 /* gear2.tiff in Resources */, CE2C18920A0A43BE006F0A73 /* importFolderIcon.tiff in Resources */, CE7E1BB50A0B8EE7009D04C3 /* GroupAction.tiff in Resources */, - CE7E1BB60A0B8EE7009D04C3 /* GroupAdd.tiff in Resources */, CE7E1C3A0A0B9E94009D04C3 /* GroupAction_Pressed.tiff in Resources */, - CE7E1C3B0A0B9E94009D04C3 /* GroupAdd_Pressed.tiff in Resources */, - CE7E207E0A0BF833009D04C3 /* GroupAddSmart_Pressed.tiff in Resources */, - CE7E207F0A0BF833009D04C3 /* GroupAddSmart.tiff in Resources */, F963E4500A1D81B000695DDC /* exportPrefs.tiff in Resources */, CE11A6350AE6BB77008C47AC /* urlFolderIcon.tiff in Resources */, CE11B0060AE8FD53008C47AC /* scriptFolderIcon.tiff in Resources */, Modified: trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib =================================================================== --- trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/English.lproj/BDSKEditor.nib/classes.nib 2008-02-04 00:49:17 UTC (rev 275) @@ -1,126 +1,378 @@ -{ - IBClasses = ( - { - CLASS = BDSKContainerView; - LANGUAGE = ObjC; - OUTLETS = {contentView = id; }; - SUPERCLASS = NSView; - }, - {CLASS = BDSKDragWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, - {CLASS = BDSKEdgeView; LANGUAGE = ObjC; SUPERCLASS = BDSKContainerView; }, - { - ACTIONS = { - addLinkedFileFromMenuItem = id; - addRemoteURLFromMenuItem = id; - bibTypeDidChange = id; - changeFlag = id; - changeRating = id; - chooseLocalFile = id; - chooseRemoteURL = id; - consolidateLinkedFiles = id; - copyNotesForLinkedFile = id; - createNewPubUsingCrossrefAction = id; - dismissChooseURLSheet = id; - duplicateTitleToBooktitle = id; - editSelectedFieldAsRawBibTeX = id; - generateCiteKey = id; - openLinkedFile = id; - openLinkedURL = id; - openParentItemAction = id; - raiseAddField = id; - raiseChangeFieldName = id; - raiseDelField = id; - revealLinkedFile = id; - selectCrossrefParentAction = id; - showCiteKeyWarning = id; - showNotesForLinkedFile = id; - showPersonDetailCmd = id; - toggleStatusBar = id; - trashLocalFile = id; - }; - CLASS = BDSKEditor; - LANGUAGE = ObjC; - OUTLETS = { - abstractView = NSTextView; - actionButton = BDSKImagePopUpButton; - actionMenu = NSMenu; - addFieldButton = NSButton; - authorTableView = NSTableView; - bibTypeButton = NSPopUpButton; - chooseURLField = NSTextField; - chooseURLSheet = NSWindow; - citeKeyField = NSTextField; - citeKeyTitle = NSTextField; - citeKeyWarningButton = NSButton; - fileSplitView = BDSKSplitView; - fileView = FileView; - mainSplitView = BDSKSplitView; - matrix = NSMatrix; - notesView = NSTextView; - rssDescriptionView = NSTextView; - statusBar = BDSKStatusBar; - tabView = NSTabView; - tableView = BDSKEditorTableView; - }; - SUPERCLASS = NSWindowController; - }, - {CLASS = BDSKEditorTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, - { - CLASS = BDSKEditorTextFieldCell; - LANGUAGE = ObjC; - OUTLETS = {buttonTarget = id; }; - SUPERCLASS = NSTextFieldCell; - }, - {CLASS = BDSKEditorTextView; LANGUAGE = ObjC; SUPERCLASS = NSTextView; }, - {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - { - CLASS = BDSKImagePopUpButton; - LANGUAGE = ObjC; - OUTLETS = {delegate = id; }; - SUPERCLASS = NSPopUpButton; - }, - { - CLASS = BDSKLabelTextFieldCell; - LANGUAGE = ObjC; - SUPERCLASS = NSTextFieldCell; - }, - {CLASS = BDSKSplitView; LANGUAGE = ObjC; SUPERCLASS = OASplitView; }, - { - ACTIONS = {startAnimation = id; stopAnimation = id; }; - CLASS = BDSKStatusBar; - LANGUAGE = ObjC; - OUTLETS = {delegate = id; textCell = id; }; - SUPERCLASS = BDSKGradientView; - }, - {CLASS = BDSKTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, - { - ACTIONS = {delete = id; selectNextIcon = id; selectPreviousIcon = id; }; - CLASS = FileView; - LANGUAGE = ObjC; - OUTLETS = {dataSource = id; delegate = id; dragDataSource = id; }; - SUPERCLASS = NSView; - }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = NSControl; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = NSMenu; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = NSMenuItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = NSObject; LANGUAGE = ObjC; }, - {CLASS = NSScrollView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - { - ACTIONS = {changeFont = id; invertSelection = id; }; - CLASS = NSTableView; - LANGUAGE = ObjC; - SUPERCLASS = NSControl; - }, - {CLASS = NSTextView; LANGUAGE = ObjC; SUPERCLASS = NSText; }, - {CLASS = NSWindow; LANGUAGE = ObjC; SUPERCLASS = NSResponder; }, - { - ACTIONS = {hideWindow = id; toggleShowingWindow = id; }; - CLASS = NSWindowController; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - }, - {CLASS = OASplitView; LANGUAGE = ObjC; SUPERCLASS = NSSplitView; } - ); - IBVersion = 1; -} \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBClasses</key> + <array> + <dict> + <key>CLASS</key> + <string>BDSKGradientView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKDragWindow</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSWindow</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSMenu</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSControl</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>hideWindow</key> + <string>id</string> + <key>toggleShowingWindow</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSWindowController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>delete</key> + <string>id</string> + <key>selectNextIcon</key> + <string>id</string> + <key>selectPreviousIcon</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>FileView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>dataSource</key> + <string>id</string> + <key>delegate</key> + <string>id</string> + <key>dragDataSource</key> + <string>id</string> + </dict> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSObject</string> + <key>LANGUAGE</key> + <string>ObjC</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKEdgeView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>BDSKContainerView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKTabView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSTabView</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSWindow</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>addLinkedFileFromMenuItem</key> + <string>NSMenuItem</string> + <key>addRemoteURLFromMenuItem</key> + <string>NSMenuItem</string> + <key>bibTypeDidChange</key> + <string>id</string> + <key>changeFlag</key> + <string>id</string> + <key>changeRating</key> + <string>id</string> + <key>chooseLocalFile</key> + <string>id</string> + <key>chooseRemoteURL</key> + <string>id</string> + <key>consolidateLinkedFiles</key> + <string>id</string> + <key>copyNotesForLinkedFile</key> + <string>id</string> + <key>createNewPubUsingCrossrefAction</key> + <string>id</string> + <key>dismissChooseURLSheet</key> + <string>id</string> + <key>downloadRemoteURL</key> + <string>NSMenuItem</string> + <key>duplicateTitleToBooktitle</key> + <string>id</string> + <key>editSelectedFieldAsRawBibTeX</key> + <string>id</string> + <key>generateCiteKey</key> + <string>id</string> + <key>openLinkedFile</key> + <string>id</string> + <key>openLinkedURL</key> + <string>id</string> + <key>openParentItemAction</key> + <string>id</string> + <key>previewAction</key> + <string>id</string> + <key>raiseAddField</key> + <string>id</string> + <key>raiseChangeFieldName</key> + <string>id</string> + <key>raiseDelField</key> + <string>id</string> + <key>revealLinkedFile</key> + <string>id</string> + <key>selectCrossrefParentAction</key> + <string>id</string> + <key>showCiteKeyWarning</key> + <string>id</string> + <key>showNotesForLinkedFile</key> + <string>id</string> + <key>showPersonDetail</key> + <string>id</string> + <key>showPersonDetailCmd</key> + <string>id</string> + <key>toggleStatusBar</key> + <string>id</string> + <key>trashLinkedFiles</key> + <string>id</string> + <key>trashLocalFile</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>BDSKEditor</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>abstractView</key> + <string>NSTextView</string> + <key>actionButton</key> + <string>BDSKImagePopUpButton</string> + <key>actionMenu</key> + <string>NSMenu</string> + <key>addFieldButton</key> + <string>NSButton</string> + <key>authorTableView</key> + <string>NSTableView</string> + <key>bibTypeButton</key> + <string>NSPopUpButton</string> + <key>chooseURLField</key> + <string>NSTextField</string> + <key>chooseURLSheet</key> + <string>NSWindow</string> + <key>citeKeyField</key> + <string>NSTextField</string> + <key>citeKeyTitle</key> + <string>NSTextField</string> + <key>citeKeyWarningButton</key> + <string>NSButton</string> + <key>fileSplitView</key> + <string>BDSKSplitView</string> + <key>fileView</key> + <string>FileView</string> + <key>mainSplitView</key> + <string>BDSKSplitView</string> + <key>matrix</key> + <string>NSMatrix</string> + <key>notesView</key> + <string>NSTextView</string> + <key>rssDescriptionView</key> + <string>NSTextView</string> + <key>statusBar</key> + <string>BDSKStatusBar</string> + <key>tabView</key> + <string>NSTabView</string> + <key>tableView</key> + <string>BDSKEditorTableView</string> + </dict> + <key>SUPERCLASS</key> + <string>NSWindowController</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSScrollView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSMenuItem</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKEditorTableView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSTableView</string> + </dict> + <dict> + <key>CLASS</key> + <string>OASplitView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSSplitView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKSplitView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>OASplitView</string> + </dict> + <dict> + <key>CLASS</key> + <string>FirstResponder</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKLabelTextFieldCell</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSTextFieldCell</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKEditorTextView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSTextView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKImagePopUpButton</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>delegate</key> + <string>id</string> + </dict> + <key>SUPERCLASS</key> + <string>NSPopUpButton</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSTextView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSText</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKContainerView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>contentView</key> + <string>id</string> + </dict> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>startAnimation</key> + <string>id</string> + <key>stopAnimation</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>BDSKStatusBar</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>delegate</key> + <string>id</string> + <key>textCell</key> + <string>id</string> + </dict> + <key>SUPERCLASS</key> + <string>BDSKGradientView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKEditorTextFieldCell</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>buttonTarget</key> + <string>id</string> + </dict> + <key>SUPERCLASS</key> + <string>NSTextFieldCell</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>changeFont</key> + <string>id</string> + <key>invertSelection</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSTableView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSControl</string> + </dict> + </array> + <key>IBVersion</key> + <string>1</string> +</dict> +</plist> Modified: trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib =================================================================== --- trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/English.lproj/BDSKEditor.nib/info.nib 2008-02-04 00:49:17 UTC (rev 275) @@ -1,30 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>IBDocumentLocation</key> - <string>70 102 356 240 0 0 1440 938 </string> - <key>IBEditorPositions</key> - <dict> - <key>726</key> - <string>70 347 256 237 0 0 1440 938 </string> - <key>805</key> - <string>460 430 520 422 0 0 1440 938 </string> - </dict> <key>IBFramework Version</key> - <string>489.0</string> + <string>629</string> <key>IBLastKnownRelativeProjectPath</key> <string>../../Bibdesk.xcodeproj</string> <key>IBOldestOS</key> <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>726</integer> - <integer>74</integer> - <integer>805</integer> + <integer>587</integer> </array> <key>IBSystem Version</key> - <string>8S165</string> + <string>9C27</string> <key>targetFramework</key> <string>IBCocoaFramework</string> </dict> Modified: trunk/bibdesk/English.lproj/BDSKEditor.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib =================================================================== --- trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib 2008-02-04 00:49:17 UTC (rev 275) @@ -39,6 +39,8 @@ <string>id</string> <key>changePreviewDisplay</key> <string>id</string> + <key>changePreviewTemplate</key> + <string>id</string> <key>changeSearchType</key> <string>id</string> <key>consolidateLinkedFiles</key> @@ -268,11 +270,11 @@ </dict> <dict> <key>CLASS</key> - <string>BDSKEncodingPopUpButton</string> + <string>NSMenu</string> <key>LANGUAGE</key> <string>ObjC</string> <key>SUPERCLASS</key> - <string>NSPopUpButton</string> + <string>NSObject</string> </dict> <dict> <key>CLASS</key> @@ -284,11 +286,11 @@ </dict> <dict> <key>CLASS</key> - <string>NSMenu</string> + <string>BDSKEncodingPopUpButton</string> <key>LANGUAGE</key> <string>ObjC</string> <key>SUPERCLASS</key> - <string>NSObject</string> + <string>NSPopUpButton</string> </dict> <dict> <key>ACTIONS</key> @@ -372,19 +374,19 @@ </dict> <dict> <key>CLASS</key> - <string>BDSKSplitView</string> + <string>OASplitView</string> <key>LANGUAGE</key> <string>ObjC</string> <key>SUPERCLASS</key> - <string>OASplitView</string> + <string>NSSplitView</string> </dict> <dict> <key>CLASS</key> - <string>OASplitView</string> + <string>BDSKSplitView</string> <key>LANGUAGE</key> <string>ObjC</string> <key>SUPERCLASS</key> - <string>NSSplitView</string> + <string>OASplitView</string> </dict> <dict> <key>ACTIONS</key> Modified: trunk/bibdesk/English.lproj/BibDocument.nib/info.nib =================================================================== --- trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2008-02-04 00:02:27 UTC (rev 274) +++ trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2008-02-04 00:49:17 UTC (rev 275) @@ -10,10 +10,10 @@ <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>819</integer> + <integer>101228</integer> </array> <key>IBSystem Version</key> - <string>9C7</string> + <string>9C27</string> <key>targetFramework</key> <string>IBCocoaFramework</string> </dict> Modified: trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/Add.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/Add_Pressed.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/Add_Small.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/ArrowImage.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/ArrowImage_Pressed.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/GroupAdd.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/GroupAddSmart.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/GroupAddSmart_Pressed.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/GroupAdd_Pressed.tiff =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 03:34:00
|
Revision: 276 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=276&view=rev Author: amaxwell Date: 2008-02-03 19:34:03 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove drag functionality partially fix drawing Modified Paths: -------------- trunk/bibdesk/BDSKImagePopUpButton.h trunk/bibdesk/BDSKImagePopUpButton.m trunk/bibdesk/BDSKImagePopUpButtonCell.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib Modified: trunk/bibdesk/BDSKImagePopUpButton.h =================================================================== --- trunk/bibdesk/BDSKImagePopUpButton.h 2008-02-04 00:49:17 UTC (rev 275) +++ trunk/bibdesk/BDSKImagePopUpButton.h 2008-02-04 03:34:03 UTC (rev 276) @@ -72,21 +72,8 @@ - (NSMenu *)menuForCell:(id)cell; -- (BOOL)startDraggingWithEvent:(NSEvent *)theEvent; - @end @interface NSObject (BDSKImagePopUpButtonDelegate) - (NSMenu *)menuForImagePopUpButton:(BDSKImagePopUpButton *)view; @end - -@interface NSObject (BDSKImagePopUpButtonDraggingDestination) -- (NSDragOperation)imagePopUpButton:(BDSKImagePopUpButton *)view canReceiveDrag:(id <NSDraggingInfo>)sender; -- (BOOL)imagePopUpButton:(BDSKImagePopUpButton *)view receiveDrag:(id <NSDraggingInfo>)sender; -@end - -@interface NSObject (BDSKImagePopUpButtonDraggingSource) -- (BOOL)imagePopUpButton:(BDSKImagePopUpButton *)view writeDataToPasteboard:(NSPasteboard *)pasteboard; -- (NSArray *)imagePopUpButton:(BDSKImagePopUpButton *)view namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination; -- (void)imagePopUpButton:(BDSKImagePopUpButton *)view cleanUpAfterDragOperation:(NSDragOperation)operation; -@end Modified: trunk/bibdesk/BDSKImagePopUpButton.m =================================================================== --- trunk/bibdesk/BDSKImagePopUpButton.m 2008-02-04 00:49:17 UTC (rev 275) +++ trunk/bibdesk/BDSKImagePopUpButton.m 2008-02-04 03:34:03 UTC (rev 276) @@ -196,97 +196,12 @@ } } -#pragma mark Dragging source - -- (unsigned int)draggingSourceOperationMaskForLocal:(BOOL)isLocal { - return (isLocal) ? NSDragOperationEvery : NSDragOperationCopy; -} - -- (BOOL)startDraggingWithEvent:(NSEvent *)theEvent { - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - - if ([delegate respondsToSelector:@selector(imagePopUpButton:writeDataToPasteboard:)] == NO || - [delegate imagePopUpButton:self writeDataToPasteboard:pboard] == NO) - return NO; - - NSImage *iconImage; - NSSize size = [[self cell] iconSize]; - NSImage *dragImage = [[[NSImage alloc] initWithSize:size] autorelease]; - NSPoint mouseLoc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - - mouseLoc.x -= 0.5f * size.width; - mouseLoc.y += 0.5f * size.height; - - if ([[self cell] usesItemFromMenu] == NO) { - iconImage = [self iconImage]; - } else { - iconImage = [[self selectedItem] image]; - } - NSSize srcSize = [iconImage size]; - [dragImage lockFocus]; - [iconImage drawInRect:NSMakeRect(0, 0, size.width, size.height) fromRect:NSMakeRect(0, 0, srcSize.width, srcSize.height) operation:NSCompositeCopy fraction:0.6]; - [dragImage unlockFocus]; - - [self dragImage:dragImage at:mouseLoc offset:NSZeroSize event:theEvent pasteboard:pboard source:self slideBack:YES]; - - return YES; -} - -- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination { - if ([delegate respondsToSelector:@selector(imagePopUpButton:namesOfPromisedFilesDroppedAtDestination:)]) - return [delegate imagePopUpButton:self namesOfPromisedFilesDroppedAtDestination:dropDestination]; - return nil; -} - -- (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation{ - if ([delegate respondsToSelector:@selector(imagePopUpButton:cleanUpAfterDragOperation:)]) - [delegate imagePopUpButton:self cleanUpAfterDragOperation:operation]; - // flag changes during a drag are not forwarded to the application, so we fix that at the end of the drag - [[NSNotificationCenter defaultCenter] postNotificationName:OAFlagsChangedNotification object:[NSApp currentEvent]]; -} - -#pragma mark Dragging destination - -- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender { - NSDragOperation dragOp = NSDragOperationNone; - if ([delegate respondsToSelector:@selector(imagePopUpButton:receiveDrag:)] && - [delegate respondsToSelector:@selector(imagePopUpButton:canReceiveDrag:)]) { - - dragOp = [delegate imagePopUpButton:self canReceiveDrag:sender]; - if (dragOp != NSDragOperationNone) { - highlight = YES; - [self setNeedsDisplay:YES]; - } - } - return dragOp; -} - -- (void)draggingExited:(id <NSDraggingInfo>)sender { - highlight = NO; - [self setNeedsDisplay:YES]; -} - -- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender { - highlight = NO; - [self setNeedsDisplay:YES]; - return YES; -} - -- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender { - if(delegate == nil) return NO; - - return [delegate imagePopUpButton:self receiveDrag:sender]; -} - #pragma mark Drawing and Highlighting -(void)drawRect:(NSRect)rect { [super drawRect:rect]; - if (highlight) { - [NSGraphicsContext saveGraphicsState]; [NSBezierPath drawHighlightInRect:[self bounds] radius:4.0 lineWidth:2.0 color:[NSColor alternateSelectedControlColor]]; - [NSGraphicsContext restoreGraphicsState]; } } Modified: trunk/bibdesk/BDSKImagePopUpButtonCell.m =================================================================== --- trunk/bibdesk/BDSKImagePopUpButtonCell.m 2008-02-04 00:49:17 UTC (rev 275) +++ trunk/bibdesk/BDSKImagePopUpButtonCell.m 2008-02-04 03:34:03 UTC (rev 276) @@ -318,16 +318,8 @@ } } else if([nextEvent type] == NSLeftMouseDragged) { - // test option key to see if we should drag-copy or show the menu, since the drag-to-copy behavior is inconsistent, particularly in BDSKEditor (see bug #1519481) shouldSendAction = NO; - if (([nextEvent modifierFlags] & NSAlternateKeyMask) > 0 && - [controlView respondsToSelector:@selector(startDraggingWithEvent:)]){ - if([(id)controlView startDraggingWithEvent:nextEvent] == NO) - [self showMenuInView:controlView withEvent:nextEvent]; - } else { - [self showMenuInView:controlView withEvent:nextEvent]; - } - + [self showMenuInView:controlView withEvent:nextEvent]; } else { // NSLog(@"periodic event %@", nextEvent); shouldSendAction = NO; @@ -380,6 +372,8 @@ return size; } +- (BOOL)isOpaque { return NO; } + - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView{ if ([buttonCell image] == nil || [self usesItemFromMenu]) { // we need to redraw the image @@ -400,7 +394,8 @@ drawSize.width += NSWidth(arrowRect); } - NSImage *popUpImage = [[NSImage alloc] initWithSize: drawSize]; + NSImage *popUpImage = [[NSImage alloc] initWithSize: cellFrame.size]; + [popUpImage setBackgroundColor:[NSColor clearColor]]; [popUpImage lockFocus]; if (image) Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 00:49:17 UTC (rev 275) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:34:03 UTC (rev 276) @@ -120,7 +120,6 @@ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - CE023F5D0CC50F87003F52E5 /* Add_Small.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE023F5C0CC50F86003F52E5 /* Add_Small.tiff */; }; CE11A2B40AE662EB008C47AC /* BDSKTextViewCompletionController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98AA6800971E3F400184BD8 /* BDSKTextViewCompletionController.m */; }; CE11A6350AE6BB77008C47AC /* urlFolderIcon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE11A6340AE6BB77008C47AC /* urlFolderIcon.tiff */; }; CE11AC0B0AE7E0DC008C47AC /* BDSKScriptGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = CE11AC090AE7E0DC008C47AC /* BDSKScriptGroup.m */; }; @@ -899,7 +898,6 @@ 45DB3E8D0CAAFED5001EACDA /* BDSKHubmedParser.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKHubmedParser.m; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D1107320486CEB800E47090 /* BibDesk.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BibDesk.app; sourceTree = BUILT_PRODUCTS_DIR; }; - CE023F5C0CC50F86003F52E5 /* Add_Small.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Add_Small.tiff; path = Images/Add_Small.tiff; sourceTree = "<group>"; }; CE11A6340AE6BB77008C47AC /* urlFolderIcon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = urlFolderIcon.tiff; path = Images/urlFolderIcon.tiff; sourceTree = "<group>"; }; CE11AC080AE7E0DC008C47AC /* BDSKScriptGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKScriptGroup.h; sourceTree = "<group>"; }; CE11AC090AE7E0DC008C47AC /* BDSKScriptGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKScriptGroup.m; sourceTree = "<group>"; }; @@ -2221,7 +2219,6 @@ CE2A195E0CE4969800A0499B /* NewSeparator.tiff */, F9022DA20758088000C3F701 /* Action_Pressed.tiff */, F9022DA30758088000C3F701 /* Action.tiff */, - CE023F5C0CC50F86003F52E5 /* Add_Small.tiff */, F9022DA70758088000C3F701 /* autofile.tiff */, 3DFF355E0816B5460052F37C /* back_small.tiff */, F9022DA80758088000C3F701 /* bibDocIcon.icns */, @@ -3183,7 +3180,6 @@ CE89622A0CBEBAAC00EA2D98 /* TemplateDocument.nib in Resources */, CE8962C60CBEC0C500EA2D98 /* TemplateOptions.strings in Resources */, CE8962CB0CBEC10700EA2D98 /* TemplateOptions.plist in Resources */, - CE023F5D0CC50F87003F52E5 /* Add_Small.tiff in Resources */, CE2A195F0CE4969900A0499B /* NewFolder.tiff in Resources */, CE2A19600CE4969900A0499B /* NewSeparator.tiff in Resources */, CE2A198E0CE499AD00A0499B /* SmallFolder.tiff in Resources */, Modified: trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 03:53:46
|
Revision: 277 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=277&view=rev Author: amaxwell Date: 2008-02-03 19:53:51 -0800 (Sun, 03 Feb 2008) Log Message: ----------- use network icon from system; fix crasher in OAPreferenceClientRecord Modified Paths: -------------- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/Info.plist trunk/bibdesk/vendorsrc/OmniGroup/OmniAppKit/Preferences.subproj/OAPreferenceClientRecord.m Removed Paths: ------------- trunk/bibdesk/Images/networkIcon.tiff Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:34:03 UTC (rev 276) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:53:51 UTC (rev 277) @@ -504,7 +504,6 @@ F9F5ECD20AE5E7C8007EBB31 /* BDSKURLGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = F9F5ECD00AE5E7C8007EBB31 /* BDSKURLGroup.m */; }; F9F78CD507D5320D004B68AF /* BDSKStringEncodingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F9F78CD307D5320D004B68AF /* BDSKStringEncodingManager.m */; }; F9FD63DD0A61B87800F9871B /* NSMenu_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F9FD63DB0A61B87800F9871B /* NSMenu_BDSKExtensions.m */; }; - F9FF241309E873A300BB1706 /* networkIcon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9FF241209E873A300BB1706 /* networkIcon.tiff */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1586,7 +1585,6 @@ F9FD63DA0A61B87800F9871B /* NSMenu_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMenu_BDSKExtensions.h; sourceTree = "<group>"; }; F9FD63DB0A61B87800F9871B /* NSMenu_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSMenu_BDSKExtensions.m; sourceTree = "<group>"; }; F9FEFCB00A0BC14D009193CA /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = English; path = English.lproj/PreferenceSearchTerms.plist; sourceTree = "<group>"; }; - F9FF241209E873A300BB1706 /* networkIcon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = networkIcon.tiff; path = Images/networkIcon.tiff; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2249,7 +2247,6 @@ CE7E1C380A0B9E94009D04C3 /* GroupAction_Pressed.tiff */, CE2C18910A0A43BE006F0A73 /* importFolderIcon.tiff */, F9022DB10758088000C3F701 /* key.tiff */, - F9FF241209E873A300BB1706 /* networkIcon.tiff */, F9022DB20758088000C3F701 /* newdoc.tiff */, F9022DB30758088000C3F701 /* preview.tiff */, F9022DB50758088000C3F701 /* QuestionMarkFile.tiff */, @@ -3159,7 +3156,6 @@ F97BF344090B19520063504B /* smartFolderIcon.tiff in Resources */, CEBB8D8809C8B0D90074C79E /* Font.tiff in Resources */, CE386D0709D7075C00B9D1F0 /* sharedFolderIcon.tiff in Resources */, - F9FF241309E873A300BB1706 /* networkIcon.tiff in Resources */, CE4B691C09E9235200CCA14F /* SmallLock_Locked.tiff in Resources */, CE4B691D09E9235200CCA14F /* SmallLock_Unlocked.tiff in Resources */, CE31E4100A07928C00F5BD47 /* staticFolderIcon.tiff in Resources */, Deleted: trunk/bibdesk/Images/networkIcon.tiff =================================================================== (Binary files differ) Modified: trunk/bibdesk/Info.plist =================================================================== --- trunk/bibdesk/Info.plist 2008-02-04 03:34:03 UTC (rev 276) +++ trunk/bibdesk/Info.plist 2008-02-04 03:53:51 UTC (rev 277) @@ -1074,7 +1074,7 @@ <key>helpURL</key> <string>SharingPreferences</string> <key>icon</key> - <string>networkIcon.tiff</string> + <string>NSNetwork</string> <key>identifier</key> <string>edu.ucsd.cs.mmccrack.bibdesk.prefpane.sharing</string> <key>nib</key> Modified: trunk/bibdesk/vendorsrc/OmniGroup/OmniAppKit/Preferences.subproj/OAPreferenceClientRecord.m =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/OmniAppKit/Preferences.subproj/OAPreferenceClientRecord.m 2008-02-04 03:34:03 UTC (rev 276) +++ trunk/bibdesk/vendorsrc/OmniGroup/OmniAppKit/Preferences.subproj/OAPreferenceClientRecord.m 2008-02-04 03:53:51 UTC (rev 277) @@ -57,7 +57,7 @@ return iconImage; bundle = [OFBundledClass bundleForClassNamed:className]; - iconImage = [NSImage imageNamed:iconName inBundle:bundle]; + iconImage = [[NSImage imageNamed:iconName inBundle:bundle] retain]; #ifdef DEBUG if (iconImage == nil) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 03:56:29
|
Revision: 278 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=278&view=rev Author: amaxwell Date: 2008-02-03 19:56:34 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove unused images Modified Paths: -------------- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj Removed Paths: ------------- trunk/bibdesk/Images/QuestionMarkFile.tiff trunk/bibdesk/Images/inputmanager.tiff Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:53:51 UTC (rev 277) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:56:34 UTC (rev 278) @@ -353,7 +353,6 @@ F9022DCC0758088000C3F701 /* key.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB10758088000C3F701 /* key.tiff */; }; F9022DCD0758088000C3F701 /* newdoc.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB20758088000C3F701 /* newdoc.tiff */; }; F9022DCE0758088000C3F701 /* preview.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB30758088000C3F701 /* preview.tiff */; }; - F9022DD00758088000C3F701 /* QuestionMarkFile.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB50758088000C3F701 /* QuestionMarkFile.tiff */; }; F9022DD10758088000C3F701 /* Remove_Pressed.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB60758088000C3F701 /* Remove_Pressed.tiff */; }; F9022DD20758088000C3F701 /* Remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB70758088000C3F701 /* Remove.tiff */; }; F9022DD30758088000C3F701 /* risDocIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = F9022DB80758088000C3F701 /* risDocIcon.icns */; }; @@ -1275,7 +1274,6 @@ F9022DB10758088000C3F701 /* key.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = key.tiff; path = Images/key.tiff; sourceTree = "<group>"; }; F9022DB20758088000C3F701 /* newdoc.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = newdoc.tiff; path = Images/newdoc.tiff; sourceTree = "<group>"; }; F9022DB30758088000C3F701 /* preview.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = preview.tiff; path = Images/preview.tiff; sourceTree = "<group>"; }; - F9022DB50758088000C3F701 /* QuestionMarkFile.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = QuestionMarkFile.tiff; path = Images/QuestionMarkFile.tiff; sourceTree = "<group>"; }; F9022DB60758088000C3F701 /* Remove_Pressed.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Remove_Pressed.tiff; path = Images/Remove_Pressed.tiff; sourceTree = "<group>"; }; F9022DB70758088000C3F701 /* Remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Remove.tiff; path = Images/Remove.tiff; sourceTree = "<group>"; }; F9022DB80758088000C3F701 /* risDocIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = risDocIcon.icns; path = Images/risDocIcon.icns; sourceTree = "<group>"; }; @@ -2249,7 +2247,6 @@ F9022DB10758088000C3F701 /* key.tiff */, F9022DB20758088000C3F701 /* newdoc.tiff */, F9022DB30758088000C3F701 /* preview.tiff */, - F9022DB50758088000C3F701 /* QuestionMarkFile.tiff */, 3DFF35620816B5780052F37C /* reload_small.tiff */, F9022DB60758088000C3F701 /* Remove_Pressed.tiff */, F9022DB70758088000C3F701 /* Remove.tiff */, @@ -3129,7 +3126,6 @@ F9022DCC0758088000C3F701 /* key.tiff in Resources */, F9022DCD0758088000C3F701 /* newdoc.tiff in Resources */, F9022DCE0758088000C3F701 /* preview.tiff in Resources */, - F9022DD00758088000C3F701 /* QuestionMarkFile.tiff in Resources */, F9022DD10758088000C3F701 /* Remove_Pressed.tiff in Resources */, F9022DD20758088000C3F701 /* Remove.tiff in Resources */, F9022DD30758088000C3F701 /* risDocIcon.icns in Resources */, Deleted: trunk/bibdesk/Images/QuestionMarkFile.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/inputmanager.tiff =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 03:59:49
|
Revision: 279 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=279&view=rev Author: amaxwell Date: 2008-02-03 19:59:53 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove obsolete button cell Modified Paths: -------------- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/harmless/AMButtonBarItem.m Removed Paths: ------------- trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.h trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.m Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:56:34 UTC (rev 278) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:59:53 UTC (rev 279) @@ -392,7 +392,6 @@ F923501A089A813E00EFEB06 /* NSDate_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F9235018089A813E00EFEB06 /* NSDate_BDSKExtensions.m */; }; F92405030BC5856900672839 /* BDSKLevelIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F92405010BC5856900672839 /* BDSKLevelIndicatorCell.m */; }; F924FC020BC3FFFC00672839 /* AMButtonBar.m in Sources */ = {isa = PBXBuildFile; fileRef = F924FBF00BC3FFFC00672839 /* AMButtonBar.m */; }; - F924FC040BC3FFFC00672839 /* AMButtonBarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F924FBF20BC3FFFC00672839 /* AMButtonBarCell.m */; }; F924FC060BC3FFFC00672839 /* AMButtonBarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = F924FBF40BC3FFFC00672839 /* AMButtonBarItem.m */; }; F924FC310BC4322500672839 /* BDSKSearchButtonController.m in Sources */ = {isa = PBXBuildFile; fileRef = F924FC2F0BC4322500672839 /* BDSKSearchButtonController.m */; }; F9252E2308F60D170045D563 /* BDSKFileContentSearchController.m in Sources */ = {isa = PBXBuildFile; fileRef = F9252E2108F60D170045D563 /* BDSKFileContentSearchController.m */; }; @@ -1332,8 +1331,6 @@ F92405010BC5856900672839 /* BDSKLevelIndicatorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKLevelIndicatorCell.m; sourceTree = "<group>"; }; F924FBEF0BC3FFFC00672839 /* AMButtonBar.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = AMButtonBar.h; path = vendorsrc/harmless/AMButtonBar.h; sourceTree = SOURCE_ROOT; }; F924FBF00BC3FFFC00672839 /* AMButtonBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AMButtonBar.m; path = vendorsrc/harmless/AMButtonBar.m; sourceTree = SOURCE_ROOT; }; - F924FBF10BC3FFFC00672839 /* AMButtonBarCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AMButtonBarCell.h; path = vendorsrc/harmless/AMButtonBarCell.h; sourceTree = SOURCE_ROOT; }; - F924FBF20BC3FFFC00672839 /* AMButtonBarCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AMButtonBarCell.m; path = vendorsrc/harmless/AMButtonBarCell.m; sourceTree = SOURCE_ROOT; }; F924FBF30BC3FFFC00672839 /* AMButtonBarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AMButtonBarItem.h; path = vendorsrc/harmless/AMButtonBarItem.h; sourceTree = SOURCE_ROOT; }; F924FBF40BC3FFFC00672839 /* AMButtonBarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AMButtonBarItem.m; path = vendorsrc/harmless/AMButtonBarItem.m; sourceTree = SOURCE_ROOT; }; F924FC2E0BC4322500672839 /* BDSKSearchButtonController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKSearchButtonController.h; sourceTree = "<group>"; }; @@ -2549,8 +2546,6 @@ children = ( F924FBEF0BC3FFFC00672839 /* AMButtonBar.h */, F924FBF00BC3FFFC00672839 /* AMButtonBar.m */, - F924FBF10BC3FFFC00672839 /* AMButtonBarCell.h */, - F924FBF20BC3FFFC00672839 /* AMButtonBarCell.m */, F924FBF30BC3FFFC00672839 /* AMButtonBarItem.h */, F924FBF40BC3FFFC00672839 /* AMButtonBarItem.m */, ); @@ -3603,7 +3598,6 @@ CE4385E90BB81D0500A56987 /* BDSKSearchBookmarkController.m in Sources */, F9B3405E0BBC16720072C2B0 /* BibItem_PubMedLookup.m in Sources */, F924FC020BC3FFFC00672839 /* AMButtonBar.m in Sources */, - F924FC040BC3FFFC00672839 /* AMButtonBarCell.m in Sources */, F924FC060BC3FFFC00672839 /* AMButtonBarItem.m in Sources */, F924FC310BC4322500672839 /* BDSKSearchButtonController.m in Sources */, F92405030BC5856900672839 /* BDSKLevelIndicatorCell.m in Sources */, Deleted: trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.h =================================================================== --- trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.h 2008-02-04 03:56:34 UTC (rev 278) +++ trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.h 2008-02-04 03:59:53 UTC (rev 279) @@ -1,30 +0,0 @@ -// -// AMButtonBarCell.h -// AMButtonBar -// -// Created by Andreas on Sat 2007-02-10 -// Copyright (c) 2004 Andreas Mayer. All rights reserved. - -// different representations: -// - off -// (no background, text, text shadow) -// - off + mouse over -// (light background without shadow, text, text shadow) -// - on -// (medium background, top shadow, bottom light (shadow), text, text shadow) -// - on + mouse over -// (light background, top shadow, bottom light (shadow), text, text shadow) -// - on/off + mouse down -// (dark background, top shadow, bottom light (shadow), text, text shadow) - - -#import <AppKit/AppKit.h> - -@interface AMButtonBarCell : NSButtonCell -{ - BOOL isMouseOver; -} - - - -@end Deleted: trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.m =================================================================== --- trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.m 2008-02-04 03:56:34 UTC (rev 278) +++ trunk/bibdesk/vendorsrc/harmless/AMButtonBarCell.m 2008-02-04 03:59:53 UTC (rev 279) @@ -1,100 +0,0 @@ -// -// AMButtonBarCell.m -// AMButtonBar -// -// Created by Andreas on 2007-02-10 -// Copyright (c) 2004 Andreas Mayer. All rights reserved. - -#import "AMButtonBarCell.h" - -static NSParagraphStyle *paragraphStyle = nil; - -@implementation AMButtonBarCell - -+ (void) initialize -{ - NSMutableParagraphStyle *ps = [[[NSMutableParagraphStyle alloc] init] autorelease]; - [ps setAlignment:NSCenterTextAlignment]; - paragraphStyle = [ps copy]; -} - -- (id)initTextCell:(NSString *)aString -{ - if (self = [super initTextCell:aString]) { - isMouseOver = NO; - } - return self; -} - -- (id)initWithCoder:(NSCoder *)decoder -{ - if (self = [super initWithCoder:decoder]) { - isMouseOver = NO; - } - return self; -} - -- (void)mouseEntered:(NSEvent *)event -{ - isMouseOver = YES; - [super mouseEntered:event]; -} - -- (void)mouseExited:(NSEvent *)event -{ - isMouseOver = NO; - [super mouseExited:event]; -} - -- (void)drawBezelWithFrame:(NSRect)cellFrame inView:(NSView *)controlView -{ - // this is called for each mouseEntered: event, and we have to perform the bezel adjustment for those as well - if (isMouseOver && [self state] != NSOnState) - [super drawBezelWithFrame:cellFrame inView:controlView]; -} - -/* -We can remove this class when compiling for 10.5 and greater. With the 10.4 SDK, the button does not show on state when the mouse is outside the button. Behavior changes at link time, which is not documented. - - Drawing while the mouse is inside still is not correct, as the background color shouldn't change, so we hack around that. Additionally, text isn't perfectly centered in the vertical direction; there's more gap at the top than the bottom, so we add a 1 point vertical offset. - */ - -- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView -{ - NSFont *font = [[NSFontManager sharedFontManager] convertFont:[self font] toHaveTrait:NSBoldFontMask]; - NSColor *textColor; - NSShadow *textShadow = [[NSShadow alloc] init]; - - [textShadow setShadowBlurRadius:1.0]; - [textShadow setShadowOffset:NSMakeSize(0.0, -1.0)]; - - if ([self state] == NSOnState || isMouseOver) { - - // in this case, offset the rect and call super, so we don't offset it again in our own implementation - if ([self state] == NSOnState) { - [super drawBezelWithFrame:cellFrame inView:controlView]; - } - else { - // this is a mouseOver in a cell that's off - [self drawBezelWithFrame:cellFrame inView:controlView]; - } - textColor = [NSColor whiteColor]; - [textShadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.6]]; - - } else { - textColor = [NSColor colorWithCalibratedWhite:0.2 alpha:1.0]; - [textShadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.6]]; - } - - NSDictionary *attributes = [[NSDictionary alloc] initWithObjectsAndKeys:font, NSFontAttributeName, textColor, NSForegroundColorAttributeName, paragraphStyle, NSParagraphStyleAttributeName, textShadow, NSShadowAttributeName, nil]; - NSAttributedString *title = [[NSAttributedString alloc] initWithString:[self title] attributes:attributes]; - cellFrame.origin.y += [controlView isFlipped] ? -1.0 : 1.0; - [self drawTitle:title withFrame:cellFrame inView:controlView]; - [attributes release]; - [title release]; - [textShadow release]; -} - -@end - - Modified: trunk/bibdesk/vendorsrc/harmless/AMButtonBarItem.m =================================================================== --- trunk/bibdesk/vendorsrc/harmless/AMButtonBarItem.m 2008-02-04 03:56:34 UTC (rev 278) +++ trunk/bibdesk/vendorsrc/harmless/AMButtonBarItem.m 2008-02-04 03:59:53 UTC (rev 279) @@ -7,13 +7,10 @@ // #import "AMButtonBarItem.h" -#import "AMButtonBarCell.h" #import "AMButtonBar.h" @implementation AMButtonBarItem -+ (Class)cellClass { return [AMButtonBarCell class]; } - - (void)commonInit { [self setEnabled:YES]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 04:20:46
|
Revision: 280 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=280&view=rev Author: amaxwell Date: 2008-02-03 20:20:47 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove import use NSPathCell for path display Modified Paths: -------------- trunk/bibdesk/BDSKFileMigrationController.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/English.lproj/BDSKFileMigration.nib/classes.nib trunk/bibdesk/English.lproj/BDSKFileMigration.nib/info.nib trunk/bibdesk/English.lproj/BDSKFileMigration.nib/keyedobjects.nib trunk/bibdesk/French.lproj/BDSKFileMigration.nib/classes.nib trunk/bibdesk/French.lproj/BDSKFileMigration.nib/info.nib trunk/bibdesk/French.lproj/BDSKFileMigration.nib/keyedobjects.nib trunk/bibdesk/vendorsrc/harmless/AMButtonBar.m Modified: trunk/bibdesk/BDSKFileMigrationController.m =================================================================== --- trunk/bibdesk/BDSKFileMigrationController.m 2008-02-04 03:59:53 UTC (rev 279) +++ trunk/bibdesk/BDSKFileMigrationController.m 2008-02-04 04:20:47 UTC (rev 280) @@ -61,7 +61,6 @@ + (void)initialize { OBINITIALIZE; - [NSValueTransformer setValueTransformer:[[[BDSKURLTransformer alloc] init] autorelease] forName:@"BDSKURLTransformer"]; [NSValueTransformer setValueTransformer:[[[BDSKBibItemTransformer alloc] init] autorelease] forName:@"BDSKBibItemTransformer"]; } @@ -90,6 +89,7 @@ [tableView setTarget:self]; [tableView setDataSource:self]; [progressBar setUsesThreadedAnimation:YES]; + [[[tableView tableColumns] objectAtIndex:0] setDataCell:[[[NSPathCell alloc] init] autorelease]]; } - (NSString *)windowNibName { return @"BDSKFileMigration"; } @@ -272,27 +272,3 @@ @end -@implementation BDSKURLTransformer - -+ (Class)transformedValueClass { - return [NSString class]; -} - -+ (BOOL)allowsReverseTransformation { - return NO; -} - -- (id)transformedValue:(id)aURL { - NSString *stringValue = nil; - if ([aURL isFileURL]) { - CFStringRef displayName = NULL; - LSCopyDisplayNameForURL((CFURLRef)aURL, &displayName); - stringValue = [(id)displayName autorelease]; - } - if (nil == stringValue) - stringValue = [aURL absoluteString]; - return stringValue; -} - -@end - Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 03:59:53 UTC (rev 279) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 04:20:47 UTC (rev 280) @@ -551,14 +551,14 @@ isa = PBXContainerItemProxy; containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; proxyType = 1; - remoteGlobalIDString = F9F04CE10CE260EB00F28ED2 /* Framework + Plugin */; + remoteGlobalIDString = F9F04CE10CE260EB00F28ED2; remoteInfo = "Framework + Plugin"; }; F95B87430D567DCC005DC4F3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F98C6FC80CDD30A2002FCAD8 /* QuickLook-BibDesk.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 8D57630D048677EA00EA77CD /* BibDesk */; + remoteGlobalIDString = 8D57630D048677EA00EA77CD; remoteInfo = BibDesk; }; F95CC112087F54BF002C5694 /* PBXContainerItemProxy */ = { Modified: trunk/bibdesk/English.lproj/BDSKFileMigration.nib/classes.nib =================================================================== --- trunk/bibdesk/English.lproj/BDSKFileMigration.nib/classes.nib 2008-02-04 03:59:53 UTC (rev 279) +++ trunk/bibdesk/English.lproj/BDSKFileMigration.nib/classes.nib 2008-02-04 04:20:47 UTC (rev 280) @@ -1,36 +1,125 @@ -{ - IBClasses = ( - { - ACTIONS = {editPublication = id; migrate = id; openParentDirectory = id; showHelp = id; }; - CLASS = BDSKFileMigrationController; - LANGUAGE = ObjC; - OUTLETS = { - migrateButton = NSButton; - progressBar = NSProgressIndicator; - statusField = NSTextField; - tableView = NSTableView; - }; - SUPERCLASS = NSWindowController; - }, - {CLASS = BDSKTextWithIconCell; LANGUAGE = ObjC; SUPERCLASS = NSTextFieldCell; }, - {CLASS = NSControl; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = NSMenu; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = NSObject; LANGUAGE = ObjC; }, - {CLASS = NSScrollView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = NSTableHeaderView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - { - ACTIONS = {changeFont = id; invertSelection = id; }; - CLASS = NSTableView; - LANGUAGE = ObjC; - SUPERCLASS = NSControl; - }, - {CLASS = NSWindow; LANGUAGE = ObjC; SUPERCLASS = NSResponder; }, - { - ACTIONS = {hideWindow = id; toggleShowingWindow = id; }; - CLASS = NSWindowController; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - } - ); - IBVersion = 1; -} \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBClasses</key> + <array> + <dict> + <key>CLASS</key> + <string>BDSKTextWithIconCell</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSTextFieldCell</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>editPublication</key> + <string>id</string> + <key>migrate</key> + <string>id</string> + <key>openParentDirectory</key> + <string>id</string> + <key>showHelp</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>BDSKFileMigrationController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>migrateButton</key> + <string>NSButton</string> + <key>progressBar</key> + <string>NSProgressIndicator</string> + <key>statusField</key> + <string>NSTextField</string> + <key>tableView</key> + <string>NSTableView</string> + </dict> + <key>SUPERCLASS</key> + <string>NSWindowController</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSControl</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSMenu</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>hideWindow</key> + <string>id</string> + <key>toggleShowingWindow</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSWindowController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSObject</string> + <key>LANGUAGE</key> + <string>ObjC</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSWindow</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSScrollView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSTableHeaderView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>changeFont</key> + <string>id</string> + <key>invertSelection</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSTableView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSControl</string> + </dict> + </array> + <key>IBVersion</key> + <string>1</string> +</dict> +</plist> Modified: trunk/bibdesk/English.lproj/BDSKFileMigration.nib/info.nib =================================================================== --- trunk/bibdesk/English.lproj/BDSKFileMigration.nib/info.nib 2008-02-04 03:59:53 UTC (rev 279) +++ trunk/bibdesk/English.lproj/BDSKFileMigration.nib/info.nib 2008-02-04 04:20:47 UTC (rev 280) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>IBDocumentLocation</key> - <string>69 58 356 240 0 0 1440 938 </string> <key>IBFramework Version</key> - <string>489.0</string> + <string>629</string> + <key>IBLastKnownRelativeProjectPath</key> + <string>../../Bibdesk.xcodeproj</string> <key>IBOldestOS</key> <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>1</integer> + <integer>6</integer> </array> <key>IBSystem Version</key> - <string>8S165</string> + <string>9C27</string> <key>targetFramework</key> <string>IBCocoaFramework</string> </dict> Modified: trunk/bibdesk/English.lproj/BDSKFileMigration.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/bibdesk/French.lproj/BDSKFileMigration.nib/classes.nib =================================================================== --- trunk/bibdesk/French.lproj/BDSKFileMigration.nib/classes.nib 2008-02-04 03:59:53 UTC (rev 279) +++ trunk/bibdesk/French.lproj/BDSKFileMigration.nib/classes.nib 2008-02-04 04:20:47 UTC (rev 280) @@ -1,74 +1,125 @@ -{ - IBClasses = ( - { - ACTIONS = { - editPublication = id; - migrate = id; - openParentDirectory = id; - showHelp = id; - }; - CLASS = BDSKFileMigrationController; - LANGUAGE = ObjC; - OUTLETS = { - migrateButton = NSButton; - progressBar = NSProgressIndicator; - statusField = NSTextField; - tableView = NSTableView; - }; - SUPERCLASS = NSWindowController; - }, - { - CLASS = BDSKTextWithIconCell; - LANGUAGE = ObjC; - SUPERCLASS = NSTextFieldCell; - }, - { - CLASS = NSControl; - LANGUAGE = ObjC; - SUPERCLASS = NSView; - }, - { - CLASS = NSMenu; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSObject; - LANGUAGE = ObjC; - }, - { - CLASS = NSScrollView; - LANGUAGE = ObjC; - SUPERCLASS = NSView; - }, - { - CLASS = NSTableHeaderView; - LANGUAGE = ObjC; - SUPERCLASS = NSView; - }, - { - ACTIONS = { - changeFont = id; - invertSelection = id; - }; - CLASS = NSTableView; - LANGUAGE = ObjC; - SUPERCLASS = NSControl; - }, - { - CLASS = NSWindow; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - }, - { - ACTIONS = { - hideWindow = id; - toggleShowingWindow = id; - }; - CLASS = NSWindowController; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - } - ); - IBVersion = 1; -} \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBClasses</key> + <array> + <dict> + <key>CLASS</key> + <string>BDSKTextWithIconCell</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSTextFieldCell</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSControl</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSMenu</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>editPublication</key> + <string>id</string> + <key>migrate</key> + <string>id</string> + <key>openParentDirectory</key> + <string>id</string> + <key>showHelp</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>BDSKFileMigrationController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>migrateButton</key> + <string>NSButton</string> + <key>progressBar</key> + <string>NSProgressIndicator</string> + <key>statusField</key> + <string>NSTextField</string> + <key>tableView</key> + <string>NSTableView</string> + </dict> + <key>SUPERCLASS</key> + <string>NSWindowController</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>hideWindow</key> + <string>id</string> + <key>toggleShowingWindow</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSWindowController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSObject</string> + <key>LANGUAGE</key> + <string>ObjC</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSWindow</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSScrollView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSTableHeaderView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>changeFont</key> + <string>id</string> + <key>invertSelection</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSTableView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSControl</string> + </dict> + </array> + <key>IBVersion</key> + <string>1</string> +</dict> +</plist> Modified: trunk/bibdesk/French.lproj/BDSKFileMigration.nib/info.nib =================================================================== --- trunk/bibdesk/French.lproj/BDSKFileMigration.nib/info.nib 2008-02-04 03:59:53 UTC (rev 279) +++ trunk/bibdesk/French.lproj/BDSKFileMigration.nib/info.nib 2008-02-04 04:20:47 UTC (rev 280) @@ -2,14 +2,18 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>IBDocumentLocation</key> - <string>79 78 356 240 0 0 1600 1178 </string> <key>IBFramework Version</key> - <string>489.0</string> + <string>629</string> + <key>IBLastKnownRelativeProjectPath</key> + <string>../../Bibdesk.xcodeproj</string> <key>IBOldestOS</key> <integer>5</integer> + <key>IBOpenObjects</key> + <array> + <integer>9</integer> + </array> <key>IBSystem Version</key> - <string>9C7</string> + <string>9C27</string> <key>targetFramework</key> <string>IBCocoaFramework</string> </dict> Modified: trunk/bibdesk/French.lproj/BDSKFileMigration.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/bibdesk/vendorsrc/harmless/AMButtonBar.m =================================================================== --- trunk/bibdesk/vendorsrc/harmless/AMButtonBar.m 2008-02-04 03:59:53 UTC (rev 279) +++ trunk/bibdesk/vendorsrc/harmless/AMButtonBar.m 2008-02-04 04:20:47 UTC (rev 280) @@ -8,7 +8,6 @@ #import "AMButtonBar.h" #import "AMButtonBarItem.h" -#import "AMButtonBarCell.h" static float const AM_START_GAP_WIDTH = 8.0; static float const AM_BUTTON_GAP_WIDTH = 2.0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 04:39:05
|
Revision: 282 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=282&view=rev Author: amaxwell Date: 2008-02-03 20:39:10 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove locking subclasses and just use an NSLock Modified Paths: -------------- trunk/bibdesk/BDSKFileSearchIndex.h trunk/bibdesk/BDSKFileSearchIndex.m trunk/bibdesk/BDSKSharingServer.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj Removed Paths: ------------- trunk/bibdesk/BDSKThreadSafeMutableArray.h trunk/bibdesk/BDSKThreadSafeMutableArray.m trunk/bibdesk/BDSKThreadSafeMutableDictionary.h trunk/bibdesk/BDSKThreadSafeMutableDictionary.m Modified: trunk/bibdesk/BDSKFileSearchIndex.h =================================================================== --- trunk/bibdesk/BDSKFileSearchIndex.h 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/BDSKFileSearchIndex.h 2008-02-04 04:39:10 UTC (rev 282) @@ -38,7 +38,7 @@ #import <Cocoa/Cocoa.h> -@class BDSKFileSearchIndex, BDSKThreadSafeMutableArray, BDSKMultiValueDictionary; +@class BDSKFileSearchIndex, BDSKMultiValueDictionary; @protocol BDSKFileSearchIndexDelegate <NSObject> @@ -64,7 +64,8 @@ pthread_rwlock_t rwlock; - BDSKThreadSafeMutableArray *notificationQueue; + NSMutableArray *notificationQueue; + NSLock *queueLock; NSMachPort *notificationPort; NSThread *notificationThread; NSConditionLock *setupLock; Modified: trunk/bibdesk/BDSKFileSearchIndex.m =================================================================== --- trunk/bibdesk/BDSKFileSearchIndex.m 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/BDSKFileSearchIndex.m 2008-02-04 04:39:10 UTC (rev 282) @@ -40,7 +40,6 @@ #import "BibDocument.h" #import "BibItem.h" #import <libkern/OSAtomic.h> -#import "BDSKThreadSafeMutableArray.h" #import "BDSKMultiValueDictionary.h" #import "NSObject_BDSKExtensions.h" #import "NSFileManager_BDSKExtensions.h" @@ -145,6 +144,7 @@ if(index) CFRelease(index); if(indexData) CFRelease(indexData); [setupLock release]; + [queueLock release]; [super dealloc]; } @@ -593,7 +593,8 @@ [notificationPort setDelegate:self]; [[NSRunLoop currentRunLoop] addPort:notificationPort forMode:NSDefaultRunLoopMode]; - notificationQueue = [[BDSKThreadSafeMutableArray alloc] initWithCapacity:5]; + notificationQueue = [[NSMutableArray alloc] initWithCapacity:5]; + queueLock = [[NSLock alloc] init]; [setupLock unlockWithCondition:INDEX_STARTUP_COMPLETE]; [setupLock lockWhenCondition:INDEX_THREAD_WORKING]; @@ -671,7 +672,9 @@ { OBASSERT([NSThread inMainThread]); // Forward the notification to the correct thread + [queueLock lock]; [notificationQueue addObject:note]; + [queueLock unlock]; [notificationPort sendBeforeDate:[NSDate date] components:nil from:nil reserved:0]; } @@ -759,11 +762,12 @@ - (void)handleMachMessage:(void *)msg { OBASSERT([NSThread inMainThread] == NO); - + [queueLock lock]; while ( [notificationQueue count] ) { NSNotification *note = [[notificationQueue objectAtIndex:0] retain]; NSString *name = [note name]; [notificationQueue removeObjectAtIndex:0]; + [queueLock unlock]; // this is a background thread that can handle these notifications if([name isEqualToString:BDSKFileSearchIndexInfoChangedNotification]) [self handleSearchIndexInfoChangedNotification:note]; @@ -774,7 +778,9 @@ else [NSException raise:NSInvalidArgumentException format:@"notification %@ is not handled by %@", note, self]; [note release]; + [queueLock lock]; } + [queueLock unlock]; } @end Modified: trunk/bibdesk/BDSKSharingServer.m =================================================================== --- trunk/bibdesk/BDSKSharingServer.m 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/BDSKSharingServer.m 2008-02-04 04:39:10 UTC (rev 282) @@ -47,7 +47,6 @@ #import <libkern/OSAtomic.h> #import "BDSKSharedGroup.h" #import "BDSKAsynchronousDOServer.h" -#import "BDSKThreadSafeMutableDictionary.h" #include <sys/socket.h> #include <netinet/in.h> @@ -104,7 +103,8 @@ @interface BDSKSharingDOServer : BDSKAsynchronousDOServer <BDSKSharingServerLocalThread> { NSConnection *connection; - BDSKThreadSafeMutableDictionary *remoteClients; + NSMutableDictionary *remoteClients; + NSLock *remoteClientsLock; } + (NSString *)requiredProtocolVersion; @@ -422,7 +422,8 @@ { self = [super init]; if (self) { - remoteClients = [[BDSKThreadSafeMutableDictionary alloc] init]; + remoteClients = [[NSMutableDictionary alloc] init]; + remoteClientsLock = [[NSLock alloc] init]; [self startDOServerAsync]; } return self; @@ -432,13 +433,18 @@ { [remoteClients release]; remoteClients = nil; + [remoteClientsLock release]; [super dealloc]; } #pragma mark Thread Safe - (unsigned int)numberOfConnections { - return [remoteClients count]; + unsigned count; + [remoteClientsLock lock]; + count = [remoteClients count]; + [remoteClientsLock unlock]; + return count; } #pragma mark Main Thread @@ -480,6 +486,7 @@ - (oneway void)cleanup { + [remoteClientsLock lock]; NSEnumerator *e = [remoteClients keyEnumerator]; id proxyObject; NSString *key; @@ -495,6 +502,7 @@ [[proxyObject connectionForProxy] invalidate]; } [remoteClients removeAllObjects]; + [remoteClientsLock unlock]; [self performSelectorOnMainThread:@selector(notifyClientConnectionsChanged) withObject:nil waitUntilDone:NO]; NSPort *port = [[NSSocketPortNameServer sharedInstance] portForName:[BDSKSharingServer sharingName]]; @@ -519,7 +527,10 @@ if(maxConnections == 0) maxConnections = MAX(20, [[NSUserDefaults standardUserDefaults] integerForKey:@"BDSKSharingServerMaxConnections"]); + [remoteClientsLock lock]; BOOL allowConnection = [remoteClients count] < maxConnections; + [remoteClientsLock unlock]; + if(allowConnection){ [newConnection setDelegate:self]; } else { @@ -549,7 +560,9 @@ [clientObject setProtocolForProxy:@protocol(BDSKClientProtocol)]; NSDictionary *clientInfo = [NSDictionary dictionaryWithObjectsAndKeys:clientObject, @"object", version, @"version", nil]; + [remoteClientsLock lock]; [remoteClients setObject:clientInfo forKey:identifier]; + [remoteClientsLock unlock]; [self performSelectorOnMainThread:@selector(notifyClientConnectionsChanged) withObject:nil waitUntilDone:NO]; } @@ -558,15 +571,18 @@ - (oneway void)removeClientForIdentifier:(bycopy NSString *)identifier; { NSParameterAssert(identifier != nil); + [remoteClientsLock lock]; id proxyObject = [[remoteClients objectForKey:identifier] objectForKey:@"object"]; [[proxyObject connectionForProxy] invalidate]; [remoteClients removeObjectForKey:identifier]; + [remoteClientsLock unlock]; [self performSelectorOnMainThread:@selector(notifyClientConnectionsChanged) withObject:nil waitUntilDone:NO]; } - (oneway void)notifyClientsOfChange; { // here is where we notify other hosts that something changed + [remoteClientsLock lock]; NSEnumerator *e = [remoteClients keyEnumerator]; id proxyObject; NSString *key; @@ -584,6 +600,7 @@ [self removeClientForIdentifier:key]; } } + [remoteClientsLock unlock]; } - (NSArray *)copyPublicationsFromOpenDocuments Deleted: trunk/bibdesk/BDSKThreadSafeMutableArray.h =================================================================== --- trunk/bibdesk/BDSKThreadSafeMutableArray.h 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/BDSKThreadSafeMutableArray.h 2008-02-04 04:39:10 UTC (rev 282) @@ -1,46 +0,0 @@ -// -// BDSKThreadSafeMutableArray.h -// Bibdesk -// -// Created by Christiaan Hofman on 11/3/06. -/* - This software is Copyright (c) 2006-2008 - Christiaan Hofman. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import <Foundation/Foundation.h> - - -@interface BDSKThreadSafeMutableArray : NSMutableArray { - NSMutableArray *embeddedArray; - pthread_rwlock_t rwlock; -} -@end Deleted: trunk/bibdesk/BDSKThreadSafeMutableArray.m =================================================================== --- trunk/bibdesk/BDSKThreadSafeMutableArray.m 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/BDSKThreadSafeMutableArray.m 2008-02-04 04:39:10 UTC (rev 282) @@ -1,149 +0,0 @@ -// -// BDSKThreadSafeMutableArray.m -// Bibdesk -// -// Created by Christiaan Hofman on 11/3/06. -/* - This software is Copyright (c) 2006-2008 - Christiaan Hofman. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import "BDSKThreadSafeMutableArray.h" - - -@implementation BDSKThreadSafeMutableArray - -- (id)init { - if (self = [super init]) { - embeddedArray = [[NSMutableArray allocWithZone:[self zone]] init]; - pthread_rwlock_init(&rwlock, NULL); - } - return self; -} - -- (id)initWithCapacity:(unsigned)capacity { - if (self = [super init]) { - embeddedArray = [[NSMutableArray allocWithZone:[self zone]] initWithCapacity:capacity]; - pthread_rwlock_init(&rwlock, NULL); - } - return self; -} - -- (id)initWithObjects:(id *)objects count:(unsigned)count { - if (self = [super init]) { - embeddedArray = [[NSMutableArray allocWithZone:[self zone]] initWithObjects:objects count:count]; - pthread_rwlock_init(&rwlock, NULL); - } - return self; -} - -- (id)copyWithZone:(NSZone *)zone { - id copy; - pthread_rwlock_rdlock(&rwlock); - copy = [embeddedArray copy]; - pthread_rwlock_unlock(&rwlock); - return copy; -} - -- (id)mutableCopyWithZone:(NSZone *)zone { - id copy; - pthread_rwlock_rdlock(&rwlock); - copy = [[[self class] allocWithZone:zone] initWithArray:embeddedArray]; - pthread_rwlock_unlock(&rwlock); - return copy; -} - -- (void)dealloc { - pthread_rwlock_wrlock(&rwlock); - [embeddedArray release]; - embeddedArray = nil; - pthread_rwlock_unlock(&rwlock); - pthread_rwlock_destroy(&rwlock); - [super dealloc]; -} - -- (unsigned)count { - pthread_rwlock_rdlock(&rwlock); - unsigned count = [embeddedArray count]; - pthread_rwlock_unlock(&rwlock); - return count; -} - -- (id)objectAtIndex:(unsigned)idx { - pthread_rwlock_rdlock(&rwlock); - id object = [[[embeddedArray objectAtIndex:idx] retain] autorelease]; - pthread_rwlock_unlock(&rwlock); - return object; -} - -- (void)insertObject:(id)object atIndex:(unsigned)idx { - pthread_rwlock_wrlock(&rwlock); - [object retain]; - [embeddedArray insertObject:object atIndex:idx]; - [object release]; - pthread_rwlock_unlock(&rwlock); -} - -- (void)addObject:object { - pthread_rwlock_wrlock(&rwlock); - [object retain]; - [embeddedArray addObject:object]; - [object release]; - pthread_rwlock_unlock(&rwlock); -} - -- (void)removeObjectAtIndex:(unsigned)idx { - pthread_rwlock_wrlock(&rwlock); - id obj = [[embeddedArray objectAtIndex:idx] retain]; - [embeddedArray removeObjectAtIndex:idx]; - [obj autorelease]; - pthread_rwlock_unlock(&rwlock); -} - -- (void)removeLastObject { - pthread_rwlock_wrlock(&rwlock); - id obj = [[embeddedArray lastObject] retain]; - [embeddedArray removeLastObject]; - [obj autorelease]; - pthread_rwlock_unlock(&rwlock); -} - -- (void)replaceObjectAtIndex:(unsigned)idx withObject:(id)object{ - pthread_rwlock_wrlock(&rwlock); - [object retain]; - id objToReplace = [[embeddedArray objectAtIndex:idx] retain]; - [embeddedArray replaceObjectAtIndex:idx withObject:object]; - [object release]; - [objToReplace autorelease]; - pthread_rwlock_unlock(&rwlock); -} - -@end Deleted: trunk/bibdesk/BDSKThreadSafeMutableDictionary.h =================================================================== --- trunk/bibdesk/BDSKThreadSafeMutableDictionary.h 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/BDSKThreadSafeMutableDictionary.h 2008-02-04 04:39:10 UTC (rev 282) @@ -1,47 +0,0 @@ -// -// BDSKThreadSafeMutableDictionary.h -// BibDesk -// -// Created by Adam Maxwell on 01/27/05. -// From Apple TN2059 -/* - This software is Copyright (c) 2005-2008 - Adam Maxwell. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import <Foundation/Foundation.h> - - -@interface BDSKThreadSafeMutableDictionary : NSMutableDictionary { - NSMutableDictionary *embeddedDictionary; - pthread_rwlock_t rwlock; -} -@end Deleted: trunk/bibdesk/BDSKThreadSafeMutableDictionary.m =================================================================== --- trunk/bibdesk/BDSKThreadSafeMutableDictionary.m 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/BDSKThreadSafeMutableDictionary.m 2008-02-04 04:39:10 UTC (rev 282) @@ -1,122 +0,0 @@ -// -// BDSKThreadSafeMutableDictionary.m -// BibDesk -// -// Created by Adam Maxwell on 01/27/05. -/* - This software is Copyright (c) 2005-2008 - Adam Maxwell. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Adam Maxwell nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import "BDSKThreadSafeMutableDictionary.h" - -@implementation BDSKThreadSafeMutableDictionary - -- (id)init { - if (self = [super init]) { - embeddedDictionary = [[NSMutableDictionary allocWithZone:[self zone]] init]; - pthread_rwlock_init(&rwlock, NULL); - } - return self; -} - -- (id)initWithCapacity:(unsigned)capacity { - if (self = [super init]) { - embeddedDictionary = [[NSMutableDictionary allocWithZone:[self zone]] initWithCapacity:capacity]; - pthread_rwlock_init(&rwlock, NULL); - } - return self; -} - -- (id)copyWithZone:(NSZone *)zone { - pthread_rwlock_rdlock(&rwlock); - id copy = [embeddedDictionary copyWithZone:zone]; - pthread_rwlock_unlock(&rwlock); - return copy; -} - -- (id)mutableCopyWithZone:(NSZone *)zone { - pthread_rwlock_rdlock(&rwlock); - id copy = [[[self class] allocWithZone:zone] initWithDictionary:embeddedDictionary]; - pthread_rwlock_unlock(&rwlock); - return copy; -} - -- (void)dealloc { - pthread_rwlock_wrlock(&rwlock); - [embeddedDictionary release]; - embeddedDictionary = nil; - pthread_rwlock_unlock(&rwlock); - pthread_rwlock_destroy(&rwlock); - [super dealloc]; -} - -- (unsigned)count { - pthread_rwlock_rdlock(&rwlock); - unsigned count = [embeddedDictionary count]; - pthread_rwlock_unlock(&rwlock); - return count; -} - -- (id)objectForKey:(id)key { - pthread_rwlock_rdlock(&rwlock); - id object = [[[embeddedDictionary objectForKey:key] retain] autorelease]; - pthread_rwlock_unlock(&rwlock); - return object; -} - -- (NSEnumerator *)keyEnumerator { - pthread_rwlock_rdlock(&rwlock); - // copy in case it returns internal state - NSArray *keys = [[embeddedDictionary allKeys] copy]; - pthread_rwlock_unlock(&rwlock); - NSEnumerator *enumerator = [keys objectEnumerator]; - [keys release]; - return enumerator; -} - -- (void)setObject:(id)object forKey:(id)key { - pthread_rwlock_wrlock(&rwlock); - [object retain]; // @@ retain the key? I don't think Apple's sample did... - [embeddedDictionary setObject:object forKey:key]; - [object release]; - pthread_rwlock_unlock(&rwlock); -} - -- (void)removeObjectForKey:(id)key { - pthread_rwlock_wrlock(&rwlock); - id obj = [[embeddedDictionary objectForKey:key] retain]; - [embeddedDictionary removeObjectForKey:key]; - [obj autorelease]; - pthread_rwlock_unlock(&rwlock); -} - -@end Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 04:25:23 UTC (rev 281) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 04:39:10 UTC (rev 282) @@ -232,7 +232,6 @@ CE8962C60CBEC0C500EA2D98 /* TemplateOptions.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE8962C40CBEC0C500EA2D98 /* TemplateOptions.strings */; }; CE8962CB0CBEC10700EA2D98 /* TemplateOptions.plist in Resources */ = {isa = PBXBuildFile; fileRef = CE8962CA0CBEC10700EA2D98 /* TemplateOptions.plist */; }; CE8C731F0B0CA6C500E31E5A /* NSObject_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8C731D0B0CA6C500E31E5A /* NSObject_BDSKExtensions.m */; }; - CE8F83490AFB989C009EE6F9 /* BDSKThreadSafeMutableArray.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8F83470AFB989B009EE6F9 /* BDSKThreadSafeMutableArray.m */; }; CE95A57C0A88883300334DFA /* BDSKReadMeController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95A57A0A88883300334DFA /* BDSKReadMeController.m */; }; CE95AF180ADBE7C000CB20E7 /* BDSKTemplateObjectProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = CE95AF160ADBE7C000CB20E7 /* BDSKTemplateObjectProxy.m */; }; CE9666460B46B70C003BAB9A /* BDSKServerInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9666440B46B70C003BAB9A /* BDSKServerInfo.m */; }; @@ -385,7 +384,6 @@ F911D6BC0CFE8E690009C77B /* FileView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F911D6B40CFE8E420009C77B /* FileView.framework */; }; F911D6BD0CFE8E7D0009C77B /* FileView.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F911D6B40CFE8E420009C77B /* FileView.framework */; }; F911D7120CFE90050009C77B /* BDSKLinkedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = F911D7110CFE90050009C77B /* BDSKLinkedFile.m */; }; - F916E69607A9F9AB009EF011 /* BDSKThreadSafeMutableDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = F916E68F07A9F9AA009EF011 /* BDSKThreadSafeMutableDictionary.m */; }; F91B7F28092BEB5A00976F6F /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F91B7F27092BEB5A00976F6F /* AddressBook.framework */; }; F91F286A09A6684900419960 /* PDFMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = F91F284709A661A700419960 /* PDFMetadata.m */; }; F9201E020B72504C007E45BB /* BDSKMacro.m in Sources */ = {isa = PBXBuildFile; fileRef = F9201E000B72504C007E45BB /* BDSKMacro.m */; }; @@ -1073,8 +1071,6 @@ CE8962CA0CBEC10700EA2D98 /* TemplateOptions.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = TemplateOptions.plist; sourceTree = "<group>"; }; CE8C731C0B0CA6C500E31E5A /* NSObject_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSObject_BDSKExtensions.h; sourceTree = "<group>"; }; CE8C731D0B0CA6C500E31E5A /* NSObject_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSObject_BDSKExtensions.m; sourceTree = "<group>"; }; - CE8F83460AFB989B009EE6F9 /* BDSKThreadSafeMutableArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKThreadSafeMutableArray.h; sourceTree = "<group>"; }; - CE8F83470AFB989B009EE6F9 /* BDSKThreadSafeMutableArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKThreadSafeMutableArray.m; sourceTree = "<group>"; }; CE95A5790A88883300334DFA /* BDSKReadMeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKReadMeController.h; sourceTree = "<group>"; }; CE95A57A0A88883300334DFA /* BDSKReadMeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKReadMeController.m; sourceTree = "<group>"; }; CE95AF150ADBE7C000CB20E7 /* BDSKTemplateObjectProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKTemplateObjectProxy.h; sourceTree = "<group>"; }; @@ -1311,8 +1307,6 @@ F911D6A80CFE8E420009C77B /* FileView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FileView.xcodeproj; path = vendorsrc/amaxwell/FileView/FileView.xcodeproj; sourceTree = "<group>"; }; F911D7100CFE90050009C77B /* BDSKLinkedFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKLinkedFile.h; sourceTree = "<group>"; }; F911D7110CFE90050009C77B /* BDSKLinkedFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKLinkedFile.m; sourceTree = "<group>"; }; - F916E68A07A9F9AA009EF011 /* BDSKThreadSafeMutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKThreadSafeMutableDictionary.h; sourceTree = "<group>"; }; - F916E68F07A9F9AA009EF011 /* BDSKThreadSafeMutableDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKThreadSafeMutableDictionary.m; sourceTree = "<group>"; }; F91B5CC7076579830011ED22 /* previewtemplate.tex */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = previewtemplate.tex; sourceTree = "<group>"; }; F91B5CE407657A200011ED22 /* template.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = template.txt; sourceTree = "<group>"; }; F91B7F27092BEB5A00976F6F /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = /System/Library/Frameworks/AddressBook.framework; sourceTree = "<absolute>"; }; @@ -2079,8 +2073,6 @@ CEFA2F110CC0272C002A8262 /* BDSKTag.m */, F98DB3160A23C7730040D347 /* BDSKTemplate.m */, CE95AF160ADBE7C000CB20E7 /* BDSKTemplateObjectProxy.m */, - CE8F83470AFB989B009EE6F9 /* BDSKThreadSafeMutableArray.m */, - F916E68F07A9F9AA009EF011 /* BDSKThreadSafeMutableDictionary.m */, CE8961860CBEB59800EA2D98 /* BDSKToken.m */, F963E42B0A1D7ADD00695DDC /* BDSKTreeNode.m */, CE8961880CBEB59800EA2D98 /* BDSKTypeTemplate.m */, @@ -2449,8 +2441,6 @@ F98AA67F0971E3F400184BD8 /* BDSKTextViewCompletionController.h */, CE518F2509E526E000E97C3A /* BDSKTextViewFindController.h */, F9DCEA4D094B7D1100AEE662 /* BDSKTextWithIconCell.h */, - CE8F83460AFB989B009EE6F9 /* BDSKThreadSafeMutableArray.h */, - F916E68A07A9F9AA009EF011 /* BDSKThreadSafeMutableDictionary.h */, F963E42A0A1D7ADD00695DDC /* BDSKTreeNode.h */, CE8961850CBEB59800EA2D98 /* BDSKToken.h */, 3D86633D0802C25800FF1724 /* BDSKTypeInfoEditor.h */, @@ -3417,7 +3407,6 @@ 3DD300F6075C054D003FD2D7 /* BDSKField.m in Sources */, 3DAEA2EE07703F6000AF111A /* BDSKUndoManager.m in Sources */, F92F4E4F0788DEFC001B8F82 /* BibPref_Files.m in Sources */, - F916E69607A9F9AB009EF011 /* BDSKThreadSafeMutableDictionary.m in Sources */, 2730077E07CF20B500F2E485 /* BDSKBorderlessKeyWindow.m in Sources */, 2730077F07CF20B500F2E485 /* BDSKComplexString.m in Sources */, 2730078107CF20B500F2E485 /* BDSKComplexStringEditor.m in Sources */, @@ -3565,7 +3554,6 @@ F97FA7930AF56FA100C32BBA /* BDSKImageFadeAnimation.m in Sources */, CE602A600AF65A9C000B5680 /* BDSKStringParser.m in Sources */, CE27D95C0AF92BFD00419879 /* BDSKZoomableTextView.m in Sources */, - CE8F83490AFB989C009EE6F9 /* BDSKThreadSafeMutableArray.m in Sources */, CEEFDE010B03ED0200668BB0 /* BDSKScriptGroupSheetController.m in Sources */, CEEFDE030B03ED0200668BB0 /* BDSKURLGroupSheetController.m in Sources */, CEEFE6C20B0403E700668BB0 /* BDSKGroupsArray.m in Sources */, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 04:44:16
|
Revision: 283 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=283&view=rev Author: amaxwell Date: 2008-02-03 20:44:21 -0800 (Sun, 03 Feb 2008) Log Message: ----------- remove category; use newer line height in preparation for string drawing changes in text/icon cell Modified Paths: -------------- trunk/bibdesk/BDSKTextWithIconCell.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/NSTableView_BDSKExtensions.m Removed Paths: ------------- trunk/bibdesk/NSLayoutManager_BDSKExtensions.h trunk/bibdesk/NSLayoutManager_BDSKExtensions.m Modified: trunk/bibdesk/BDSKTextWithIconCell.m =================================================================== --- trunk/bibdesk/BDSKTextWithIconCell.m 2008-02-04 04:39:10 UTC (rev 282) +++ trunk/bibdesk/BDSKTextWithIconCell.m 2008-02-04 04:44:21 UTC (rev 283) @@ -40,7 +40,6 @@ #import "NSFileManager_BDSKExtensions.h" #import "NSImage_BDSKExtensions.h" #import "NSParagraphStyle_BDSKExtensions.h" -#import "NSLayoutManager_BDSKExtensions.h" /* Almost all of this code is copy-and-paste from OATextWithIconCell, except for the text layout (which seems wrong in OATextWithIconCell). */ @@ -244,7 +243,9 @@ NSDivideRect(textRect, &ignored, &textRect, BORDER_BETWEEN_IMAGE_AND_TEXT, rectEdge); \ \ /* this is the main difference from OATextWithIconCell, which ends up with a really weird text baseline for tall cells */\ -float vOffset = 0.5f * (NSHeight(aRect) - [NSLayoutManager defaultViewLineHeightForFont:[self font]]); \ +NSLayoutManager *lm = [[NSLayoutManager alloc] init]; \ +float vOffset = 0.5f * (NSHeight(aRect) - [lm defaultLineHeightForFont:[self font]]); \ +[lm release]; \ \ if (![controlView isFlipped]) \ textRect.origin.y -= vOffset; \ Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 04:39:10 UTC (rev 282) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-04 04:44:21 UTC (rev 283) @@ -207,7 +207,6 @@ CE602A600AF65A9C000B5680 /* BDSKStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = CE602A5F0AF65A9C000B5680 /* BDSKStringParser.m */; }; CE6775170A8506A7003CFC58 /* NSDictionary_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6775150A8506A7003CFC58 /* NSDictionary_BDSKExtensions.m */; }; CE6C04450BEDFA2D007BF0B5 /* NSParagraphStyle_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6C04430BEDFA2D007BF0B5 /* NSParagraphStyle_BDSKExtensions.m */; }; - CE6C04810BEDFC96007BF0B5 /* NSLayoutManager_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6C047F0BEDFC96007BF0B5 /* NSLayoutManager_BDSKExtensions.m */; }; CE6C0CB90BEE4974007BF0B5 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE6C0CB80BEE4974007BF0B5 /* MainMenu.nib */; }; CE6C962C0CD9014A0022D69F /* NSScrollView_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6C962A0CD9014A0022D69F /* NSScrollView_BDSKExtensions.m */; }; CE6DACC50A503ECF00123185 /* OAToolbarItem_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6DACC30A503ECF00123185 /* OAToolbarItem_BDSKExtensions.m */; }; @@ -1027,8 +1026,6 @@ CE6775150A8506A7003CFC58 /* NSDictionary_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NSDictionary_BDSKExtensions.m; sourceTree = "<group>"; }; CE6C04420BEDFA2D007BF0B5 /* NSParagraphStyle_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSParagraphStyle_BDSKExtensions.h; sourceTree = "<group>"; }; CE6C04430BEDFA2D007BF0B5 /* NSParagraphStyle_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSParagraphStyle_BDSKExtensions.m; sourceTree = "<group>"; }; - CE6C047E0BEDFC96007BF0B5 /* NSLayoutManager_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSLayoutManager_BDSKExtensions.h; sourceTree = "<group>"; }; - CE6C047F0BEDFC96007BF0B5 /* NSLayoutManager_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSLayoutManager_BDSKExtensions.m; sourceTree = "<group>"; }; CE6C0CBC0BEE49EE007BF0B5 /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/MainMenu.nib; sourceTree = "<group>"; }; CE6C96290CD9014A0022D69F /* NSScrollView_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSScrollView_BDSKExtensions.h; sourceTree = "<group>"; }; CE6C962A0CD9014A0022D69F /* NSScrollView_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSScrollView_BDSKExtensions.m; sourceTree = "<group>"; }; @@ -1955,7 +1952,6 @@ CE6DACC30A503ECF00123185 /* OAToolbarItem_BDSKExtensions.m */, F947A01B09AA80E4004C27FF /* PDFDocument_BDSKExtensions.m */, CE6C04430BEDFA2D007BF0B5 /* NSParagraphStyle_BDSKExtensions.m */, - CE6C047F0BEDFC96007BF0B5 /* NSLayoutManager_BDSKExtensions.m */, ); name = "AppKit Extensions"; sourceTree = "<group>"; @@ -2505,7 +2501,6 @@ CE3255FD0A1748D0002D6E4C /* NSGeometry_BDSKExtensions.h */, F9022C9C0758038000C3F701 /* NSImage_BDSKExtensions.h */, CE573D2409F6A0300020EC16 /* NSIndexSet_BDSKExtensions.h */, - CE6C047E0BEDFC96007BF0B5 /* NSLayoutManager_BDSKExtensions.h */, F9FD63DA0A61B87800F9871B /* NSMenu_BDSKExtensions.h */, CE8C731C0B0CA6C500E31E5A /* NSObject_BDSKExtensions.h */, CE6C04420BEDFA2D007BF0B5 /* NSParagraphStyle_BDSKExtensions.h */, @@ -3592,7 +3587,6 @@ F9936CC60BC746C300A32DC4 /* BDSKItemSearchIndexes.m in Sources */, F92BACCF0BCBFEE0008D5BC3 /* BDSKSkimReader.m in Sources */, CE6C04450BEDFA2D007BF0B5 /* NSParagraphStyle_BDSKExtensions.m in Sources */, - CE6C04810BEDFC96007BF0B5 /* NSLayoutManager_BDSKExtensions.m in Sources */, F9D0E5370BF92768001C6C22 /* BDSKMODSParser.m in Sources */, CEFD45890BFFC1F80027B933 /* NSWindow+Scripting.m in Sources */, F90B09420C283B5100144F1B /* BDSKLogUtilities.m in Sources */, Deleted: trunk/bibdesk/NSLayoutManager_BDSKExtensions.h =================================================================== --- trunk/bibdesk/NSLayoutManager_BDSKExtensions.h 2008-02-04 04:39:10 UTC (rev 282) +++ trunk/bibdesk/NSLayoutManager_BDSKExtensions.h 2008-02-04 04:44:21 UTC (rev 283) @@ -1,44 +0,0 @@ -// -// NSLayoutManager_BDSKExtensions.h -// Bibdesk -// -// Created by Christiaan Hofman on 5/6/07. -/* - This software is Copyright (c) 2007-2008 - Christiaan Hofman. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Christiaan Hofman nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import <Cocoa/Cocoa.h> - - -@interface NSLayoutManager (BDSKExtensions) -+ (float)defaultViewLineHeightForFont:(NSFont *)theFont; -@end Deleted: trunk/bibdesk/NSLayoutManager_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSLayoutManager_BDSKExtensions.m 2008-02-04 04:39:10 UTC (rev 282) +++ trunk/bibdesk/NSLayoutManager_BDSKExtensions.m 2008-02-04 04:44:21 UTC (rev 283) @@ -1,53 +0,0 @@ -// -// NSLayoutManager_BDSKExtensions.m -// Bibdesk -// -// Created by Christiaan Hofman on 5/6/07. -/* - This software is Copyright (c) 2007-2008 - Christiaan Hofman. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of Christiaan Hofman nor the names of any - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#import "NSLayoutManager_BDSKExtensions.h" - - -@implementation NSLayoutManager (BDSKExtensions) - -+ (float)defaultViewLineHeightForFont:(NSFont *)theFont { - static NSLayoutManager *layoutManager = nil; - if (layoutManager == nil) { - layoutManager = [[NSLayoutManager alloc] init]; - [layoutManager setTypesetterBehavior:NSTypesetterBehavior_10_2_WithCompatibility]; - } - return [layoutManager defaultLineHeightForFont:theFont]; -} - -@end Modified: trunk/bibdesk/NSTableView_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSTableView_BDSKExtensions.m 2008-02-04 04:39:10 UTC (rev 282) +++ trunk/bibdesk/NSTableView_BDSKExtensions.m 2008-02-04 04:44:21 UTC (rev 283) @@ -39,7 +39,6 @@ #import "NSTableView_BDSKExtensions.h" #import "BDSKStringConstants.h" #import "NSBezierPath_BDSKExtensions.h" -#import "NSLayoutManager_BDSKExtensions.h" #import "BDSKFieldEditor.h" #import <OmniAppKit/OAApplication.h> #import <OmniFoundation/OFPreference.h> @@ -200,7 +199,9 @@ font = [NSFont systemFontOfSize:[NSFont systemFontSize]]; [self setFont:font]; - [self setRowHeight:[NSLayoutManager defaultViewLineHeightForFont:font] + 2.0f]; + NSLayoutManager *lm = [[NSLayoutManager alloc] init]; + [self setRowHeight:[lm defaultLineHeightForFont:font] + 2.0f]; + [lm release]; [self tile]; [self reloadData]; // othewise the change isn't immediately visible This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 05:14:42
|
Revision: 284 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=284&view=rev Author: amaxwell Date: 2008-02-03 21:14:45 -0800 (Sun, 03 Feb 2008) Log Message: ----------- simplify cell size and drawing calculations Modified Paths: -------------- trunk/bibdesk/BDSKFileContentSearchController.m trunk/bibdesk/BDSKFileMatcher.m trunk/bibdesk/BDSKMainTableView.m trunk/bibdesk/BDSKTextWithIconCell.h trunk/bibdesk/BDSKTextWithIconCell.m Modified: trunk/bibdesk/BDSKFileContentSearchController.m =================================================================== --- trunk/bibdesk/BDSKFileContentSearchController.m 2008-02-04 04:44:21 UTC (rev 283) +++ trunk/bibdesk/BDSKFileContentSearchController.m 2008-02-04 05:14:45 UTC (rev 284) @@ -103,10 +103,7 @@ BDSKLevelIndicatorCell *cell = [[tableView tableColumnWithIdentifier:@"score"] dataCell]; [cell setEnabled:NO]; // this is required to make it non-editable [cell setMaxHeight:17.0 * 0.7]; - - // set up the image/text cell combination - [(BDSKTextWithIconCell *)[[tableView tableColumnWithIdentifier:@"title"] dataCell] setDrawsHighlight:NO]; - + OBPRECONDITION([[tableView enclosingScrollView] contentView]); [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleClipViewFrameChangedNotification:) Modified: trunk/bibdesk/BDSKFileMatcher.m =================================================================== --- trunk/bibdesk/BDSKFileMatcher.m 2008-02-04 04:44:21 UTC (rev 283) +++ trunk/bibdesk/BDSKFileMatcher.m 2008-02-04 05:14:45 UTC (rev 284) @@ -119,8 +119,6 @@ [outlineView setAutoresizesOutlineColumn:NO]; BDSKTextWithIconCell *titleCell = [[BDSKTextWithIconCell alloc] initTextCell:@""]; - [titleCell setDrawsHighlight:NO]; - [titleCell setImagePosition:NSImageLeft]; [[outlineView tableColumnWithIdentifier:@"title"] setDataCell:titleCell]; [titleCell release]; Modified: trunk/bibdesk/BDSKMainTableView.m =================================================================== --- trunk/bibdesk/BDSKMainTableView.m 2008-02-04 04:44:21 UTC (rev 283) +++ trunk/bibdesk/BDSKMainTableView.m 2008-02-04 05:14:45 UTC (rev 284) @@ -303,11 +303,8 @@ [tc setDataCell:imageCell]; }else if([colName isEqualToString:BDSKLocalFileString] || [colName isEqualToString:BDSKRemoteURLString]){ BDSKTextWithIconCell *textIconCell = [[[BDSKTextWithIconCell alloc] init] autorelease]; - NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; - // Mail.app word wraps its paperclip cell, and BDSKTextWithIconCell ignores setLineBreakMode: - [style setLineBreakMode:NSLineBreakByWordWrapping]; - [textIconCell setParagraphStyle:style]; - [style release]; + // Mail.app word wraps its paperclip cell + [textIconCell setLineBreakMode:NSLineBreakByWordWrapping]; [tc setDataCell:textIconCell]; }else if([colName isRatingField]){ BDSKRatingButtonCell *ratingCell = [[[BDSKRatingButtonCell alloc] initWithMaxRating:5] autorelease]; Modified: trunk/bibdesk/BDSKTextWithIconCell.h =================================================================== --- trunk/bibdesk/BDSKTextWithIconCell.h 2008-02-04 04:44:21 UTC (rev 283) +++ trunk/bibdesk/BDSKTextWithIconCell.h 2008-02-04 05:14:45 UTC (rev 284) @@ -44,26 +44,12 @@ @interface BDSKTextWithIconCell : NSTextFieldCell { NSImage *icon; - NSParagraphStyle *paragraphStyle; - struct { - unsigned int drawsHighlight:1; - unsigned int imagePosition:3; - unsigned int settingUpFieldEditor:1; - } _oaFlags; } // API - (NSImage *)icon; - (void)setIcon:(NSImage *)anIcon; -- (NSCellImagePosition)imagePosition; -- (void)setImagePosition:(NSCellImagePosition)aPosition; - -- (BOOL)drawsHighlight; -- (void)setDrawsHighlight:(BOOL)flag; - -- (void)setParagraphStyle:(NSParagraphStyle *)style; - @end Modified: trunk/bibdesk/BDSKTextWithIconCell.m =================================================================== --- trunk/bibdesk/BDSKTextWithIconCell.m 2008-02-04 04:44:21 UTC (rev 283) +++ trunk/bibdesk/BDSKTextWithIconCell.m 2008-02-04 05:14:45 UTC (rev 284) @@ -39,43 +39,25 @@ #import "NSGeometry_BDSKExtensions.h" #import "NSFileManager_BDSKExtensions.h" #import "NSImage_BDSKExtensions.h" -#import "NSParagraphStyle_BDSKExtensions.h" /* Almost all of this code is copy-and-paste from OATextWithIconCell, except for the text layout (which seems wrong in OATextWithIconCell). */ @implementation BDSKTextWithIconCell -+ (NSParagraphStyle *)paragraphStyle; -{ - return [NSParagraphStyle defaultTruncatingTailParagraphStyle]; -} - // Init and dealloc - (id)init; { if (self = [super initTextCell:@""]) { - [self setImagePosition:NSImageLeft]; [self setEditable:YES]; - [self setDrawsHighlight:YES]; [self setScrollable:YES]; } return self; } -- (id)initWithCoder:(NSCoder *)coder; -{ - if (self = [super initWithCoder:coder]) { - [self setImagePosition:NSImageLeft]; - [self setDrawsHighlight:YES]; - } - return self; -} - - (void)dealloc; { [icon release]; - [paragraphStyle release]; [super dealloc]; } @@ -84,63 +66,22 @@ - (id)copyWithZone:(NSZone *)zone; { BDSKTextWithIconCell *copy = [super copyWithZone:zone]; - copy->icon = [icon retain]; - copy->_oaFlags.drawsHighlight = _oaFlags.drawsHighlight; - copy->paragraphStyle = [paragraphStyle retain]; - return copy; } -- (NSParagraphStyle *)paragraphStyle; -{ - return (nil == paragraphStyle) ? [[self class] paragraphStyle] : paragraphStyle; -} - -- (void)setParagraphStyle:(NSParagraphStyle *)style; -{ - if (paragraphStyle != style) { - [paragraphStyle release]; - paragraphStyle = [style copy]; - } -} - -- (NSColor *)highlightColorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView; -{ - NSColor *color = nil; - if (_oaFlags.drawsHighlight) - color = [super highlightColorWithFrame:cellFrame inView:controlView]; - return color; -} - -- (NSColor *)textColor; -{ - NSColor *color = nil; - - // this allows the expansion tooltips on 10.5 to draw with the correct color -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 - // on 10.5, we can just check background style instead of messing around with flags and checking the highlight color, which accounts for much of the code in this class -#warning 10.5 fixme -#endif - if ([self respondsToSelector:@selector(backgroundStyle)]) { - NSBackgroundStyle style = [self backgroundStyle]; - if (NSBackgroundStyleLight == style) - return (!_oaFlags.drawsHighlight && _cFlags.highlighted) ? [NSColor textBackgroundColor] : [NSColor blackColor]; - } - - if (_oaFlags.settingUpFieldEditor) - color = [NSColor blackColor]; - else if (!_oaFlags.drawsHighlight && _cFlags.highlighted) - color = [NSColor textBackgroundColor]; - else - color = [super textColor]; - return color; -} - #define BORDER_BETWEEN_EDGE_AND_IMAGE (2.0) #define BORDER_BETWEEN_IMAGE_AND_TEXT (3.0) #define SIZE_OF_TEXT_FIELD_BORDER (1.0) +- (NSRect)iconRectForBounds:(NSRect)cellFrame +{ + NSRect unused, imageRect; + NSDivideRect(cellFrame, &unused, &imageRect, BORDER_BETWEEN_EDGE_AND_IMAGE, NSMinXEdge); + NSDivideRect(imageRect, &imageRect, &unused, NSHeight(cellFrame), NSMinXEdge); + return imageRect; +} + - (NSSize)cellSize; { NSSize cellSize = [super cellSize]; @@ -217,90 +158,27 @@ } } -#define _calculateDrawingRectsAndSizes \ -NSRectEdge rectEdge; \ -NSSize imageSize; \ -\ -if (_oaFlags.imagePosition == NSImageLeft) { \ - rectEdge = NSMinXEdge; \ - imageSize = NSMakeSize(NSHeight(aRect) - 1, NSHeight(aRect) - 1); \ -} else { \ - rectEdge = NSMaxXEdge; \ - if (icon == nil) \ - imageSize = NSZeroSize; \ - else \ - imageSize = [icon size]; \ -} \ -\ -NSRect cellFrame = aRect, ignored; \ -if (imageSize.width > 0) \ -NSDivideRect(cellFrame, &ignored, &cellFrame, BORDER_BETWEEN_EDGE_AND_IMAGE, rectEdge); \ -\ -NSRect imageRect, textRect; \ -NSDivideRect(cellFrame, &imageRect, &textRect, imageSize.width, rectEdge); \ -\ -if (imageSize.width > 0) \ -NSDivideRect(textRect, &ignored, &textRect, BORDER_BETWEEN_IMAGE_AND_TEXT, rectEdge); \ -\ -/* this is the main difference from OATextWithIconCell, which ends up with a really weird text baseline for tall cells */\ -NSLayoutManager *lm = [[NSLayoutManager alloc] init]; \ -float vOffset = 0.5f * (NSHeight(aRect) - [lm defaultLineHeightForFont:[self font]]); \ -[lm release]; \ -\ -if (![controlView isFlipped]) \ -textRect.origin.y -= vOffset; \ -else \ -textRect.origin.y += vOffset; \ +- (NSRect)textRectForBounds:(NSRect)aRect +{ + NSRect textRect, ignored, iconRect = [self iconRectForBounds:aRect]; + NSDivideRect(aRect, &ignored, &textRect, NSWidth(iconRect) + BORDER_BETWEEN_IMAGE_AND_TEXT, NSMinXEdge); + return textRect; +} - (void)drawInteriorWithFrame:(NSRect)aRect inView:(NSView *)controlView; { - _calculateDrawingRectsAndSizes; + NSRect textRect = [self textRectForBounds:aRect]; +#warning text color in gradient tables + [super drawInteriorWithFrame:textRect inView:controlView]; - NSDivideRect(textRect, &ignored, &textRect, SIZE_OF_TEXT_FIELD_BORDER, NSMinXEdge); - textRect = NSInsetRect(textRect, 1.0f, 0.0); - - // Draw the text - NSMutableAttributedString *label = [[NSMutableAttributedString alloc] initWithAttributedString:[self attributedStringValue]]; - NSRange labelRange = NSMakeRange(0, [label length]); - NSColor *highlightColor = [self highlightColorWithFrame:cellFrame inView:controlView]; - BOOL highlighted = [self isHighlighted]; - - if (highlighted && [highlightColor isEqual:[NSColor alternateSelectedControlColor]]) { - // add the alternate text color attribute. - [label addAttribute:NSForegroundColorAttributeName value:[NSColor alternateSelectedControlTextColor] range:labelRange]; - } else { - // when using an attributed string from setObjectValue:, -textColor isn't called, even though we need it for the highlight drawing - [label addAttribute:NSForegroundColorAttributeName value:[self textColor] range:labelRange]; - } - - [label addAttribute:NSParagraphStyleAttributeName value:[self paragraphStyle] range:labelRange]; - [label drawInRect:textRect]; - [label release]; - // Draw the image - imageRect = BDSKCenterRect(imageRect, imageSize, [controlView isFlipped]); - [self drawIconWithFrame:imageRect inView:controlView]; + [self drawIconWithFrame:[self iconRectForBounds:aRect] inView:controlView]; } -- (BOOL)trackMouse:(NSEvent *)theEvent inRect:(NSRect)cellFrame ofView:(NSView *)controlView untilMouseUp:(BOOL)flag; -{ - return [super trackMouse:theEvent inRect:cellFrame ofView:controlView untilMouseUp:flag]; -} - -- (void)editWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject event:(NSEvent *)theEvent; -{ - _oaFlags.settingUpFieldEditor = YES; - [super editWithFrame:aRect inView:controlView editor:textObj delegate:anObject event:theEvent]; - _oaFlags.settingUpFieldEditor = NO; -} - - (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(int)selStart length:(int)selLength; { - _calculateDrawingRectsAndSizes; - _oaFlags.settingUpFieldEditor = YES; - [super selectWithFrame:textRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength]; - _oaFlags.settingUpFieldEditor = NO; + [super selectWithFrame:[self textRectForBounds:aRect] inView:controlView editor:textObj delegate:anObject start:selStart length:selLength]; } - (void)setObjectValue:(id <NSCopying>)obj; @@ -324,40 +202,16 @@ icon = [anIcon retain]; } -- (NSCellImagePosition)imagePosition; -{ - return _oaFlags.imagePosition; -} - -- (void)setImagePosition:(NSCellImagePosition)aPosition; -{ - _oaFlags.imagePosition = aPosition; -} - -- (BOOL)drawsHighlight; -{ - return _oaFlags.drawsHighlight; -} - -- (void)setDrawsHighlight:(BOOL)flag; -{ - _oaFlags.drawsHighlight = flag; -} - @end @implementation BDSKFilePathCell -+ (NSParagraphStyle *)paragraphStyle; -{ - return [NSParagraphStyle defaultTruncatingMiddleParagraphStyle]; -} - - (id)init; { if (self = [super init]) { [self setDisplayType:1]; + [self setLineBreakMode:NSLineBreakByTruncatingMiddle]; } return self; } @@ -366,6 +220,7 @@ { if (self = [super initWithCoder:coder]) { [self setDisplayType:1]; + [self setLineBreakMode:NSLineBreakByTruncatingMiddle]; } return self; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 05:18:17
|
Revision: 285 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=285&view=rev Author: amaxwell Date: 2008-02-03 21:18:23 -0800 (Sun, 03 Feb 2008) Log Message: ----------- add some sanity checks and ensure that pointers are initialized in formatters Modified Paths: -------------- trunk/bibdesk/BDSKCharacterConversion.m trunk/bibdesk/BDSKCrossrefFormatter.m trunk/bibdesk/BDSKFieldEditor.m trunk/bibdesk/BDSKFieldNameFormatter.m trunk/bibdesk/BDSKFormatParser.m trunk/bibdesk/BDSKMacroWindowController.m trunk/bibdesk/BDSKTextViewCompletionController.m trunk/bibdesk/BDSKTypeNameFormatter.m Modified: trunk/bibdesk/BDSKCharacterConversion.m =================================================================== --- trunk/bibdesk/BDSKCharacterConversion.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKCharacterConversion.m 2008-02-04 05:18:23 UTC (rev 285) @@ -427,9 +427,10 @@ partialString = [partialString precomposedStringWithCanonicalMapping]; if([partialString length] > 1){ - if([partialString length] > 1) + if([partialString length] > 1) { + *partialStringPtr = nil; if(error) *error = NSLocalizedString(@"Only single characters are allowed", @"Error description"); - else + }else *partialStringPtr = partialString; return NO; } Modified: trunk/bibdesk/BDSKCrossrefFormatter.m =================================================================== --- trunk/bibdesk/BDSKCrossrefFormatter.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKCrossrefFormatter.m 2008-02-04 05:18:23 UTC (rev 285) @@ -58,6 +58,8 @@ NSCharacterSet *invalidSet = [[BDSKTypeManager sharedManager] invalidCharactersForField:BDSKCiteKeyString inFileType:BDSKBibtexString]; NSRange r = [partialString rangeOfCharacterFromSet:invalidSet]; if ( r.location != NSNotFound) { + // formatter will remove the last character typed + *newString = nil; if(error) *error = [NSString stringWithFormat:NSLocalizedString(@"The character \"%@\" is not allowed in a BibTeX cite key.", @"Error description"), [partialString substringWithRange:r]]; return NO; }else Modified: trunk/bibdesk/BDSKFieldEditor.m =================================================================== --- trunk/bibdesk/BDSKFieldEditor.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKFieldEditor.m 2008-02-04 05:18:23 UTC (rev 285) @@ -292,9 +292,9 @@ NSArray *completions = nil; if([delegate respondsToSelector:delegateSEL]) - completions = [delegate control:delegate textView:self completions:nil forPartialWordRange:[self rangeForUserCompletion] indexOfSelectedItem:idx]; + completions = [delegate control:delegate textView:self completions:nil forPartialWordRange:charRange indexOfSelectedItem:idx]; else if([[[self window] delegate] respondsToSelector:delegateSEL]) - completions = [[[self window] delegate] control:delegate textView:self completions:nil forPartialWordRange:[self rangeForUserCompletion] indexOfSelectedItem:idx]; + completions = [[[self window] delegate] control:delegate textView:self completions:nil forPartialWordRange:charRange indexOfSelectedItem:idx]; // Default is to call -[NSSpellChecker completionsForPartialWordRange:inString:language:inSpellDocumentWithTag:], but this apparently sends a DO message to CocoAspell (in a separate process), and we block the main runloop until it returns a long time later. Lacking a way to determine whether the system speller (which works fine) or CocoAspell is in use, we'll just return our own completions. return completions; Modified: trunk/bibdesk/BDSKFieldNameFormatter.m =================================================================== --- trunk/bibdesk/BDSKFieldNameFormatter.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKFieldNameFormatter.m 2008-02-04 05:18:23 UTC (rev 285) @@ -81,6 +81,7 @@ NSRange r = [partialString rangeOfCharacterFromSet:[[BDSKTypeManager sharedManager] invalidFieldNameCharacterSetForFileType:BDSKBibtexString]]; if ( r.location != NSNotFound || ([partialString length] && [[NSCharacterSet decimalDigitCharacterSet] characterIsMember:[partialString characterAtIndex:0]]) ) { + *newString = nil; if (error) *error = NSLocalizedString(@"The first character must not be a digit", @"field name warning"); return NO; // BibTeX chokes if the first character of a field name is a digit } Modified: trunk/bibdesk/BDSKFormatParser.m =================================================================== --- trunk/bibdesk/BDSKFormatParser.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKFormatParser.m 2008-02-04 05:18:23 UTC (rev 285) @@ -162,14 +162,14 @@ if (i > 0) { [parsedStr appendString:authSep]; } - string = [self stringByStrictlySanitizingString:[[authArray objectAtIndex:isLast ? [authArray count] - numAuth + i : i] lastName] forField:fieldName inFileType:[pub fileType]]; + NSString *authName = [self stringByStrictlySanitizingString:[[authArray objectAtIndex:isLast ? [authArray count] - numAuth + i : i] lastName] forField:fieldName inFileType:[pub fileType]]; if (isLocalFile) { - string = [string stringByReplacingCharactersInSet:slashCharSet withString:@"-"]; + authName = [authName stringByReplacingCharactersInSet:slashCharSet withString:@"-"]; } - if ([string length] > numChars && numChars > 0) { - string = [string substringToIndex:numChars]; + if ([authName length] > numChars && numChars > 0) { + authName = [authName substringToIndex:numChars]; } - [parsedStr appendString:string]; + [parsedStr appendString:authName]; } if (numAuth < [authArray count]) { [parsedStr appendString:etal]; @@ -233,18 +233,18 @@ [parsedStr appendString:authSep]; } BibAuthor *auth = [authArray objectAtIndex:isLast ? [authArray count] - numAuth + i : i]; - NSString *firstName = [self stringByStrictlySanitizingString:[auth firstName] forField:fieldName inFileType:[pub fileType]]; + NSString *authName; + NSString *firstName = [self stringByStrictlySanitizingString:[auth firstName] forField:fieldName inFileType:[pub fileType]]; NSString *lastName = [self stringByStrictlySanitizingString:[auth lastName] forField:fieldName inFileType:[pub fileType]]; if ([firstName length] > 0) { - string = [NSString stringWithFormat:@"%@%@%C", - lastName, nameSep, [firstName characterAtIndex:0]]; + authName = [NSString stringWithFormat:@"%@%@%C", lastName, nameSep, [firstName characterAtIndex:0]]; } else { - string = lastName; + authName = lastName; } if (isLocalFile) { - string = [string stringByReplacingCharactersInSet:slashCharSet withString:@"-"]; + authName = [authName stringByReplacingCharactersInSet:slashCharSet withString:@"-"]; } - [parsedStr appendString:string]; + [parsedStr appendString:authName]; } if (numAuth < [authArray count]) { [parsedStr appendString:etal]; @@ -257,15 +257,17 @@ unsigned int numChars = 0; NSString *title = [pub title]; title = [self stringByStrictlySanitizingString:title forField:fieldName inFileType:[pub fileType]]; - if (isLocalFile) { - title = [title stringByReplacingCharactersInSet:slashCharSet withString:@"-"]; - } - if (NO == [scanner scanUnsignedInt:&numChars]) numChars = 0; - if (numChars > 0 && [title length] > numChars) { - [parsedStr appendString:[title substringToIndex:numChars]]; - } else { - [parsedStr appendString:title]; - } + if ([NSString isEmptyString:title] == NO) { + if (isLocalFile) { + title = [title stringByReplacingCharactersInSet:slashCharSet withString:@"-"]; + } + if (NO == [scanner scanUnsignedInt:&numChars]) numChars = 0; + if (numChars > 0 && [title length] > numChars) { + [parsedStr appendString:[title substringToIndex:numChars]]; + } else { + [parsedStr appendString:title]; + } + } break; } case 'T': @@ -283,7 +285,7 @@ [scanner scanString:@"]" intoString:NULL]; } if (NO == [scanner scanUnsignedInt:&numWords]) numWords = 0; - if (title != nil) { + if ([NSString isEmptyString:title] == NO) { NSMutableArray *words = [NSMutableArray array]; NSString *word; // split the title into words using the same methodology as addString:forCompletionEntry: @@ -374,12 +376,12 @@ NSString *keywordsString = [pub stringValueOfField:BDSKKeywordsString]; unsigned int i, numWords = 0; if (NO == [scanner scanUnsignedInt:&numWords]) numWords = 0; - if (keywordsString != nil) { + if ([NSString isEmptyString:keywordsString] == NO) { NSMutableArray *keywords = [NSMutableArray array]; NSString *keyword; // split the keyword string using the same methodology as addString:forCompletionEntry:, treating ,:; as possible dividers NSCharacterSet *sepCharSet = [[BDSKTypeManager sharedManager] separatorCharacterSetForField:BDSKKeywordsString]; - NSRange keywordPunctuationRange = [string rangeOfCharacterFromSet:sepCharSet]; + NSRange keywordPunctuationRange = [keywordsString rangeOfCharacterFromSet:sepCharSet]; if (keywordPunctuationRange.location != NSNotFound) { NSScanner *wordScanner = [NSScanner scannerWithString:keywordsString]; [wordScanner setCharactersToBeSkipped:nil]; @@ -393,10 +395,10 @@ [keywords addObject:keywordsString]; } for (i = 0; i < [keywords count] && (numWords == 0 || i < numWords); i++) { - keyword = [[keywords objectAtIndex:i] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; + keyword = [[keywords objectAtIndex:i] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; keyword = [self stringByStrictlySanitizingString:keyword forField:fieldName inFileType:[pub fileType]]; if (NO == [slash isEqualToString:@"/"]) - keyword = [string stringByReplacingCharactersInSet:slashCharSet withString:slash]; + keyword = [keyword stringByReplacingCharactersInSet:slashCharSet withString:slash]; [parsedStr appendString:keyword]; } } @@ -490,7 +492,7 @@ } else { value = [pub stringValueOfField:key]; } - if (value != nil) { + if ([NSString isEmptyString:value] == NO) { value = [self stringByStrictlySanitizingString:value forField:fieldName inFileType:[pub fileType]]; if (NO == [slash isEqualToString:@"/"]) value = [value stringByReplacingCharactersInSet:slashCharSet withString:slash]; @@ -557,7 +559,7 @@ if (NO == [scanner scanUnsignedInt:&numChars]) numChars = 0; intValue = [pub intValueOfField:key]; value = (intValue == 0 ? noValue : (intValue == 1 ? yesValue : mixedValue)); - if (numChars > 0 && [string length] > numChars) { + if (numChars > 0 && [value length] > numChars) { [parsedStr appendString:[value substringToIndex:numChars]]; } else { [parsedStr appendString:value]; @@ -580,7 +582,7 @@ if (NO == [scanner scanUnsignedInt:&numChars]) numChars = 0; value = [pub documentInfoForKey:key]; - if (value != nil) { + if ([NSString isEmptyString:value] == NO) { value = [self stringByStrictlySanitizingString:value forField:fieldName inFileType:[pub fileType]]; if (numChars > 0 && [value length] > numChars) { [parsedStr appendString:[value substringToIndex:numChars]]; Modified: trunk/bibdesk/BDSKMacroWindowController.m =================================================================== --- trunk/bibdesk/BDSKMacroWindowController.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKMacroWindowController.m 2008-02-04 05:18:23 UTC (rev 285) @@ -728,6 +728,7 @@ if( [partialString containsCharacterInSet:invalidMacroCharSet] || ([partialString length] && [[NSCharacterSet decimalDigitCharacterSet] characterIsMember:[partialString characterAtIndex:0]]) ){ + *partialStringPtr = nil; return NO; } *partialStringPtr = [partialString lowercaseString]; Modified: trunk/bibdesk/BDSKTextViewCompletionController.m =================================================================== --- trunk/bibdesk/BDSKTextViewCompletionController.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKTextViewCompletionController.m 2008-02-04 05:18:23 UTC (rev 285) @@ -301,9 +301,10 @@ int idx = -1; NSArray *newCompletions = nil; + // may return { NSNotFound, 0 } NSRange charRange = [textView rangeForUserCompletion]; - if([[textView string] isEqualToString:@""] == NO && [[textView string] length] >= NSMaxRange(charRange)) + if(NSNotFound != charRange.location && [[textView string] isEqualToString:@""] == NO && [[textView string] length] >= NSMaxRange(charRange)) newCompletions = [textView completionsForPartialWordRange:charRange indexOfSelectedItem:&idx]; // if there are no completions, we should go away in order to avoid catching keystrokes when the completion window isn't visible; if the textview/delegate come up with a new list of completions, we'll be redisplayed anyway Modified: trunk/bibdesk/BDSKTypeNameFormatter.m =================================================================== --- trunk/bibdesk/BDSKTypeNameFormatter.m 2008-02-04 05:14:45 UTC (rev 284) +++ trunk/bibdesk/BDSKTypeNameFormatter.m 2008-02-04 05:18:23 UTC (rev 285) @@ -69,8 +69,11 @@ newEditingString:(NSString **)newString errorDescription:(NSString **)error{ NSRange r = [partialString rangeOfCharacterFromSet:[[BDSKTypeManager sharedManager] invalidFieldNameCharacterSetForFileType:BDSKBibtexString]]; - if ( r.location != NSNotFound) + if ( r.location != NSNotFound) { + // formatter will delete the last character entered + *newString = nil; return NO; + } r = [partialString rangeOfCharacterFromSet:[NSCharacterSet uppercaseLetterCharacterSet]]; if ( r.location != NSNotFound) { // this is a BibDesk requirement, since we expect type names to be lowercase This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 18:13:44
|
Revision: 288 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=288&view=rev Author: amaxwell Date: 2008-02-04 09:29:41 -0800 (Mon, 04 Feb 2008) Log Message: ----------- remove unused local variables Modified Paths: -------------- trunk/bibdesk/BDSKPreviewer.m trunk/bibdesk/BibDocument.m Modified: trunk/bibdesk/BDSKPreviewer.m =================================================================== --- trunk/bibdesk/BDSKPreviewer.m 2008-02-04 17:29:08 UTC (rev 287) +++ trunk/bibdesk/BDSKPreviewer.m 2008-02-04 17:29:41 UTC (rev 288) @@ -305,7 +305,6 @@ NSString *message = nil; NSString *logString = @""; NSData *pdfData = nil; - NSAttributedString *attrString = nil; static NSData *emptyMessagePDFData = nil; static NSData *generatingMessagePDFData = nil; Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2008-02-04 17:29:08 UTC (rev 287) +++ trunk/bibdesk/BibDocument.m 2008-02-04 17:29:41 UTC (rev 288) @@ -2982,7 +2982,6 @@ } // the pdflatex generated preview - int displayType = [[OFPreferenceWrapper sharedPreferenceWrapper] integerForKey:BDSKPreviewDisplayKey]; NSView *view = (NSView *)previewerBox; if(currentPreviewView != view){ [view setFrame:[currentPreviewView frame]]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 18:14:19
|
Revision: 287 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=287&view=rev Author: amaxwell Date: 2008-02-04 09:29:08 -0800 (Mon, 04 Feb 2008) Log Message: ----------- bring in some fixes from BibDesk trunk Modified Paths: -------------- trunk/bibdesk/BDSKBibTeXParser.m trunk/bibdesk/BDSKFormatParser.h trunk/bibdesk/BDSKFormatParser.m trunk/bibdesk/BDSKLinkedFile.m Modified: trunk/bibdesk/BDSKBibTeXParser.m =================================================================== --- trunk/bibdesk/BDSKBibTeXParser.m 2008-02-04 05:19:27 UTC (rev 286) +++ trunk/bibdesk/BDSKBibTeXParser.m 2008-02-04 17:29:08 UTC (rev 287) @@ -393,8 +393,6 @@ if([scanner scanUpToCharactersFromSet:bracesQuotesAndCommaCharSet intoString:&s]) [value appendString:s]; if([scanner scanCharacter:&ch] == NO) break; - if([stringContents characterAtIndex:[scanner scanLocation] - 2] != '\\'){ - // we found an unquoted brace if(ch == '{'){ if(nesting == 1) quoted = NO; @@ -413,7 +411,6 @@ if(nesting == 1) endOfValue = YES; } - } if (endOfValue == NO) // we don't include the outer braces or the separating commas [value appendCharacter:ch]; } @@ -493,7 +490,6 @@ if([scanner scanUpToCharactersFromSet:bracesAndQuotesCharSet intoString:&s]) [value appendString:s]; if([scanner scanCharacter:&ch] == NO) break; - if([styleContents characterAtIndex:[scanner scanLocation] - 2] != '\\'){ // we found an unquoted brace if(ch == '{'){ if(nesting == 1) @@ -508,7 +504,6 @@ }else if(quoted && nesting == 2) --nesting; } - } if (nesting > 0) // we don't include the outer braces [value appendFormat:@"%C",ch]; } Modified: trunk/bibdesk/BDSKFormatParser.h =================================================================== --- trunk/bibdesk/BDSKFormatParser.h 2008-02-04 05:19:27 UTC (rev 286) +++ trunk/bibdesk/BDSKFormatParser.h 2008-02-04 17:29:08 UTC (rev 287) @@ -49,8 +49,6 @@ - (int)intValueOfField:(NSString *)field; - (NSArray *)peopleArrayForField:(NSString *)field; - (NSURL *)localFileURLForField:(NSString *)field; -- (NSString *)basePath; -- (NSString *)documentInfoForKey:(NSString *)key; - (BOOL)isValidCiteKey:(NSString *)key; - (BOOL)isValidLocalFilePath:(NSString *)key; - (id<BDSKOwner>)owner; Modified: trunk/bibdesk/BDSKFormatParser.m =================================================================== --- trunk/bibdesk/BDSKFormatParser.m 2008-02-04 05:19:27 UTC (rev 286) +++ trunk/bibdesk/BDSKFormatParser.m 2008-02-04 17:29:08 UTC (rev 287) @@ -460,7 +460,7 @@ case 'b': { // document filename - NSString *filename = [pub basePath]; + NSString *filename = [[[[[pub owner] fileURL] path] lastPathComponent] stringByDeletingPathExtension]; if (filename != nil) { filename = [self stringBySanitizingString:filename forField:fieldName inFileType:[pub fileType]]; [parsedStr appendString:filename]; @@ -581,7 +581,7 @@ [scanner scanString:@"}" intoString:NULL]) { if (NO == [scanner scanUnsignedInt:&numChars]) numChars = 0; - value = [pub documentInfoForKey:key]; + value = [[pub owner] documentInfoForKey:key]; if ([NSString isEmptyString:value] == NO) { value = [self stringByStrictlySanitizingString:value forField:fieldName inFileType:[pub fileType]]; if (numChars > 0 && [value length] > numChars) { Modified: trunk/bibdesk/BDSKLinkedFile.m =================================================================== --- trunk/bibdesk/BDSKLinkedFile.m 2008-02-04 05:19:27 UTC (rev 286) +++ trunk/bibdesk/BDSKLinkedFile.m 2008-02-04 17:29:08 UTC (rev 287) @@ -388,8 +388,7 @@ - (id)copyWithZone:(NSZone *)aZone { - // or should this be a real copy, as it is mutable? - return [self retain]; + return [[[self class] allocWithZone:aZone] initWithAliasData:[self aliasDataRelativeToPath:[delegate basePathForLinkedFile:self]] relativePath:relativePath delegate:delegate]; } // Should we implement -isEqual: and -hash? @@ -480,7 +479,7 @@ - (NSURL *)URL; { BOOL hadFileRef = fileRef != NULL; - CFURLRef aURL = hadFileRef ? CFURLCreateFromFSRef(NULL, fileRef) : NULL; + CFURLRef aURL = (hadFileRef || [self fileRef]) ? CFURLCreateFromFSRef(NULL, fileRef) : NULL; if (aURL == NULL && hadFileRef) { // fileRef was invalid, try to update it @@ -625,7 +624,7 @@ - (id)copyWithZone:(NSZone *)aZone { - return [[[self class] alloc] initWithURL:URL delegate:nil]; + return [[[self class] allocWithZone:aZone] initWithURL:URL delegate:nil]; } - (id)initWithCoder:(NSCoder *)coder This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 21:31:41
|
Revision: 291 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=291&view=rev Author: amaxwell Date: 2008-02-04 13:31:45 -0800 (Mon, 04 Feb 2008) Log Message: ----------- get rid of init/release Modified Paths: -------------- trunk/bibdesk/BDSKCategoryGroup.m trunk/bibdesk/BDSKComplexString.m trunk/bibdesk/BDSKEditor.m trunk/bibdesk/BDSKGroup.m trunk/bibdesk/BDSKLinkedFile.m trunk/bibdesk/BDSKMARCParser.m trunk/bibdesk/BDSKSearchBookmarkController.m trunk/bibdesk/BDSKStaticGroup.m trunk/bibdesk/BDSKStringNode.m trunk/bibdesk/BibAuthor.m trunk/bibdesk/BibItem.m trunk/bibdesk/NSAttributedString_BDSKExtensions.h trunk/bibdesk/NSAttributedString_BDSKExtensions.m trunk/bibdesk/NSDate_BDSKExtensions.m trunk/bibdesk/NSDictionary_BDSKExtensions.m trunk/bibdesk/NSError_BDSKExtensions.m trunk/bibdesk/NSMenu_BDSKExtensions.m trunk/bibdesk/NSSet_BDSKExtensions.m Modified: trunk/bibdesk/BDSKCategoryGroup.m =================================================================== --- trunk/bibdesk/BDSKCategoryGroup.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKCategoryGroup.m 2008-02-04 21:31:45 UTC (rev 291) @@ -65,7 +65,7 @@ - (id)initEmptyGroupWithKey:(NSString *)aKey count:(int)aCount { NSZone *zone = [self zone]; - [[super init] release]; + [self release]; id aName = ([aKey isPersonField]) ? [BibAuthor emptyAuthor] : @""; return [[BDSKEmptyGroup allocWithZone:zone] initWithName:aName key:aKey count:aCount]; } Modified: trunk/bibdesk/BDSKComplexString.m =================================================================== --- trunk/bibdesk/BDSKComplexString.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKComplexString.m 2008-02-04 21:31:45 UTC (rev 291) @@ -139,7 +139,7 @@ } - (id)init{ - [[super init] release]; + [self release]; return self = [@"" retain]; } @@ -217,7 +217,7 @@ macroResolver = [BDSKComplexString macroResolverForUnarchiving]; } } else { - [[super init] release]; + [self release]; self = [[NSKeyedUnarchiver unarchiveObjectWithData:[coder decodeDataObject]] retain]; } return self; @@ -490,13 +490,13 @@ } - (id)initWithNodes:(NSArray *)nodesArray macroResolver:(BDSKMacroResolver *)theMacroResolver{ - [[self init] release]; + [self release]; self = [[BDSKComplexString alloc] initWithNodes:nodesArray macroResolver:theMacroResolver]; return self; } - (id)initWithInheritedValue:(NSString *)aValue{ - [[self init] release]; + [self release]; self = [[BDSKComplexString alloc] initWithInheritedValue:aValue]; return self; } @@ -507,7 +507,7 @@ // used for correct zoning NSZone *theZone = [self zone]; // we will return another object - [[self init] release]; + [self release]; if([btstring length] == 0){ // if the string was whitespace only, it becomes empty. Modified: trunk/bibdesk/BDSKEditor.m =================================================================== --- trunk/bibdesk/BDSKEditor.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKEditor.m 2008-02-04 21:31:45 UTC (rev 291) @@ -142,7 +142,7 @@ // implement NSCoding because we might be encoded as the delegate of some menus // mainly for the toolbar popups in a customization palette - (id)initWithCoder:(NSCoder *)decoder{ - [[self init] release]; + [self release]; self = nil; return nil; } Modified: trunk/bibdesk/BDSKGroup.m =================================================================== --- trunk/bibdesk/BDSKGroup.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKGroup.m 2008-02-04 21:31:45 UTC (rev 291) @@ -57,7 +57,7 @@ - (id)initLibraryGroup { NSZone *zone = [self zone]; - [[super init] release]; + [self release]; self = [[BDSKLibraryGroup allocWithZone:zone] init]; return self; } Modified: trunk/bibdesk/BDSKLinkedFile.m =================================================================== --- trunk/bibdesk/BDSKLinkedFile.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKLinkedFile.m 2008-02-04 21:31:45 UTC (rev 291) @@ -292,7 +292,7 @@ OBASSERT(nil == aDelegate || [aDelegate respondsToSelector:@selector(basePathForLinkedFile:)]); if (anAlias == NULL) { - [[super init] release]; + [self release]; self = nil; } else if (self = [super init]) { fileRef = NULL; // this is updated lazily, as we don't know the base path at this point Modified: trunk/bibdesk/BDSKMARCParser.m =================================================================== --- trunk/bibdesk/BDSKMARCParser.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKMARCParser.m 2008-02-04 21:31:45 UTC (rev 291) @@ -461,7 +461,7 @@ - (id)initWithXMLString:(NSString *)aString{ NSData *data = [aString dataUsingEncoding:NSUTF8StringEncoding]; if(data == nil){ - [[super init] release]; + [self release]; self = nil; }else if(self = [super initWithData:data]){ returnArray = [[NSMutableArray alloc] initWithCapacity:10]; Modified: trunk/bibdesk/BDSKSearchBookmarkController.m =================================================================== --- trunk/bibdesk/BDSKSearchBookmarkController.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKSearchBookmarkController.m 2008-02-04 21:31:45 UTC (rev 291) @@ -545,7 +545,7 @@ } - (id)init { - [[super init] release]; + [self release]; return nil; } Modified: trunk/bibdesk/BDSKStaticGroup.m =================================================================== --- trunk/bibdesk/BDSKStaticGroup.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKStaticGroup.m 2008-02-04 21:31:45 UTC (rev 291) @@ -57,7 +57,7 @@ - (id)initWithLastImport:(NSArray *)array { NSZone *zone = [self zone]; - [[super init] release]; + [self release]; self = [[BDSKLastImportGroup allocWithZone:zone] initWithName:BDSKLastImportLocalizedString publications:array]; return self; } Modified: trunk/bibdesk/BDSKStringNode.m =================================================================== --- trunk/bibdesk/BDSKStringNode.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BDSKStringNode.m 2008-02-04 21:31:45 UTC (rev 291) @@ -97,7 +97,7 @@ value = [[coder decodeObjectForKey:@"value"] retain]; } } else { - [[super init] release]; + [self release]; self = [[NSKeyedUnarchiver unarchiveObjectWithData:[coder decodeDataObject]] retain]; } return self; Modified: trunk/bibdesk/BibAuthor.m =================================================================== --- trunk/bibdesk/BibAuthor.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BibAuthor.m 2008-02-04 21:31:45 UTC (rev 291) @@ -154,7 +154,7 @@ // this should take care of the rest of the ivars [self splitName:[coder decodeObjectForKey:@"name"]]; } else { - [[super init] release]; + [self release]; self = [[NSKeyedUnarchiver unarchiveObjectWithData:[coder decodeDataObject]] retain]; } return self; Modified: trunk/bibdesk/BibItem.m =================================================================== --- trunk/bibdesk/BibItem.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/BibItem.m 2008-02-04 21:31:45 UTC (rev 291) @@ -339,7 +339,7 @@ identifierURL = createUniqueURL(); } } else { - [[super init] release]; + [self release]; self = [[NSKeyedUnarchiver unarchiveObjectWithData:[coder decodeDataObject]] retain]; } return self; Modified: trunk/bibdesk/NSAttributedString_BDSKExtensions.h =================================================================== --- trunk/bibdesk/NSAttributedString_BDSKExtensions.h 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/NSAttributedString_BDSKExtensions.h 2008-02-04 21:31:45 UTC (rev 291) @@ -45,8 +45,6 @@ - (id)initWithTeXString:(NSString *)string attributes:(NSDictionary *)attributes collapseWhitespace:(BOOL)collapse; -- (NSRect)boundingRectForDrawingInViewWithSize:(NSSize)size; - @end @interface NSAttributedString (TeXComparison) Modified: trunk/bibdesk/NSAttributedString_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSAttributedString_BDSKExtensions.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/NSAttributedString_BDSKExtensions.m 2008-02-04 21:31:45 UTC (rev 291) @@ -159,7 +159,7 @@ if (numberOfDictionaries > 0) { // discard the result of +alloc, since we're going to create a new object - [[self init] release]; + [self release]; // set the attributed string up with default attributes, after parsing and fixing the mutable string mas = [[NSMutableAttributedString alloc] initWithString:mutableString attributes:attributes]; @@ -187,7 +187,7 @@ } - (id)initWithAttributedString:(NSAttributedString *)attributedString attributes:(NSDictionary *)attributes { - [[self init] release]; + [self release]; NSMutableAttributedString *tmpStr = [attributedString mutableCopy]; unsigned idx = 0, length = [attributedString length]; NSRange range = NSMakeRange(0, length); @@ -206,27 +206,6 @@ return self; } -- (NSRect)boundingRectForDrawingInViewWithSize:(NSSize)size{ - NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:self]; - NSTextContainer *textContainer = [[NSTextContainer alloc] initWithContainerSize:size]; - NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init]; - - [layoutManager addTextContainer:textContainer]; - [textStorage addLayoutManager:layoutManager]; - [textContainer release]; - [layoutManager release]; - - // drawing in views uses a different typesetting behavior from the current one which leads to a mismatch in line height - // see http://www.cocoabuilder.com/archive/message/cocoa/2006/1/3/153669 - [layoutManager setTypesetterBehavior:NSTypesetterBehavior_10_2_WithCompatibility]; - [layoutManager glyphRangeForTextContainer:textContainer]; - - NSRect rect = [layoutManager usedRectForTextContainer:textContainer]; - [textStorage release]; - - return rect; -} - @end @implementation NSAttributedString (TeXComparison) Modified: trunk/bibdesk/NSDate_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSDate_BDSKExtensions.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/NSDate_BDSKExtensions.m 2008-02-04 21:31:45 UTC (rev 291) @@ -89,7 +89,7 @@ - (id)initWithMonthDayYearString:(NSString *)dateString; { - [[self init] release]; + [self release]; self = nil; CFAllocatorRef alloc = CFAllocatorGetDefault(); Modified: trunk/bibdesk/NSDictionary_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSDictionary_BDSKExtensions.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/NSDictionary_BDSKExtensions.m 2008-02-04 21:31:45 UTC (rev 291) @@ -43,7 +43,7 @@ @implementation NSMutableDictionary (BDSKExtensions) - (id)initForCaseInsensitiveKeys{ - [[self init] release]; + [self release]; return (NSMutableDictionary *)CFDictionaryCreateMutable(CFAllocatorGetDefault(), 0, &BDSKCaseInsensitiveStringKeyDictionaryCallBacks, &OFNSObjectDictionaryValueCallbacks); } Modified: trunk/bibdesk/NSError_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSError_BDSKExtensions.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/NSError_BDSKExtensions.m 2008-02-04 21:31:45 UTC (rev 291) @@ -125,19 +125,19 @@ + (id)mutableLocalErrorWithCode:(int)code localizedDescription:(NSString *)description; { - [[self init] release]; + [self release]; return [[[BDSKMutableError alloc] initLocalErrorWithCode:code localizedDescription:description] autorelease]; } + (id)mutableErrorWithDomain:(NSString *)domain code:(int)code userInfo:(NSDictionary *)dict; { - [[self init] release]; + [self release]; return [[[BDSKMutableError alloc] initWithDomain:domain code:code userInfo:dict] autorelease]; } + (id)mutableLocalErrorWithCode:(int)code localizedDescription:(NSString *)description underlyingError:(NSError *)underlyingError; { - [[self init] release]; + [self release]; id error = [NSError mutableLocalErrorWithCode:code localizedDescription:description]; [error embedError:underlyingError]; return error; Modified: trunk/bibdesk/NSMenu_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSMenu_BDSKExtensions.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/NSMenu_BDSKExtensions.m 2008-02-04 21:31:45 UTC (rev 291) @@ -235,7 +235,7 @@ - (void)encodeWithCoder:(NSCoder *)coder{} - (id)initWithCoder:(NSCoder *)decoder{ - [[self init] release]; + [self release]; self = [sharedOpenWithController retain]; return self; } Modified: trunk/bibdesk/NSSet_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSSet_BDSKExtensions.m 2008-02-04 21:30:14 UTC (rev 290) +++ trunk/bibdesk/NSSet_BDSKExtensions.m 2008-02-04 21:31:45 UTC (rev 291) @@ -79,7 +79,7 @@ - (id)initCaseInsensitiveWithCapacity:(unsigned)numItems { - [[self init] release]; + [self release]; // ignore capacity, as it will fix the number of items we can use self = (NSMutableSet *)CFSetCreateMutable(kCFAllocatorDefault, 0, &BDSKCaseInsensitiveStringSetCallBacks); return self; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 23:29:31
|
Revision: 292 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=292&view=rev Author: amaxwell Date: 2008-02-04 15:29:34 -0800 (Mon, 04 Feb 2008) Log Message: ----------- use Leopard grouping outlineview Modified Paths: -------------- trunk/bibdesk/BDSKFileMatcher.m trunk/bibdesk/English.lproj/FileMatcher.nib/classes.nib trunk/bibdesk/English.lproj/FileMatcher.nib/info.nib trunk/bibdesk/English.lproj/FileMatcher.nib/keyedobjects.nib Modified: trunk/bibdesk/BDSKFileMatcher.m =================================================================== --- trunk/bibdesk/BDSKFileMatcher.m 2008-02-04 21:31:45 UTC (rev 291) +++ trunk/bibdesk/BDSKFileMatcher.m 2008-02-04 23:29:34 UTC (rev 292) @@ -55,8 +55,6 @@ #import "BDSKLinkedFile.h" #define MAX_SEARCHKIT_RESULTS 10 -static float LEAF_ROW_HEIGHT = 20.0; -static float GROUP_ROW_HEIGHT = 24.0; @interface BDSKCountOvalCell : NSTextFieldCell @end @@ -125,7 +123,7 @@ BDSKLevelIndicatorCell *levelCell = [[BDSKLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSRelevancyLevelIndicatorStyle]; [levelCell setMaxValue:(double)1.0]; [levelCell setEnabled:NO]; - [levelCell setMaxHeight:(LEAF_ROW_HEIGHT * 0.7)]; + [levelCell setMaxHeight:(17 * 0.7)]; [[outlineView tableColumnWithIdentifier:@"score"] setDataCell:levelCell]; [levelCell release]; @@ -137,56 +135,6 @@ [statusField setStringValue:@""]; } -- (void)outlineView:(NSOutlineView *)ov willDisplayOutlineCell:(id)cell forTableColumn:(NSTableColumn *)tc item:(id)item; -{ - NSButtonCell *outlineCell = cell; - static NSImage *rightImage = nil; - static NSImage *downImage = nil; - - // -[NSButtonCell setImage:] and -setAlternateImage: are apparently the only public ways to modify the indentation marker, and we can't do this with -[[ov outlineTableColumn] dataCell], since that seems to operate on the BDSKTextWithIconCell - if (nil == rightImage && [outlineCell image]) { - NSSize size = [[outlineCell image] size]; - - NSImage *image = [[NSImage alloc] initWithSize:size]; - [image lockFocus]; - [[NSColor clearColor] setFill]; - NSRect r = NSZeroRect; - r.size = [image size]; - NSRectFill(r); - r = NSInsetRect(r, 2.0, 2.0); - NSBezierPath *bezierPath = [NSBezierPath bezierPath]; - [bezierPath moveToPoint:NSMakePoint(NSMinX(r), NSMinY(r))]; - [bezierPath lineToPoint:NSMakePoint(NSMinX(r), NSMaxY(r))]; - [bezierPath lineToPoint:NSMakePoint(NSMaxX(r), NSMidY(r))]; - [bezierPath closePath]; - [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill]; - [bezierPath fill]; - [image unlockFocus]; - - rightImage = [image copy]; - - [image lockFocus]; - [[NSColor clearColor] setFill]; - r = NSZeroRect; - r.size = [image size]; - NSRectFill(r); - r = NSInsetRect(r, 2.0, 2.0); - bezierPath = [NSBezierPath bezierPath]; - [bezierPath moveToPoint:NSMakePoint(NSMinX(r), NSMaxY(r))]; - [bezierPath lineToPoint:NSMakePoint(NSMaxX(r), NSMaxY(r))]; - [bezierPath lineToPoint:NSMakePoint(NSMidX(r), NSMinY(r))]; - [bezierPath closePath]; - [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill]; - [bezierPath fill]; - [image unlockFocus]; - - downImage = [image copy]; - [image release]; - } - [outlineCell setImage:rightImage]; - [outlineCell setAlternateImage:downImage]; -} - // API: try to match these files (pass nil for pubs to use the front document) - (void)matchFiles:(NSArray *)absoluteURLs withPublications:(NSArray *)pubs; { @@ -290,46 +238,11 @@ #pragma mark Delegate display methods -// return a larger row height for the items; tried using a spotlight controller image, but row size is too large to be practical -- (float)outlineView:(NSOutlineView *)outlineView heightOfRowByItem:(id)item -{ - return [item isLeaf] ? LEAF_ROW_HEIGHT : GROUP_ROW_HEIGHT; -} - - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item; { return [item isLeaf]; } -// this allows us to return the count cell for top-level rows, since they have a count instead of a score -- (NSCell *)tableView:(NSTableView *)tableView column:(OADataSourceTableColumn *)tableColumn dataCellForRow:(int)row; -{ - NSCell *defaultCell = [tableColumn dataCell]; - static NSCell *prototype = nil; - if (nil == prototype) { - prototype = [[BDSKCountOvalCell alloc] initTextCell:@""]; - [prototype setFont:[tableView font]]; - [prototype setBordered:NO]; - [prototype setControlSize:[defaultCell controlSize]]; - } - return [[(NSOutlineView *)tableView itemAtRow:row] isLeaf] ? defaultCell : [[prototype copy] autorelease]; -} - -// change text appearance in top-level rows via a formatter, so we don't have to mess with custom text/icon cells -- (void)outlineView:(NSOutlineView *)ov willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item; -{ - if (NO == [item isLeaf]) { - static BDSKBoldShadowFormatter *fm = nil; - if (nil == fm) - fm = [[BDSKBoldShadowFormatter alloc] init]; - [cell setFormatter:fm]; - [cell setTextColor:[NSColor whiteColor]]; - } else if ([[tableColumn identifier] isEqualToString:@"title"]) { - [cell setFormatter:nil]; - [cell setTextColor:[NSColor blackColor]]; - } -} - #pragma mark Outline view datasource - (id)outlineView:(NSOutlineView *)ov child:(int)idx ofItem:(id)item; @@ -349,7 +262,13 @@ - (id)outlineView:(NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item; { - return [[tableColumn identifier] isEqualToString:@"title"] ? item : [item valueForKey:@"score"]; + if ([item isLeaf] == NO) { + item = [item valueForKey:OATextWithIconCellStringKey]; + } + else if ([[tableColumn identifier] isEqualToString:@"score"]) { + item = [item valueForKey:@"score"]; + } + return item; } - (id)outlineView:(NSOutlineView *)ov itemForPersistentObject:(id)object @@ -363,6 +282,24 @@ return [NSKeyedArchiver archivedDataWithRootObject:item]; } +- (NSCell *)outlineView:(NSOutlineView *)ov dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item; +{ + NSCell *defaultCell = [tableColumn dataCell]; + static NSCell *prototype = nil; + if (nil == prototype) { + prototype = [[NSTextFieldCell alloc] initTextCell:@""]; + [prototype setFont:[ov font]]; + [prototype setBordered:NO]; + [prototype setControlSize:[defaultCell controlSize]]; + } + return [item isLeaf] ? defaultCell : [[prototype copy] autorelease]; +} + +- (BOOL)outlineView:(NSOutlineView *)ov isGroupItem:(id)item; +{ + return [item isLeaf] == NO; +} + @end @implementation BDSKFileMatcher (Private) @@ -613,178 +550,17 @@ [threadPool release]; } -@end -/* Returning an attributed string on a per-cell basis is easier than drawing a custom cell for each row, since we'd then have to handle the string drawing. This way NSTextFieldCell still does all the rendering for us. Color doesn't seem to work correctly for some reason, though. -*/ - -@implementation BDSKBoldShadowFormatter - -static NSDictionary *attributes = nil; - -+ (void)initialize -{ - if (nil == attributes) { - NSMutableDictionary *newAttrs = [[NSMutableDictionary alloc] initWithCapacity:10]; - - [newAttrs setObject:[NSFont boldSystemFontOfSize:[NSFont systemFontSize]] forKey:NSFontAttributeName]; - [newAttrs setObject:[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] forKey:NSForegroundColorAttributeName]; - - attributes = [newAttrs copy]; - [newAttrs release]; - } -} - -- (NSAttributedString *)attributedStringForObjectValue:(id)obj withDefaultAttributes:(NSDictionary *)attrs; -{ - NSMutableAttributedString *attrString = [[[NSMutableAttributedString alloc] initWithString:obj] autorelease]; - NSMutableDictionary *newAttrs = [attrs mutableCopy]; - [newAttrs addEntriesFromDictionary:attributes]; - [attrString addAttributes:newAttrs range:NSMakeRange(0, [attrString length])]; - [newAttrs release]; - return attrString; -} - -- (NSString *)stringForObjectValue:(id)obj { return obj; } -- (BOOL)getObjectValue:(id *)obj forString:(NSString *)string errorDescription:(NSString **)error; -{ - *obj = string; - return YES; -} - @end -/* This cell draws a centered (horizontally and vertically) string, and surrounds the string with a filled oval. -*/ - -@implementation BDSKCountOvalCell - -static NSColor *fillColor = nil; - -+ (void)initialize -{ - if (nil == fillColor) - fillColor = [[[NSColor keyboardFocusIndicatorColor] colorWithAlphaComponent:0.8] copy]; -} - -- (id)initTextCell:(NSString *)string; -{ - self = [super initTextCell:string]; - if (self) { - [self setAlignment:NSCenterTextAlignment]; - [self setTextColor:[NSColor whiteColor]]; - } - return self; -} - -// borrowed from RSVerticallyCenteredTextFieldCell at http://www.red-sweater.com/blog/148/what-a-difference-a-cell-makes -- (NSRect)drawingRectForBounds:(NSRect)theRect; -{ - // Get the parent's idea of where we should draw - NSRect newRect = [super drawingRectForBounds:theRect]; - - // Further mods needed if the cell is editable - - // Get our ideal size for current text - NSSize textSize = [self cellSizeForBounds:theRect]; - - // Center that in the proposed rect - float heightDelta = newRect.size.height - textSize.height; - if (heightDelta > 0) { - newRect.size.height -= heightDelta; - newRect.origin.y += (heightDelta / 2); - } - - return newRect; -} - -@end - /* Groups items under the top-level outline, and uses a gradient fill for the top level row background. Grid lines are drawn when the outline has data. */ @interface BDSKGroupingOutlineView : NSOutlineView -{ - CIColor *topColor; - CIColor *bottomColor; -} @end @implementation BDSKGroupingOutlineView -- (void)dealloc -{ - [topColor release]; - [bottomColor release]; - [super dealloc]; -} - -- (void)awakeFromNib -{ - if ([[BDSKGroupingOutlineView superclass] instancesRespondToSelector:_cmd]) - [super awakeFromNib]; - - // colors similar to Spotlight's window: darker blue at bottom, lighter at top - CGColorSpaceRef cspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); - const float upper[4] = { 106.0/255.0, 158.0/255.0, 238.0/255.0, 1.0 }; - const float lower[4] = { 72.0/255.0, 139.0/255.0, 244.0/255.0, 1.0 }; - - CGColorRef cgColor; - - cgColor = CGColorCreate(cspace, upper); - topColor = [[CIColor alloc] initWithCGColor:cgColor]; - CGColorRelease(cgColor); - - cgColor = CGColorCreate(cspace, lower); - bottomColor = [[CIColor alloc] initWithCGColor:cgColor]; - CGColorRelease(cgColor); - - CGColorSpaceRelease(cspace); -} - -// these accessors are bound to the hidden color wells in the nib, which allow playing with the colors easily -- (NSColor *)topColor -{ - return [NSColor colorWithCalibratedRed:[topColor red] green:[topColor green] blue:[topColor blue] alpha:[topColor alpha]]; -} - -- (void)setTopColor:(NSColor *)tc -{ - [topColor release]; - topColor = [[CIColor colorWithNSColor:tc] retain]; -} - -- (void)setBottomColor:(NSColor *)bc -{ - [bottomColor release]; - bottomColor = [[CIColor colorWithNSColor:bc] retain]; -} - -- (NSColor *)bottomColor -{ - return [NSColor colorWithCalibratedRed:[bottomColor red] green:[bottomColor green] blue:[bottomColor blue] alpha:[bottomColor alpha]]; -} - -// grid looks silly when the table is empty -- (void)drawGridInClipRect:(NSRect)rect; -{ - if ([self numberOfRows]) - [super drawGridInClipRect:rect]; -} - -- (void)drawRow:(int)rowIndex clipRect:(NSRect)clipRect -{ - if ([self isExpandable:[self itemAtRow:rowIndex]]) { - - NSBezierPath *p = [NSBezierPath bezierPathWithRect:[self rectOfRow:rowIndex]]; - if ([self isFlipped]) - [p fillPathVerticallyWithStartColor:topColor endColor:bottomColor]; - else - [p fillPathVerticallyWithStartColor:bottomColor endColor:topColor]; - } - [super drawRow:rowIndex clipRect:clipRect]; -} - -(void)_drawDropHighlightOnRow:(int)rowIndex{ NSRect drawRect = (rowIndex == -1) ? [self visibleRect] : [self rectOfRow:rowIndex]; Modified: trunk/bibdesk/English.lproj/FileMatcher.nib/classes.nib =================================================================== --- trunk/bibdesk/English.lproj/FileMatcher.nib/classes.nib 2008-02-04 21:31:45 UTC (rev 291) +++ trunk/bibdesk/English.lproj/FileMatcher.nib/classes.nib 2008-02-04 23:29:34 UTC (rev 292) @@ -1,59 +1,133 @@ -{ - IBClasses = ( - { - ACTIONS = {abort = id; configure = id; openAction = id; }; - CLASS = BDSKFileMatcher; - LANGUAGE = ObjC; - OUTLETS = { - abortButton = NSButton; - configureButton = NSButton; - outlineView = NSOutlineView; - progressIndicator = NSProgressIndicator; - statusField = NSTextField; - }; - SUPERCLASS = NSWindowController; - }, - {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - { - CLASS = BDSKGroupingOutlineView; - LANGUAGE = ObjC; - SUPERCLASS = NSOutlineView; - }, - { - ACTIONS = {hideMatches = id; showMatches = id; }; - CLASS = BDSKOrphanedFilesArrayController; - LANGUAGE = ObjC; - OUTLETS = {searchField = NSSearchField; }; - SUPERCLASS = NSArrayController; - }, - { - ACTIONS = { - matchFilesWithPubs = id; - refreshOrphanedFiles = id; - search = id; - showFile = id; - showOrphanedFiles = id; - stopRefreshing = id; - }; - CLASS = BDSKOrphanedFilesFinder; - LANGUAGE = ObjC; - OUTLETS = { - arrayController = BDSKOrphanedFilesArrayController; - contextMenu = NSMenu; - matchButton = NSButton; - progressIndicator = NSProgressIndicator; - refreshButton = NSButton; - statusField = NSTextField; - tableView = NSTableView; - }; - SUPERCLASS = NSWindowController; - }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - CLASS = OADataSourceTableColumn; - LANGUAGE = ObjC; - SUPERCLASS = NSTableColumn; - } - ); - IBVersion = 1; -} \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBClasses</key> + <array> + <dict> + <key>CLASS</key> + <string>NSMenu</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSControl</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>hideWindow</key> + <string>id</string> + <key>toggleShowingWindow</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSWindowController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSObject</string> + <key>LANGUAGE</key> + <string>ObjC</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSWindow</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSScrollView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKGroupingOutlineView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSOutlineView</string> + </dict> + <dict> + <key>CLASS</key> + <string>FirstResponder</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSTableHeaderView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>abort</key> + <string>id</string> + <key>configure</key> + <string>id</string> + <key>openAction</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>BDSKFileMatcher</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>abortButton</key> + <string>NSButton</string> + <key>configureButton</key> + <string>NSButton</string> + <key>outlineView</key> + <string>NSOutlineView</string> + <key>progressIndicator</key> + <string>NSProgressIndicator</string> + <key>statusField</key> + <string>NSTextField</string> + </dict> + <key>SUPERCLASS</key> + <string>NSWindowController</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>changeFont</key> + <string>id</string> + <key>invertSelection</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSTableView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSControl</string> + </dict> + </array> + <key>IBVersion</key> + <string>1</string> +</dict> +</plist> Modified: trunk/bibdesk/English.lproj/FileMatcher.nib/info.nib =================================================================== --- trunk/bibdesk/English.lproj/FileMatcher.nib/info.nib 2008-02-04 21:31:45 UTC (rev 291) +++ trunk/bibdesk/English.lproj/FileMatcher.nib/info.nib 2008-02-04 23:29:34 UTC (rev 292) @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>IBDocumentLocation</key> - <string>34 53 356 240 0 0 1280 1002 </string> <key>IBFramework Version</key> - <string>446.1</string> + <string>629</string> + <key>IBLastKnownRelativeProjectPath</key> + <string>../../Bibdesk.xcodeproj</string> + <key>IBOldestOS</key> + <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>5</integer> + <integer>6</integer> </array> <key>IBSystem Version</key> - <string>8L127</string> + <string>9B18</string> + <key>targetFramework</key> + <string>IBCocoaFramework</string> </dict> </plist> Modified: trunk/bibdesk/English.lproj/FileMatcher.nib/keyedobjects.nib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 23:36:11
|
Revision: 293 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=293&view=rev Author: amaxwell Date: 2008-02-04 15:36:14 -0800 (Mon, 04 Feb 2008) Log Message: ----------- remove NSObjectController and color wells Modified Paths: -------------- trunk/bibdesk/English.lproj/FileMatcher.nib/keyedobjects.nib trunk/bibdesk/French.lproj/FileMatcher.nib/classes.nib trunk/bibdesk/French.lproj/FileMatcher.nib/info.nib trunk/bibdesk/French.lproj/FileMatcher.nib/keyedobjects.nib Modified: trunk/bibdesk/English.lproj/FileMatcher.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/bibdesk/French.lproj/FileMatcher.nib/classes.nib =================================================================== --- trunk/bibdesk/French.lproj/FileMatcher.nib/classes.nib 2008-02-04 23:29:34 UTC (rev 292) +++ trunk/bibdesk/French.lproj/FileMatcher.nib/classes.nib 2008-02-04 23:36:14 UTC (rev 293) @@ -1,59 +1,133 @@ -{ - IBClasses = ( - { - ACTIONS = {abort = id; configure = id; openAction = id; }; - CLASS = BDSKFileMatcher; - LANGUAGE = ObjC; - OUTLETS = { - abortButton = NSButton; - configureButton = NSButton; - outlineView = NSOutlineView; - progressIndicator = NSProgressIndicator; - statusField = NSTextField; - }; - SUPERCLASS = NSWindowController; - }, - {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - { - CLASS = BDSKGroupingOutlineView; - LANGUAGE = ObjC; - SUPERCLASS = NSOutlineView; - }, - { - ACTIONS = {hideMatches = id; showMatches = id; }; - CLASS = BDSKOrphanedFilesArrayController; - LANGUAGE = ObjC; - OUTLETS = {searchField = NSSearchField; }; - SUPERCLASS = NSArrayController; - }, - { - ACTIONS = { - matchFilesWithPubs = id; - refreshOrphanedFiles = id; - search = id; - showFile = id; - showOrphanedFiles = id; - stopRefreshing = id; - }; - CLASS = BDSKOrphanedFilesFinder; - LANGUAGE = ObjC; - OUTLETS = { - arrayController = BDSKOrphanedFilesArrayController; - contextMenu = NSMenu; - matchButton = NSButton; - progressIndicator = NSProgressIndicator; - refreshButton = NSButton; - statusField = NSTextField; - tableView = NSTableView; - }; - SUPERCLASS = NSWindowController; - }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - CLASS = OADataSourceTableColumn; - LANGUAGE = ObjC; - SUPERCLASS = NSTableColumn; - } - ); - IBVersion = 1; -} \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBClasses</key> + <array> + <dict> + <key>CLASS</key> + <string>NSMenu</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSControl</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>hideWindow</key> + <string>id</string> + <key>toggleShowingWindow</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSWindowController</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSObject</string> + <key>LANGUAGE</key> + <string>ObjC</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSWindow</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSResponder</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSScrollView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>CLASS</key> + <string>BDSKGroupingOutlineView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSOutlineView</string> + </dict> + <dict> + <key>CLASS</key> + <string>FirstResponder</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>CLASS</key> + <string>NSTableHeaderView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSView</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>abort</key> + <string>id</string> + <key>configure</key> + <string>id</string> + <key>openAction</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>BDSKFileMatcher</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>OUTLETS</key> + <dict> + <key>abortButton</key> + <string>NSButton</string> + <key>configureButton</key> + <string>NSButton</string> + <key>outlineView</key> + <string>NSOutlineView</string> + <key>progressIndicator</key> + <string>NSProgressIndicator</string> + <key>statusField</key> + <string>NSTextField</string> + </dict> + <key>SUPERCLASS</key> + <string>NSWindowController</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>changeFont</key> + <string>id</string> + <key>invertSelection</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSTableView</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSControl</string> + </dict> + </array> + <key>IBVersion</key> + <string>1</string> +</dict> +</plist> Modified: trunk/bibdesk/French.lproj/FileMatcher.nib/info.nib =================================================================== --- trunk/bibdesk/French.lproj/FileMatcher.nib/info.nib 2008-02-04 23:29:34 UTC (rev 292) +++ trunk/bibdesk/French.lproj/FileMatcher.nib/info.nib 2008-02-04 23:36:14 UTC (rev 293) @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>IBDocumentLocation</key> - <string>34 53 356 240 0 0 1280 1002 </string> <key>IBFramework Version</key> - <string>446.1</string> + <string>629</string> + <key>IBOldestOS</key> + <integer>5</integer> + <key>IBOpenObjects</key> + <array> + <integer>8</integer> + </array> <key>IBSystem Version</key> - <string>8P2137</string> + <string>9B18</string> + <key>targetFramework</key> + <string>IBCocoaFramework</string> </dict> </plist> Modified: trunk/bibdesk/French.lproj/FileMatcher.nib/keyedobjects.nib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-04 23:46:03
|
Revision: 294 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=294&view=rev Author: amaxwell Date: 2008-02-04 15:46:06 -0800 (Mon, 04 Feb 2008) Log Message: ----------- use NSTableView gradient highlight Modified Paths: -------------- trunk/bibdesk/BDSKGroupTableView.h trunk/bibdesk/BDSKGroupTableView.m Modified: trunk/bibdesk/BDSKGroupTableView.h =================================================================== --- trunk/bibdesk/BDSKGroupTableView.h 2008-02-04 23:36:14 UTC (rev 293) +++ trunk/bibdesk/BDSKGroupTableView.h 2008-02-04 23:46:06 UTC (rev 294) @@ -37,7 +37,6 @@ */ #import <Cocoa/Cocoa.h> -#import <OmniAppKit/OAGradientTableView.h> @class BDSKGroupTableView, BDSKTypeSelectHelper; @@ -49,7 +48,7 @@ @end -@interface BDSKGroupTableView : OAGradientTableView { +@interface BDSKGroupTableView : NSTableView { BDSKTypeSelectHelper *typeSelectHelper; } - (BDSKTypeSelectHelper *)typeSelectHelper; Modified: trunk/bibdesk/BDSKGroupTableView.m =================================================================== --- trunk/bibdesk/BDSKGroupTableView.m 2008-02-04 23:36:14 UTC (rev 293) +++ trunk/bibdesk/BDSKGroupTableView.m 2008-02-04 23:46:06 UTC (rev 294) @@ -71,6 +71,7 @@ [NSException raise:BDSKUnimplementedException format:@"%@ needs at least one column.", [self class]]; NSTableColumn *column = [[self tableColumns] objectAtIndex:0]; OBPRECONDITION(column); + [self setSelectionHighlightStyle:NSTableViewSelectionHighlightStyleSourceList]; NSTableHeaderView *currentTableHeaderView = [self headerView]; BDSKGroupTableHeaderView *customTableHeaderView = [[BDSKGroupTableHeaderView alloc] initWithTableColumn:column]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-05 04:04:30
|
Revision: 297 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=297&view=rev Author: amaxwell Date: 2008-02-04 20:04:32 -0800 (Mon, 04 Feb 2008) Log Message: ----------- Use standard images. Modified Paths: -------------- trunk/bibdesk/BDSKSharedGroup.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/Info.plist Removed Paths: ------------- trunk/bibdesk/Images/SmallLock_Locked.tiff trunk/bibdesk/Images/SmallLock_Unlocked.tiff Modified: trunk/bibdesk/BDSKSharedGroup.m =================================================================== --- trunk/bibdesk/BDSKSharedGroup.m 2008-02-05 03:36:34 UTC (rev 296) +++ trunk/bibdesk/BDSKSharedGroup.m 2008-02-05 04:04:32 UTC (rev 297) @@ -117,7 +117,7 @@ NSRect iconRect = NSMakeRect(0.0, 0.0, 16.0, 16.0); NSRect badgeRect = NSMakeRect(7.0, 0.0, 11.0, 11.0); NSImage *image = [[NSImage alloc] initWithSize:iconRect.size]; - NSImage *badge = [NSImage imageNamed:@"SmallLock_Locked"]; + NSImage *badge = [NSImage imageNamed:NSImageNameLockLockedTemplate]; NSSize srcSize = [[self icon] size]; [image lockFocus]; @@ -136,7 +136,7 @@ NSRect iconRect = NSMakeRect(0.0, 0.0, 16.0, 16.0); NSRect badgeRect = NSMakeRect(6.0, 0.0, 11.0, 11.0); NSImage *image = [[NSImage alloc] initWithSize:iconRect.size]; - NSImage *badge = [NSImage imageNamed:@"SmallLock_Unlocked"]; + NSImage *badge = [NSImage imageNamed:NSImageNameLockUnlockedTemplate]; NSSize srcSize = [[self icon] size]; [image lockFocus]; Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-05 03:36:34 UTC (rev 296) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2008-02-05 04:04:32 UTC (rev 297) @@ -188,8 +188,6 @@ CE43865E0BB8274600A56987 /* SearchBookmarksWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE43865C0BB8274600A56987 /* SearchBookmarksWindow.nib */; }; CE4A7EFA0BAED4EC004AD07D /* BDSKBibliographyCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9DBEDE093CF2640008648B /* BDSKBibliographyCommand.m */; }; CE4B5F100BF3DB0200A73E42 /* BibDocument.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE4B5F0F0BF3DB0200A73E42 /* BibDocument.nib */; }; - CE4B691C09E9235200CCA14F /* SmallLock_Locked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4B691A09E9235200CCA14F /* SmallLock_Locked.tiff */; }; - CE4B691D09E9235200CCA14F /* SmallLock_Unlocked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4B691B09E9235200CCA14F /* SmallLock_Unlocked.tiff */; }; CE4D85290C3A8C8F002C20CB /* BDSKAutofileCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4D85270C3A8C8E002C20CB /* BDSKAutofileCommand.m */; }; CE518F2809E526E000E97C3A /* BDSKTextViewFindController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE518F2609E526E000E97C3A /* BDSKTextViewFindController.m */; }; CE518F6609E52D6A00E97C3A /* BDSKTextViewFindPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE518F6409E52D6A00E97C3A /* BDSKTextViewFindPanel.nib */; }; @@ -992,8 +990,6 @@ CE4385E70BB81D0500A56987 /* BDSKSearchBookmarkController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKSearchBookmarkController.m; sourceTree = "<group>"; }; CE43865D0BB8274600A56987 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/SearchBookmarksWindow.nib; sourceTree = "<group>"; }; CE4B5F110BF3DB1300A73E42 /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/BibDocument.nib; sourceTree = "<group>"; }; - CE4B691A09E9235200CCA14F /* SmallLock_Locked.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = SmallLock_Locked.tiff; path = Images/SmallLock_Locked.tiff; sourceTree = "<group>"; }; - CE4B691B09E9235200CCA14F /* SmallLock_Unlocked.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = SmallLock_Unlocked.tiff; path = Images/SmallLock_Unlocked.tiff; sourceTree = "<group>"; }; CE4D85260C3A8C8E002C20CB /* BDSKAutofileCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKAutofileCommand.h; sourceTree = "<group>"; }; CE4D85270C3A8C8E002C20CB /* BDSKAutofileCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKAutofileCommand.m; sourceTree = "<group>"; }; CE518F2509E526E000E97C3A /* BDSKTextViewFindController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKTextViewFindController.h; sourceTree = "<group>"; }; @@ -2242,8 +2238,6 @@ F945240B0B4B15A6000A5E12 /* searchDocIcon.icns */, CE7F5E470B3F5F1800A919D0 /* searchFolderIcon.tiff */, CE386D0609D7075C00B9D1F0 /* sharedFolderIcon.tiff */, - CE4B691A09E9235200CCA14F /* SmallLock_Locked.tiff */, - CE4B691B09E9235200CCA14F /* SmallLock_Unlocked.tiff */, F97BF343090B19520063504B /* smartFolderIcon.tiff */, 3DBB79BF081538CA0050C0CD /* stop_small.tiff */, F9022DBA0758088000C3F701 /* startup.tiff */, @@ -3132,8 +3126,6 @@ F97BF344090B19520063504B /* smartFolderIcon.tiff in Resources */, CEBB8D8809C8B0D90074C79E /* Font.tiff in Resources */, CE386D0709D7075C00B9D1F0 /* sharedFolderIcon.tiff in Resources */, - CE4B691C09E9235200CCA14F /* SmallLock_Locked.tiff in Resources */, - CE4B691D09E9235200CCA14F /* SmallLock_Unlocked.tiff in Resources */, CE31E4100A07928C00F5BD47 /* staticFolderIcon.tiff in Resources */, CE2C16F90A0A149E006F0A73 /* gear2.tiff in Resources */, CE2C18920A0A43BE006F0A73 /* importFolderIcon.tiff in Resources */, Deleted: trunk/bibdesk/Images/SmallLock_Locked.tiff =================================================================== (Binary files differ) Deleted: trunk/bibdesk/Images/SmallLock_Unlocked.tiff =================================================================== (Binary files differ) Modified: trunk/bibdesk/Info.plist =================================================================== --- trunk/bibdesk/Info.plist 2008-02-05 03:36:34 UTC (rev 296) +++ trunk/bibdesk/Info.plist 2008-02-05 04:04:32 UTC (rev 297) @@ -1074,7 +1074,7 @@ <key>helpURL</key> <string>SharingPreferences</string> <key>icon</key> - <string>NSNetwork</string> + <string>NSBonjour</string> <key>identifier</key> <string>edu.ucsd.cs.mmccrack.bibdesk.prefpane.sharing</string> <key>nib</key> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-05 04:07:21
|
Revision: 298 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=298&view=rev Author: amaxwell Date: 2008-02-04 20:07:28 -0800 (Mon, 04 Feb 2008) Log Message: ----------- avoid the obsolete iconForFiles: image Modified Paths: -------------- trunk/bibdesk/BDSKOrphanedFilesFinder.m trunk/bibdesk/BibDocument_DataSource.m Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m =================================================================== --- trunk/bibdesk/BDSKOrphanedFilesFinder.m 2008-02-05 04:04:32 UTC (rev 297) +++ trunk/bibdesk/BDSKOrphanedFilesFinder.m 2008-02-05 04:07:28 UTC (rev 298) @@ -287,7 +287,7 @@ NSArray *fileNames = [pboard propertyListForType:NSFilenamesPboardType]; count = [fileNames count]; if (count) - image = [[NSWorkspace sharedWorkspace] iconForFiles:fileNames]; + image = [NSImage imageNamed:NSImageNameMultipleDocuments]; } return image ? [image dragImageWithCount:count] : nil; Modified: trunk/bibdesk/BibDocument_DataSource.m =================================================================== --- trunk/bibdesk/BibDocument_DataSource.m 2008-02-05 04:04:32 UTC (rev 297) +++ trunk/bibdesk/BibDocument_DataSource.m 2008-02-05 04:07:28 UTC (rev 298) @@ -771,7 +771,7 @@ if ([dragType isEqualToString:NSFilenamesPboardType]) { NSArray *fileNames = [pb propertyListForType:NSFilenamesPboardType]; count = [fileNames count]; - image = [[NSWorkspace sharedWorkspace] iconForFiles:fileNames]; + image = [NSImage imageNamed:NSImageNameMultipleDocuments]; isIcon = YES; } else if ([dragType isEqualToString:NSURLPboardType]) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2008-02-05 04:33:11
|
Revision: 301 http://tcobrowser.svn.sourceforge.net/tcobrowser/?rev=301&view=rev Author: amaxwell Date: 2008-02-04 20:33:15 -0800 (Mon, 04 Feb 2008) Log Message: ----------- get rid of more legacy NSDate stuff Modified Paths: -------------- trunk/bibdesk/BDSKConditionController.m trunk/bibdesk/NSDate_BDSKExtensions.m Modified: trunk/bibdesk/BDSKConditionController.m =================================================================== --- trunk/bibdesk/BDSKConditionController.m 2008-02-05 04:16:18 UTC (rev 300) +++ trunk/bibdesk/BDSKConditionController.m 2008-02-05 04:33:15 UTC (rev 301) @@ -136,8 +136,9 @@ [ratingButton setRating:[[condition stringValue] unsignedIntValue]]; - // @@ can we safely upgrade to NSDateFormatterShortStyle and drop natural language? - NSDateFormatter *formatter = [[[NSDateFormatter alloc] initWithDateFormat:[[NSUserDefaults standardUserDefaults] objectForKey:NSShortDateFormatString] allowNaturalLanguage:YES] autorelease]; + NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease]; + [formatter setDateStyle:NSDateFormatterShortStyle]; + [formatter setLenient:YES]; [formatter setGeneratesCalendarDates:YES]; [dateTextField setFormatter:formatter]; [toDateTextField setFormatter:formatter]; Modified: trunk/bibdesk/NSDate_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSDate_BDSKExtensions.m 2008-02-05 04:16:18 UTC (rev 300) +++ trunk/bibdesk/NSDate_BDSKExtensions.m 2008-02-05 04:33:15 UTC (rev 301) @@ -39,7 +39,6 @@ #import "NSDate_BDSKExtensions.h" #import "BDSKStringConstants.h" -static NSDictionary *locale = nil; static CFDateFormatterRef dateFormatter = NULL; static CFDateFormatterRef numericDateFormatter = NULL; @@ -47,14 +46,6 @@ + (void)didLoad { - if(nil == locale){ - NSArray *monthNames = [NSArray arrayWithObjects:@"January", @"February", @"March", @"April", @"May", @"June", @"July", @"August", @"September", @"October", @"November", @"December", nil]; - NSArray *shortMonthNames = [NSArray arrayWithObjects:@"Jan", @"Feb", @"Mar", @"Apr", @"May", @"Jun", @"Jul", @"Aug", @"Sep", @"Oct", @"Nov", @"Dec", nil]; - - locale = [[NSDictionary alloc] initWithObjectsAndKeys:@"MDYH", NSDateTimeOrdering, monthNames, NSMonthNameArray, shortMonthNames, NSShortMonthNameArray, nil]; - } - - // NB: CFDateFormatters are fairly expensive beasts to create, so we cache them here CFAllocatorRef alloc = CFAllocatorGetDefault(); @@ -107,7 +98,7 @@ // Now fall back to natural language parsing, which is fairly memory-intensive. // We should be able to use NSDateFormatter with the natural language option, but it doesn't seem to work as well as +dateWithNaturalLanguageString - return [[NSDate dateWithNaturalLanguageString:dateString locale:locale] retain]; + return [[NSDate dateWithNaturalLanguageString:dateString] retain]; } @end @@ -116,15 +107,15 @@ - (NSCalendarDate *)initWithNaturalLanguageString:(NSString *)dateString; { - // initWithString should release self when it returns nil - NSCalendarDate *date = [self initWithString:dateString]; + // initWithString: will release self if it fails, so we can return a new instance without leaking + self = [self initWithString:dateString]; - return (date != nil ? date : [[NSCalendarDate dateWithNaturalLanguageString:dateString] retain]); + return (self != nil ? self : [[NSCalendarDate dateWithNaturalLanguageString:dateString] retain]); } // override this NSDate method so we can return an NSCalendarDate efficiently - (NSCalendarDate *)initWithMonthDayYearString:(NSString *)dateString; -{ +{ NSDate *date = [[NSDate alloc] initWithMonthDayYearString:dateString]; NSTimeInterval t = [date timeIntervalSinceReferenceDate]; self = [self initWithTimeIntervalSinceReferenceDate:t]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |