tcobrowser-cvs Mailing List for TCOBrowser
Status: Beta
Brought to you by:
amaxwell
You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(75) |
Jul
(32) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(79) |
Jul
(107) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(17) |
Oct
(4) |
Nov
|
Dec
|
2008 |
Jan
|
Feb
(240) |
Mar
(151) |
Apr
(94) |
May
(96) |
Jun
(103) |
Jul
(32) |
Aug
(20) |
Sep
(2) |
Oct
(13) |
Nov
(19) |
Dec
(1) |
2009 |
Jan
(22) |
Feb
(3) |
Mar
(196) |
Apr
(100) |
May
(72) |
Jun
(32) |
Jul
(20) |
Aug
(14) |
Sep
(3) |
Oct
(17) |
Nov
(3) |
Dec
(3) |
2010 |
Jan
(8) |
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
(3) |
Jul
(28) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
(19) |
Dec
(26) |
2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
(9) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2012 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
(19) |
Jun
|
Jul
(4) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
(1) |
2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(12) |
Oct
(18) |
Nov
(5) |
Dec
(2) |
2014 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2021 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ama...@us...> - 2021-01-21 20:57:51
|
Revision: 1716 http://sourceforge.net/p/tcobrowser/code/1716 Author: amaxwell Date: 2021-01-21 20:57:48 +0000 (Thu, 21 Jan 2021) Log Message: ----------- fixes for compilation on another Mojave system, for whatever reason Modified Paths: -------------- trunk/bibdesk/BDSKComplexString.m trunk/bibdesk/BDSKReferenceMinerParser.m trunk/bibdesk/BibDocument.m trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme trunk/bibdesk/Info.plist trunk/bibdesk/NSArray_BDSKExtensions.m trunk/bibdesk/NSTableHeaderView_BDSKExtensions.m trunk/bibdesk/NSTableView_BDSKExtensions.m trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/ColorSync/OAColorProfile-Deprecated.m trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OAFeatures.h trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifier.xcscheme trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifierTest.xcscheme trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj Modified: trunk/bibdesk/BDSKComplexString.m =================================================================== --- trunk/bibdesk/BDSKComplexString.m 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/BDSKComplexString.m 2021-01-21 20:57:48 UTC (rev 1716) @@ -468,10 +468,10 @@ @implementation NSString (ComplexStringExtensions) -static IMP originalStringByAppendingString; +static id (*originalStringByAppendingString)(id self, SEL _cmd, id arg) = NULL; + (void)didLoad{ - originalStringByAppendingString = OBReplaceMethodImplementationWithSelector(self, @selector(stringByAppendingString:), @selector(replacementStringByAppendingString:)); + originalStringByAppendingString = (typeof(originalStringByAppendingString))OBReplaceMethodImplementationWithSelector(self, @selector(stringByAppendingString:), @selector(replacementStringByAppendingString:)); } - (id)initWithNodes:(NSArray *)nodesArray macroResolver:(BDSKMacroResolver *)theMacroResolver{ Modified: trunk/bibdesk/BDSKReferenceMinerParser.m =================================================================== --- trunk/bibdesk/BDSKReferenceMinerParser.m 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/BDSKReferenceMinerParser.m 2021-01-21 20:57:48 UTC (rev 1716) @@ -38,7 +38,7 @@ #import "BDSKReferenceMinerParser.h" #import <AGRegex/AGRegex.h> -#import "BDSKPubMedparser.h" +#import "BDSKPubMedParser.h" #import "BDSKRISParser.h" #import "BDSKMARCParser.h" #import "NSError_BDSKExtensions.h" Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/BibDocument.m 2021-01-21 20:57:48 UTC (rev 1716) @@ -162,8 +162,9 @@ @synthesize fileViewDataSource = _fileViewDataSource; -static IMP ns_handleDocumentFileChanges = NULL; +static void (*ns_handleDocumentFileChanges)(id self, SEL _cmd, id arg) = NULL; + - (void)_documentFileChangeAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { NSDate *mtime = [[[NSFileManager defaultManager] attributesOfItemAtPath:[[self fileURL] path] error:NULL] fileModificationDate]; @@ -255,7 +256,7 @@ { Method m = class_getInstanceMethod(self, @selector(_handleDocumentFileChanges:)); IMP replacement = class_getMethodImplementation(self, @selector(_handleBibDocumentFileChanges:)); - ns_handleDocumentFileChanges = method_setImplementation(m, replacement); + ns_handleDocumentFileChanges = (typeof(ns_handleDocumentFileChanges))method_setImplementation(m, replacement); } - (id)init{ Modified: trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -138,7 +138,7 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1130; }; buildConfigurationList = F95CC105087F54B2002C5694 /* Build configuration list for PBXProject "BibImporter" */; compatibilityVersion = "Xcode 3.2"; Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -2512,7 +2512,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 1130; }; buildConfigurationList = F993F20208553A61007A7657 /* Build configuration list for PBXProject "Bibdesk" */; compatibilityVersion = "Xcode 3.2"; @@ -3849,6 +3849,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = F95C5E970D10E87C00C81970 /* BibDesk-Debug.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; @@ -3865,6 +3867,7 @@ __info_plist, "$(SRCROOT)/$(INFOPLIST_FILE)", ); + PRODUCT_BUNDLE_IDENTIFIER = edu.ucsd.cs.mmccrack.bibdesk; PRODUCT_NAME = BibDesk; STRIP_INSTALLED_PRODUCT = NO; VERSIONING_SYSTEM = "apple-generic"; @@ -3876,6 +3879,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = F95C5E950D10E85400C81970 /* BibDesk-Release.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; @@ -3892,6 +3897,7 @@ __info_plist, "$(SRCROOT)/$(INFOPLIST_FILE)", ); + PRODUCT_BUNDLE_IDENTIFIER = edu.ucsd.cs.mmccrack.bibdesk; PRODUCT_NAME = BibDesk; STRIP_INSTALLED_PRODUCT = NO; VERSIONING_SYSTEM = "apple-generic"; @@ -3902,6 +3908,8 @@ F993F1BF08553A61007A7657 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; @@ -3918,6 +3926,7 @@ __info_plist, "$(SRCROOT)/$(INFOPLIST_FILE)", ); + PRODUCT_BUNDLE_IDENTIFIER = edu.ucsd.cs.mmccrack.bibdesk; PRODUCT_NAME = BibDesk; STRIP_INSTALLED_PRODUCT = NO; VERSIONING_SYSTEM = "apple-generic"; @@ -3928,6 +3937,7 @@ F993F1EA08553A61007A7657 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -3952,6 +3962,7 @@ F993F1EB08553A61007A7657 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; GCC_MODEL_TUNING = G4; @@ -3980,6 +3991,7 @@ F993F1EC08553A61007A7657 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = UNIT_TESTING; OTHER_CFLAGS = ""; @@ -3999,6 +4011,7 @@ F993F1EF08553A61007A7657 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -4023,6 +4036,7 @@ F993F1F008553A61007A7657 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; GCC_MODEL_TUNING = G4; @@ -4051,6 +4065,7 @@ F993F1F108553A61007A7657 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; GCC_PREPROCESSOR_DEFINITIONS = UNIT_TESTING; OTHER_CFLAGS = ""; @@ -4070,13 +4085,32 @@ F993F20308553A61007A7657 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_AUTO_VECTORIZATION = NO; GCC_PREPROCESSOR_DEFINITIONS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.4; + GCC_WARN_UNDECLARED_SELECTOR = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = NO; @@ -4093,12 +4127,31 @@ isa = XCBuildConfiguration; baseConfigurationReference = F95C5E950D10E85400C81970 /* BibDesk-Release.xcconfig */; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_AUTO_VECTORIZATION = NO; GCC_OPTIMIZATION_LEVEL = s; - MACOSX_DEPLOYMENT_TARGET = 10.4; + GCC_WARN_UNDECLARED_SELECTOR = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = NO; }; @@ -4107,11 +4160,30 @@ F993F20508553A61007A7657 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_AUTO_VECTORIZATION = NO; - MACOSX_DEPLOYMENT_TARGET = 10.4; + GCC_WARN_UNDECLARED_SELECTOR = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = NO; }; Modified: trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme 2021-01-21 20:57:48 UTC (rev 1716) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0710" + LastUpgradeVersion = "1130" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> <MacroExpansion> <BuildableReference BuildableIdentifier = "primary" @@ -38,8 +36,8 @@ ReferencedContainer = "container:Bibdesk.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> + <Testables> + </Testables> </TestAction> <LaunchAction buildConfiguration = "Debug" @@ -68,8 +66,6 @@ isEnabled = "YES"> </EnvironmentVariable> </EnvironmentVariables> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Release" Modified: trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme 2021-01-21 20:57:48 UTC (rev 1716) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0710" + LastUpgradeVersion = "1130" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> <MacroExpansion> <BuildableReference BuildableIdentifier = "primary" @@ -38,8 +36,8 @@ ReferencedContainer = "container:Bibdesk.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> + <Testables> + </Testables> </TestAction> <LaunchAction buildConfiguration = "Release" @@ -61,8 +59,6 @@ ReferencedContainer = "container:Bibdesk.xcodeproj"> </BuildableReference> </BuildableProductRunnable> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Release" Modified: trunk/bibdesk/Info.plist =================================================================== --- trunk/bibdesk/Info.plist 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/Info.plist 2021-01-21 20:57:48 UTC (rev 1716) @@ -212,7 +212,7 @@ <key>CFBundleIconFile</key> <string>FolderPenIcon.icns</string> <key>CFBundleIdentifier</key> - <string>edu.ucsd.cs.mmccrack.bibdesk</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> @@ -227,6 +227,11 @@ <string>v${CURRENT_PROJECT_VERSION}</string> <key>LSMinimumSystemVersion</key> <string>10.8.0</string> + <key>NSAppTransportSecurity</key> + <dict> + <key>NSAllowsArbitraryLoads</key> + <true/> + </dict> <key>NSAppleScriptEnabled</key> <true/> <key>NSHumanReadableCopyright</key> @@ -235,11 +240,6 @@ <string>MainMenu</string> <key>NSPrincipalClass</key> <string>BDSKApplication</string> - <key>NSAppTransportSecurity</key> - <dict> - <key>NSAllowsArbitraryLoads</key> - <true/> - </dict> <key>NSServices</key> <array> <dict> @@ -582,29 +582,29 @@ <key>BDSKEditorFontNameKey</key> <string>Helvetica</string> <key>BDSKEditorFontSizeKey</key> - <real>0</real> + <real>0.0</real> <key>BDSKFileContentSearchTableViewFontNameKey</key> <string>LucidaGrande</string> <key>BDSKFileContentSearchTableViewFontSizeKey</key> - <real>0</real> + <real>0.0</real> <key>BDSKGroupOutlineViewFontNameKey</key> <string>LucidaGrande</string> <key>BDSKGroupOutlineViewFontSizeKey</key> - <real>0</real> + <real>0.0</real> <key>BDSKMainFileViewIconScaleKey</key> <real>2</real> <key>BDSKMainTableViewFontNameKey</key> <string>LucidaGrande</string> <key>BDSKMainTableViewFontSizeKey</key> - <real>0</real> + <real>0.0</real> <key>BDSKOrphanedFilesTableViewFontNameKey</key> <string>LucidaGrande</string> <key>BDSKOrphanedFilesTableViewFontSizeKey</key> - <real>0</real> + <real>0.0</real> <key>BDSKPersonTableViewFontNameKey</key> <string>LucidaGrande</string> <key>BDSKPersonTableViewFontSizeKey</key> - <real>0</real> + <real>0.0</real> <key>BDSKSortGroupsDescendingKey</key> <false/> <key>BDSKSortGroupsKey</key> @@ -700,7 +700,8 @@ <key>BDSKCurrentGroupFieldKey</key> <string>Keywords</string> <key>BDSKDefaultBibFileAliasKey</key> - <data></data> + <data> + </data> <key>BDSKDefaultGroupFieldSeparatorKey</key> <string>; </string> <key>BDSKEditorFormShouldAutoCompleteKey</key> Modified: trunk/bibdesk/NSArray_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSArray_BDSKExtensions.m 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/NSArray_BDSKExtensions.m 2021-01-21 20:57:48 UTC (rev 1716) @@ -187,13 +187,12 @@ NSUInteger test = 0; NSUInteger count = [self count]; NSComparisonResult result; - IMP objectAtIndexImp = [self methodForSelector:@selector(objectAtIndex:)]; + id (*objectAtIndexImp)(id, SEL, NSUInteger) = (typeof(objectAtIndexImp))[self methodForSelector:@selector(objectAtIndex:)]; NSSortDescriptor *sort = [sortDescriptors objectAtIndex:0]; if([sort ascending] == NO) sort = [sort reversedSortDescriptor]; - typedef NSComparisonResult (*compareImpType)(id, SEL, id, id); - compareImpType compareImp = (compareImpType)[sort methodForSelector:@selector(compareObject:toObject:)]; + NSComparisonResult (*compareImp)(id, SEL, id, id) = (typeof(compareImp))[sort methodForSelector:@selector(compareObject:toObject:)]; // @@ does not support multiple descriptors at this time while (count >= range) /* range is the lowest power of 2 > count */ Modified: trunk/bibdesk/NSTableHeaderView_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSTableHeaderView_BDSKExtensions.m 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/NSTableHeaderView_BDSKExtensions.m 2021-01-21 20:57:48 UTC (rev 1716) @@ -42,10 +42,10 @@ @implementation NSTableHeaderView (BDSKExtensions) -static IMP originalMouseDown; +static void (*originalMouseDown)(id self, SEL _cmd, NSEvent *evt); + (void)didLoad { - originalMouseDown = OBReplaceMethodImplementationWithSelector(self, @selector(mouseDown:), @selector(replacementMouseDown:)); + originalMouseDown = (typeof(originalMouseDown))OBReplaceMethodImplementationWithSelector(self, @selector(mouseDown:), @selector(replacementMouseDown:)); } - (void)replacementMouseDown:(NSEvent *)theEvent{ Modified: trunk/bibdesk/NSTableView_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSTableView_BDSKExtensions.m 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/NSTableView_BDSKExtensions.m 2021-01-21 20:57:48 UTC (rev 1716) @@ -55,9 +55,9 @@ @implementation NSTableView (BDSKExtensions) static BOOL (*originalBecomeFirstResponder)(id self, SEL _cmd); -static IMP originalDealloc; -static IMP originalDraggedImageEndedAtOperation; -static IMP originalDragImageForRowsWithIndexesTableColumnsEventOffset; +static void (*originalDealloc)(id self, SEL _cmd); +static void (*originalDraggedImageEndedAtOperation)(id self, SEL _cmd, NSImage *img, NSPoint pt, NSDragOperation op); +static NSImage * (*originalDragImageForRowsWithIndexesTableColumnsEventOffset)(id self, SEL _cmd, NSIndexSet *rows, NSArray *cols, NSEvent *evt, NSPointPointer offset); static NSMapTable *_fontNameKeyTable = nil; static NSMapTable *_fontSizeKeyTable = nil; @@ -65,9 +65,9 @@ + (void)didLoad; { originalBecomeFirstResponder = (typeof(originalBecomeFirstResponder))OBReplaceMethodImplementationWithSelector(self, @selector(becomeFirstResponder), @selector(replacementBecomeFirstResponder)); - originalDealloc = OBReplaceMethodImplementationWithSelector(self, @selector(dealloc), @selector(replacementDealloc)); - originalDraggedImageEndedAtOperation = OBReplaceMethodImplementationWithSelector(self, @selector(draggedImage:endedAt:operation:), @selector(replacementDraggedImage:endedAt:operation:)); - originalDragImageForRowsWithIndexesTableColumnsEventOffset = OBReplaceMethodImplementationWithSelector(self, @selector(dragImageForRowsWithIndexes:tableColumns:event:offset:), @selector(replacementDragImageForRowsWithIndexes:tableColumns:event:offset:)); + originalDealloc = (typeof(originalDealloc))OBReplaceMethodImplementationWithSelector(self, @selector(dealloc), @selector(replacementDealloc)); + originalDraggedImageEndedAtOperation = (typeof(originalDraggedImageEndedAtOperation))OBReplaceMethodImplementationWithSelector(self, @selector(draggedImage:endedAt:operation:), @selector(replacementDraggedImage:endedAt:operation:)); + originalDragImageForRowsWithIndexesTableColumnsEventOffset = (typeof(originalDragImageForRowsWithIndexesTableColumnsEventOffset))OBReplaceMethodImplementationWithSelector(self, @selector(dragImageForRowsWithIndexes:tableColumns:event:offset:), @selector(replacementDragImageForRowsWithIndexes:tableColumns:event:offset:)); _fontNameKeyTable = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, NSObjectMapValueCallBacks, 0); _fontSizeKeyTable = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, NSObjectMapValueCallBacks, 0); @@ -76,21 +76,21 @@ - (BOOL)validateDelegatedMenuItem:(NSMenuItem *)menuItem defaultDataSourceSelector:(SEL)dataSourceSelector{ SEL action = [menuItem action]; - if ([_dataSource respondsToSelector:action]) { - if ([_dataSource respondsToSelector:@selector(validateMenuItem:)]) { - return [_dataSource validateMenuItem:menuItem]; + if ([[self dataSource] respondsToSelector:action]) { + if ([[self dataSource] respondsToSelector:@selector(validateMenuItem:)]) { + return [[self dataSource] validateMenuItem:menuItem]; } else { return (action == @selector(paste:)) || ([self numberOfSelectedRows] > 0); } - } else if ([_delegate respondsToSelector:action]) { - if ([_delegate respondsToSelector:@selector(validateMenuItem:)]) { - return [_delegate validateMenuItem:menuItem]; + } else if ([[self delegate] respondsToSelector:action]) { + if ([[self delegate] respondsToSelector:@selector(validateMenuItem:)]) { + return [[self delegate] validateMenuItem:menuItem]; } else { return (action == @selector(paste:)) || ([self numberOfSelectedRows] > 0); } - } else if ([_dataSource respondsToSelector:dataSourceSelector]) { - if ([_dataSource respondsToSelector:@selector(validateMenuItem:)]) { - return [_dataSource validateMenuItem:menuItem]; + } else if ([[self dataSource] respondsToSelector:dataSourceSelector]) { + if ([[self dataSource] respondsToSelector:@selector(validateMenuItem:)]) { + return [[self dataSource] validateMenuItem:menuItem]; } else { return (action == @selector(paste:)) || ([self numberOfSelectedRows] > 0); } @@ -108,10 +108,10 @@ return [self validateDelegatedMenuItem:menuItem defaultDataSourceSelector:@selector(tableView:deleteRowsAtIndexes:)]; } else if (action == @selector(deleteForward:)) { - return [_dataSource respondsToSelector:@selector(tableView:deleteRowsAtIndexes:)]; + return [[self dataSource] respondsToSelector:@selector(tableView:deleteRowsAtIndexes:)]; } else if (action == @selector(deleteBackward:)) { - return [_dataSource respondsToSelector:@selector(tableView:deleteRowsAtIndexes:)]; + return [[self dataSource] respondsToSelector:@selector(tableView:deleteRowsAtIndexes:)]; } else if (action == @selector(cut:)) { return [self validateDelegatedMenuItem:menuItem defaultDataSourceSelector:isOutlineView ? @selector(outlineView:writeItems:toPasteboard:) : @selector(tableView:writeRowsWithIndexes:toPasteboard:)]; Modified: trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -171,7 +171,7 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1130; }; buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "QuickLook-BibDesk" */; compatibilityVersion = "Xcode 3.2"; @@ -291,9 +291,8 @@ CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; }; name = Debug; }; @@ -303,7 +302,7 @@ CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = macosx; + MACOSX_DEPLOYMENT_TARGET = 10.14; }; name = Release; }; Modified: trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -131,7 +131,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 1130; }; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "SkimNotesAgent" */; compatibilityVersion = "Xcode 3.2"; @@ -175,7 +175,9 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = SkimNotesAgent_Prefix.pch; INSTALL_PATH = "$(HOME)/bin"; + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_NAME = SkimNotesAgent; + SDKROOT = macosx; ZERO_LINK = YES; }; name = Debug; @@ -188,7 +190,9 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = SkimNotesAgent_Prefix.pch; INSTALL_PATH = "$(HOME)/bin"; + MACOSX_DEPLOYMENT_TARGET = 10.14; PRODUCT_NAME = SkimNotesAgent; + SDKROOT = macosx; }; name = Release; }; @@ -199,8 +203,7 @@ COPY_PHASE_STRIP = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; + MACOSX_DEPLOYMENT_TARGET = 10.7; STRIP_INSTALLED_PRODUCT = NO; }; name = Debug; @@ -212,7 +215,7 @@ COPY_PHASE_STRIP = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = macosx; + MACOSX_DEPLOYMENT_TARGET = 10.7; STRIP_INSTALLED_PRODUCT = NO; }; name = Release; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/ColorSync/OAColorProfile-Deprecated.m =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/ColorSync/OAColorProfile-Deprecated.m 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/ColorSync/OAColorProfile-Deprecated.m 2021-01-21 20:57:48 UTC (rev 1716) @@ -13,6 +13,7 @@ @implementation OAColorProfile (Deprecated) +#if OA_USE_COLOR_MANAGER - (BOOL)_rawProfileIsBuiltIn:(CMProfileRef)rawProfile; { UInt32 locationSize; @@ -49,5 +50,6 @@ free(profileLocation); return isBuiltIn; } +#endif @end Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OAFeatures.h =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OAFeatures.h 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OAFeatures.h 2021-01-21 20:57:48 UTC (rev 1716) @@ -9,4 +9,4 @@ #import <Availability.h> -#define OA_USE_COLOR_MANAGER 1 // Deprecated in 10.7, but there is no replacement yet. +#define OA_USE_COLOR_MANAGER 0 // Deprecated in 10.7, but there is no replacement yet. Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -2698,7 +2698,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0710; - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1130; }; buildConfigurationList = 4A4E085608AA75E90098FF0F /* Build configuration list for PBXProject "OmniAppKit" */; compatibilityVersion = "Xcode 3.2"; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -563,7 +563,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0710; - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1130; }; buildConfigurationList = 4AA3CEDC08A01555004389CD /* Build configuration list for PBXProject "OmniBase" */; compatibilityVersion = "Xcode 3.2"; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -3569,7 +3569,7 @@ isa = PBXProject; attributes = { LastTestingUpgradeCheck = 0710; - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1130; }; buildConfigurationList = 4AD1C16408A9803A00C087FE /* Build configuration list for PBXProject "OmniFoundation" */; compatibilityVersion = "Xcode 3.2"; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifier.xcscheme =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifier.xcscheme 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifier.xcscheme 2021-01-21 20:57:48 UTC (rev 1716) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0710" + LastUpgradeVersion = "1130" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -41,8 +41,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> <MacroExpansion> <BuildableReference BuildableIdentifier = "primary" @@ -52,8 +50,8 @@ ReferencedContainer = "container:OmniFoundation.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> + <Testables> + </Testables> </TestAction> <LaunchAction buildConfiguration = "Debug" @@ -97,8 +95,6 @@ isEnabled = "NO"> </EnvironmentVariable> </EnvironmentVariables> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Release" Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifierTest.xcscheme =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifierTest.xcscheme 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifierTest.xcscheme 2021-01-21 20:57:48 UTC (rev 1716) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0710" + LastUpgradeVersion = "1130" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> <MacroExpansion> <BuildableReference BuildableIdentifier = "primary" @@ -38,8 +36,8 @@ ReferencedContainer = "container:OmniFoundation.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> + <Testables> + </Testables> </TestAction> <LaunchAction buildConfiguration = "Debug" @@ -61,8 +59,6 @@ ReferencedContainer = "container:OmniFoundation.xcodeproj"> </BuildableReference> </BuildableProductRunnable> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Release" Modified: trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -228,7 +228,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1130; }; buildConfigurationList = F93566970912D572002B6957 /* Build configuration list for PBXProject "AGRegex" */; compatibilityVersion = "Xcode 3.2"; Modified: trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -317,7 +317,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1130; }; buildConfigurationList = F9ABEBF0086E102800741FC5 /* Build configuration list for PBXProject "BTParse" */; compatibilityVersion = "Xcode 3.2"; Modified: trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) +++ trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj 2021-01-21 20:57:48 UTC (rev 1716) @@ -263,6 +263,8 @@ isa = PBXBuildRule; compilerSpec = com.apple.compilers.proxy.script; fileType = sourcecode.yacc; + inputFiles = ( + ); isEditable = 1; outputFiles = ( "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).tab.c", @@ -1034,7 +1036,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1130; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "yaz" */; compatibilityVersion = "Xcode 3.2"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2020-05-11 20:31:10
|
Revision: 1715 http://sourceforge.net/p/tcobrowser/code/1715 Author: amaxwell Date: 2020-05-11 20:31:07 +0000 (Mon, 11 May 2020) Log Message: ----------- fix compile problems on High Sierra and Mojave Modified Paths: -------------- trunk/bibdesk/BDSKSharedGroup.m trunk/bibdesk/BDSKTextImportController.m trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme trunk/bibdesk/DocumentGroupView.xib trunk/bibdesk/DocumentMainTable.xib trunk/bibdesk/DocumentTextView.xib trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/FileManagement.subproj/OFAlias.m trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifier.xcscheme trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/xcshareddata/xcschemes/OFNetStateNotifierTest.xcscheme trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/Scheduling.subproj/OFMessageQueue.m trunk/bibdesk/vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/gward/btparse/objc/BTParse.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/indexdata/yaz/objc/Default-Build-Settings.xcconfig trunk/bibdesk/vendorsrc/indexdata/yaz/objc/yaz.xcodeproj/project.pbxproj Modified: trunk/bibdesk/BDSKSharedGroup.m =================================================================== --- trunk/bibdesk/BDSKSharedGroup.m 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/BDSKSharedGroup.m 2020-05-11 20:31:07 UTC (rev 1715) @@ -42,7 +42,7 @@ #import "BDSKPasswordController.h" #import "NSArray_BDSKExtensions.h" #import "NSImage_BDSKExtensions.h" -#import <BDSKAsynchronousDOServer.h> +#import "BDSKAsynchronousDOServer.h" #import "BDSKPublicationsArray.h" #import "BDSKMacroResolver.h" #import "BDSKItemSearchIndexes.h" Modified: trunk/bibdesk/BDSKTextImportController.m =================================================================== --- trunk/bibdesk/BDSKTextImportController.m 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/BDSKTextImportController.m 2020-05-11 20:31:07 UTC (rev 1715) @@ -1281,10 +1281,10 @@ if (control != itemTableView) { return charRange; } else if ([complexStringEditor isEditing]) { - return [[NSApp delegate] rangeForUserCompletion:charRange + return [(BDSKAppController *)[NSApp delegate] rangeForUserCompletion:charRange forBibTeXString:[textView string]]; } else { - return [[NSApp delegate] entry:[fields objectAtIndex:[itemTableView selectedRow]] + return [(BDSKAppController *)[NSApp delegate] entry:[fields objectAtIndex:[itemTableView selectedRow]] rangeForUserCompletion:charRange ofString:[textView string]]; Modified: trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) @@ -138,7 +138,7 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0710; }; buildConfigurationList = F95CC105087F54B2002C5694 /* Build configuration list for PBXProject "BibImporter" */; compatibilityVersion = "Xcode 3.2"; Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2020-05-11 20:31:07 UTC (rev 1715) @@ -306,8 +306,6 @@ F97C9DBF0C4486700002EE01 /* BDSKISIWebServices.m in Sources */ = {isa = PBXBuildFile; fileRef = F97C9DBD0C44866F0002EE01 /* BDSKISIWebServices.m */; }; F97F91380F5C491500FBF758 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F97F91370F5C491500FBF758 /* Localizable.strings */; }; F97FA7930AF56FA100C32BBA /* BDSKImageFadeAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = F97FA7910AF56FA100C32BBA /* BDSKImageFadeAnimation.m */; }; - F98AACDE0D43DB5A00D3CD64 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F98AACDD0D43DB5A00D3CD64 /* libssl.dylib */; }; - F98AACF50D43E13C00D3CD64 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F98AACF40D43E13C00D3CD64 /* libcrypto.dylib */; }; F990C58C0D42D58D00B5425E /* BDSKDocumentSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = F990C58A0D42D58D00B5425E /* BDSKDocumentSearch.m */; }; F9936CC60BC746C300A32DC4 /* BDSKItemSearchIndexes.m in Sources */ = {isa = PBXBuildFile; fileRef = F9936CC40BC746C300A32DC4 /* BDSKItemSearchIndexes.m */; }; F9937E230AD8268E001D1DFB /* BDSKPDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = F98F33C90892D4B700C1427D /* BDSKPDFView.m */; }; @@ -631,6 +629,27 @@ remoteGlobalIDString = 4AA1E67A08AA764600E2FF6B; remoteInfo = "OmniAppKit (Framework)"; }; + F97504D91D39849D0006E2C9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = FileView; + }; + F97504DB1D39849D0006E2C9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F94692510CA575F000AC2772; + remoteInfo = "FileView Program"; + }; + F97504DD1D39849D0006E2C9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F9F255FE0E14A3430059A21A; + remoteInfo = FileViewIBPlugin; + }; F98C6FCF0CDD30A2002FCAD8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F98C6FC80CDD30A2002FCAD8 /* QuickLook-BibDesk.xcodeproj */; @@ -666,34 +685,6 @@ remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = yaz; }; - F9B945A70E1A8AE600395BA4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8DC2EF5B0486A6940098B216; - remoteInfo = FileView; - }; - F9B945AB0E1A8AE600395BA4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F94692510CA575F000AC2772; - remoteInfo = "FileView Program"; - }; - F9B945AD0E1A8AE600395BA4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F9F255FE0E14A3430059A21A; - remoteInfo = FileViewIBPlugin; - }; - F9B9460E0E1A9BB000395BA4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = F9F04CE10CE260EB00F28ED2; - remoteInfo = "Framework + Plugins"; - }; F9C7E5460BEA3C0500D65C7F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F911CB4008972F7300ABDAC6 /* AGRegex.xcodeproj */; @@ -1203,7 +1194,7 @@ F90C64040AC62B7B008B2DDA /* BDSKShellCommandFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKShellCommandFormatter.h; sourceTree = "<group>"; }; F90C64050AC62B7B008B2DDA /* BDSKShellCommandFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKShellCommandFormatter.m; sourceTree = "<group>"; }; F911CB4008972F7300ABDAC6 /* AGRegex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AGRegex.xcodeproj; path = vendorsrc/agkit_sourceforge/agregex/AGRegex.xcodeproj; sourceTree = "<group>"; }; - F911D6A80CFE8E420009C77B /* FileView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FileView.xcodeproj; path = vendorsrc/FileView/FileView.xcodeproj; sourceTree = "<group>"; }; + F911D6A80CFE8E420009C77B /* FileView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FileView.xcodeproj; path = vendorsrc/FileView/trunk/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>"; }; F91522050F64664D0093E326 /* BDSKGroupTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKGroupTree.h; sourceTree = "<group>"; }; @@ -1343,8 +1334,6 @@ F97FA7910AF56FA100C32BBA /* BDSKImageFadeAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKImageFadeAnimation.m; sourceTree = "<group>"; }; F98AA67F0971E3F400184BD8 /* BDSKTextViewCompletionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKTextViewCompletionController.h; sourceTree = "<group>"; }; F98AA6800971E3F400184BD8 /* BDSKTextViewCompletionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKTextViewCompletionController.m; sourceTree = "<group>"; }; - F98AACDD0D43DB5A00D3CD64 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; }; - F98AACF40D43E13C00D3CD64 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; }; F98C6FC80CDD30A2002FCAD8 /* QuickLook-BibDesk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "QuickLook-BibDesk.xcodeproj"; path = "QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj"; sourceTree = "<group>"; }; F98F33C80892D4B700C1427D /* BDSKPDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BDSKPDFView.h; sourceTree = "<group>"; }; F98F33C90892D4B700C1427D /* BDSKPDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKPDFView.m; sourceTree = "<group>"; }; @@ -1452,7 +1441,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F98AACDE0D43DB5A00D3CD64 /* libssl.dylib in Frameworks */, F9B801840B41E89500A5A615 /* yaz.framework in Frameworks */, F9937E6C0AD82700001D1DFB /* QuartzCore.framework in Frameworks */, F9937E4E0AD826EB001D1DFB /* Quartz.framework in Frameworks */, @@ -1469,7 +1457,6 @@ F9DF3BC209B7605E00342ADE /* SystemConfiguration.framework in Frameworks */, F92ECBA009DEF86600A244D0 /* Security.framework in Frameworks */, F95ED6950B07BA4E00000BBF /* ExceptionHandling.framework in Frameworks */, - F98AACF50D43E13C00D3CD64 /* libcrypto.dylib in Frameworks */, F9B945F70E1A9B5A00395BA4 /* FileView.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1652,8 +1639,6 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - F98AACF40D43E13C00D3CD64 /* libcrypto.dylib */, - F98AACDD0D43DB5A00D3CD64 /* libssl.dylib */, F9B801830B41E89500A5A615 /* yaz.framework */, F95ED6910B07BA4E00000BBF /* ExceptionHandling.framework */, F92ECB6B09DEF86500A244D0 /* Security.framework */, @@ -2386,6 +2371,16 @@ name = Products; sourceTree = "<group>"; }; + F97504D31D39849C0006E2C9 /* Products */ = { + isa = PBXGroup; + children = ( + F97504DA1D39849D0006E2C9 /* FileView.framework */, + F97504DC1D39849D0006E2C9 /* FileView Program.app */, + F97504DE1D39849D0006E2C9 /* FileViewIBPlugin.ibplugin */, + ); + name = Products; + sourceTree = "<group>"; + }; F988709007580CB4001D4D49 /* Preferences */ = { isa = PBXGroup; children = ( @@ -2438,16 +2433,6 @@ name = Products; sourceTree = "<group>"; }; - F9B945A00E1A8AE600395BA4 /* Products */ = { - isa = PBXGroup; - children = ( - F9B945A80E1A8AE600395BA4 /* FileView.framework */, - F9B945AC0E1A8AE600395BA4 /* FileView Program.app */, - F9B945AE0E1A8AE600395BA4 /* FileViewIBPlugin.ibplugin */, - ); - name = Products; - sourceTree = "<group>"; - }; F9C7E5420BEA3C0500D65C7F /* Products */ = { isa = PBXGroup; children = ( @@ -2508,7 +2493,6 @@ F974E79411F8C703006E7029 /* PBXTargetDependency */, F974E79611F8C703006E7029 /* PBXTargetDependency */, F974E79811F8C703006E7029 /* PBXTargetDependency */, - F9B9460F0E1A9BB000395BA4 /* PBXTargetDependency */, F9AF56360BEA4160009B16D5 /* PBXTargetDependency */, F9AF56380BEA4160009B16D5 /* PBXTargetDependency */, F9AF562C0BEA4160009B16D5 /* PBXTargetDependency */, @@ -2556,7 +2540,7 @@ ProjectRef = F9ABECF2086E142100741FC5 /* BTParse.xcodeproj */; }, { - ProductGroup = F9B945A00E1A8AE600395BA4 /* Products */; + ProductGroup = F97504D31D39849C0006E2C9 /* Products */; ProjectRef = F911D6A80CFE8E420009C77B /* FileView.xcodeproj */; }, { @@ -2769,41 +2753,41 @@ remoteRef = F974E6EB11F8C697006E7029 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F98C6FD00CDD30A2002FCAD8 /* BibDesk.qlgenerator */ = { + F97504DA1D39849D0006E2C9 /* FileView.framework */ = { isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = BibDesk.qlgenerator; - remoteRef = F98C6FCF0CDD30A2002FCAD8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - F9AF4DF50BEA3E5B009B16D5 /* BTParse.framework */ = { - isa = PBXReferenceProxy; fileType = wrapper.framework; - path = BTParse.framework; - remoteRef = F9AF4DF40BEA3E5B009B16D5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - F9B945A80E1A8AE600395BA4 /* FileView.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; path = FileView.framework; - remoteRef = F9B945A70E1A8AE600395BA4 /* PBXContainerItemProxy */; + remoteRef = F97504D91D39849D0006E2C9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F9B945AC0E1A8AE600395BA4 /* FileView Program.app */ = { + F97504DC1D39849D0006E2C9 /* FileView Program.app */ = { isa = PBXReferenceProxy; fileType = wrapper.application; path = "FileView Program.app"; - remoteRef = F9B945AB0E1A8AE600395BA4 /* PBXContainerItemProxy */; + remoteRef = F97504DB1D39849D0006E2C9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F9B945AE0E1A8AE600395BA4 /* FileViewIBPlugin.ibplugin */ = { + F97504DE1D39849D0006E2C9 /* FileViewIBPlugin.ibplugin */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = FileViewIBPlugin.ibplugin; - remoteRef = F9B945AD0E1A8AE600395BA4 /* PBXContainerItemProxy */; + remoteRef = F97504DD1D39849D0006E2C9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + F98C6FD00CDD30A2002FCAD8 /* BibDesk.qlgenerator */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = BibDesk.qlgenerator; + remoteRef = F98C6FCF0CDD30A2002FCAD8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F9AF4DF50BEA3E5B009B16D5 /* BTParse.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = BTParse.framework; + remoteRef = F9AF4DF40BEA3E5B009B16D5 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; F9C7E5470BEA3C0500D65C7F /* AGRegex.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -3386,11 +3370,6 @@ name = yaz; targetProxy = F9AF56370BEA4160009B16D5 /* PBXContainerItemProxy */; }; - F9B9460F0E1A9BB000395BA4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Framework + Plugins"; - targetProxy = F9B9460E0E1A9BB000395BA4 /* PBXContainerItemProxy */; - }; F9EF0CE20B4EFC8F00A1F282 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = BibImporter; Modified: trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme 2020-05-11 20:31:07 UTC (rev 1715) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0500" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -23,10 +23,10 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> <MacroExpansion> @@ -38,17 +38,21 @@ ReferencedContainer = "container:Bibdesk.xcodeproj"> </BuildableReference> </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> - <BuildableProductRunnable> + <BuildableProductRunnable + runnableDebuggingMode = "0"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "8D1107260486CEB800E47090" @@ -57,16 +61,24 @@ ReferencedContainer = "container:Bibdesk.xcodeproj"> </BuildableReference> </BuildableProductRunnable> + <EnvironmentVariables> + <EnvironmentVariable + key = "CG_PDF_VERBOSE" + value = "1" + isEnabled = "YES"> + </EnvironmentVariable> + </EnvironmentVariables> <AdditionalOptions> </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Release" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" debugDocumentVersioning = "YES"> - <BuildableProductRunnable> + <BuildableProductRunnable + runnableDebuggingMode = "0"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "8D1107260486CEB800E47090" Modified: trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme 2020-05-11 20:31:07 UTC (rev 1715) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0500" + LastUpgradeVersion = "0710" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -23,10 +23,10 @@ </BuildActionEntries> </BuildAction> <TestAction + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> </Testables> <MacroExpansion> @@ -38,17 +38,21 @@ ReferencedContainer = "container:Bibdesk.xcodeproj"> </BuildableReference> </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> </TestAction> <LaunchAction + buildConfiguration = "Release" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" + debugServiceExtension = "internal" allowLocationSimulation = "YES"> - <BuildableProductRunnable> + <BuildableProductRunnable + runnableDebuggingMode = "0"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "8D1107260486CEB800E47090" @@ -61,12 +65,13 @@ </AdditionalOptions> </LaunchAction> <ProfileAction + buildConfiguration = "Release" shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" debugDocumentVersioning = "YES"> - <BuildableProductRunnable> + <BuildableProductRunnable + runnableDebuggingMode = "0"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "8D1107260486CEB800E47090" Modified: trunk/bibdesk/DocumentGroupView.xib =================================================================== --- trunk/bibdesk/DocumentGroupView.xib 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/DocumentGroupView.xib 2020-05-11 20:31:07 UTC (rev 1715) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> - <deployment version="1050" identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="BDSKDocumentGroupViewController"> @@ -21,11 +21,11 @@ <rect key="frame" x="0.0" y="0.0" width="276" height="389"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <clipView key="contentView" drawsBackground="NO" id="R54-11-gh2"> - <rect key="frame" x="0.0" y="17" width="276" height="372"/> + <rect key="frame" x="0.0" y="0.0" width="276" height="389"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <tableView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" emptySelection="NO" autosaveColumns="NO" headerView="15" id="12" customClass="BDSKGroupOutlineView"> - <rect key="frame" x="0.0" y="0.0" width="276" height="19"/> + <rect key="frame" x="0.0" y="0.0" width="276" height="372"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -49,11 +49,11 @@ </subviews> <nil key="backgroundColor"/> </clipView> - <scroller key="horizontalScroller" hidden="YES" appearanceType="vibrantLight" verticalHuggingPriority="750" horizontal="YES" id="14"> + <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="14"> <rect key="frame" x="-100" y="-100" width="110" height="15"/> <autoresizingMask key="autoresizingMask"/> </scroller> - <scroller key="verticalScroller" hidden="YES" appearanceType="vibrantLight" verticalHuggingPriority="750" horizontal="NO" id="13"> + <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="13"> <rect key="frame" x="-30" y="17" width="15" height="444"/> <autoresizingMask key="autoresizingMask"/> </scroller> Modified: trunk/bibdesk/DocumentMainTable.xib =================================================================== --- trunk/bibdesk/DocumentMainTable.xib 2020-05-11 20:30:36 UTC (rev 1714) +++ trunk/bibdesk/DocumentMainTable.xib 2020-05-11 20:31:07 UTC (rev 1715) @@ -1,1471 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> - <data> - <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10A286</string> - <string key="IBDocument.InterfaceBuilderVersion">715</string> - <string key="IBDocument.AppKitVersion">1009.3</string> - <string key="IBDocument.HIToolboxVersion">411.00</string> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">715</string> - </object> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="2"/> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomObject" id="1001"> - <string key="NSClassName">BDSKDocumentMainTableController</string> - </object> - <object class="NSCustomObject" id="1003"> - <string key="NSClassName">FirstResponder</string> - </object> - <object class="NSCustomObject" id="1004"> - <string key="NSClassName">NSApplication</string> - </object> - <object class="NSCustomView" id="1005"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="434877481"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="313317402"> - <reference key="NSNextResponder" ref="434877481"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTableView" id="75629711"> - <reference key="NSNextResponder" ref="313317402"/> - <int key="NSvFlags">4370</int> - <string key="NSFrameSize">{478, 254}</string> - <reference key="NSSuperview" ref="313317402"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTableHeaderView" key="NSHeaderView" id="823368088"> - <reference key="NSNextResponder" ref="639941207"/> - <int key="NSvFlags">256</int> - <string key="NSFrameSize">{478, 17}</string> - <reference key="NSSuperview" ref="639941207"/> - <reference key="NSTableView" ref="75629711"/> - </object> - <object class="_NSCornerView" key="NSCornerView" id="497717502"> - <reference key="NSNextResponder" ref="434877481"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{464, 0}, {16, 17}}</string> - <reference key="NSSuperview" ref="434877481"/> - </object> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <double key="NSIntercellSpacingWidth">3</double> - <double key="NSIntercellSpacingHeight">2</double> - <object class="NSColor" key="NSBackgroundColor" id="344585358"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MSAxIDEAA</bytes> - </object> - <reference key="NSGridColor" ref="344585358"/> - <double key="NSRowHeight">14</double> - <int key="NSTvFlags">-627048448</int> - <reference key="NSDelegate"/> - <reference key="NSDataSource"/> - <int key="NSColumnAutoresizingStyle">4</int> - <int key="NSDraggingSourceMaskForLocal">15</int> - <int key="NSDraggingSourceMaskForNonLocal">0</int> - <bool key="NSAllowsTypeSelect">YES</bool> - <int key="NSTableViewDraggingDestinationStyle">0</int> - </object> - </object> - <string key="NSFrame">{{1, 17}, {478, 254}}</string> - <reference key="NSSuperview" ref="434877481"/> - <reference key="NSNextKeyView" ref="75629711"/> - <reference key="NSDocView" ref="75629711"/> - <reference key="NSBGColor" ref="344585358"/> - <int key="NScvFlags">4</int> - </object> - <object class="NSScroller" id="358577832"> - <reference key="NSNextResponder" ref="434877481"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{464, 17}, {15, 239}}</string> - <reference key="NSSuperview" ref="434877481"/> - <reference key="NSTarget" ref="434877481"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.45437261462211609</double> - </object> - <object class="NSScroller" id="752592137"> - <reference key="NSNextResponder" ref="434877481"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{1, 256}, {463, 15}}</string> - <reference key="NSSuperview" ref="434877481"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="434877481"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.96987950801849365</double> - </object> - <object class="NSClipView" id="639941207"> - <reference key="NSNextResponder" ref="434877481"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="823368088"/> - </object> - <string key="NSFrame">{{1, 0}, {478, 17}}</string> - <reference key="NSSuperview" ref="434877481"/> - <reference key="NSNextKeyView" ref="823368088"/> - <reference key="NSDocView" ref="823368088"/> - <object class="NSColor" key="NSBGColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlBackgroundColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> - </object> - </object> - <int key="NScvFlags">4</int> - </object> - <reference ref="497717502"/> - </object> - <string key="NSFrameSize">{480, 272}</string> - <reference key="NSSuperview" ref="1005"/> - <reference key="NSNextKeyView" ref="313317402"/> - <int key="NSsFlags">562</int> - <reference key="NSVScroller" ref="358577832"/> - <reference key="NSHScroller" ref="752592137"/> - <reference key="NSContentView" ref="313317402"/> - <reference key="NSHeaderClipView" ref="639941207"/> - <reference key="NSCornerView" ref="497717502"/> - <bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes> - </object> - </object> - <string key="NSFrameSize">{480, 272}</string> - <reference key="NSSuperview"/> - <string key="NSClassName">NSView</string> - </object> - </object> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="1005"/> - </object> - <int key="connectionID">7</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">tableView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="75629711"/> - </object> - <int key="connectionID">8</int> - </object> - </object> - <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <reference key="object" ref="0"/> - <reference key="children" ref="1000"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-2</int> - <reference key="object" ref="1001"/> - <reference key="parent" ref="0"/> - <string key="objectName">File's Owner</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-1</int> - <reference key="object" ref="1003"/> - <reference key="parent" ref="0"/> - <string key="objectName">First Responder</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-3</int> - <reference key="object" ref="1004"/> - <reference key="parent" ref="0"/> - <string key="objectName">Application</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1</int> - <reference key="object" ref="1005"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="434877481"/> - </object> - <reference key="parent" ref="0"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">2</int> - <reference key="object" ref="434877481"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="75629711"/> - <reference ref="358577832"/> - <reference ref="752592137"/> - <reference ref="823368088"/> - </object> - <reference key="parent" ref="1005"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3</int> - <reference key="object" ref="75629711"/> - <reference key="parent" ref="434877481"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">4</int> - <reference key="object" ref="358577832"/> - <reference key="parent" ref="434877481"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="752592137"/> - <reference key="parent" ref="434877481"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6</int> - <reference key="object" ref="823368088"/> - <reference key="parent" ref="434877481"/> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>-3.IBPluginDependency</string> - <string>1.IBEditorWindowLastContentRect</string> - <string>1.IBPluginDependency</string> - <string>1.WindowOrigin</string> - <string>1.editorWindowContentRectSynchronizationRect</string> - <string>2.IBPluginDependency</string> - <string>2.ImportedFromIB2</string> - <string>3.CustomClassName</string> - <string>3.IBPluginDependency</string> - <string>3.ImportedFromIB2</string> - <string>4.IBPluginDependency</string> - <string>4.IBShouldRemoveOnLegacySave</string> - <string>5.IBPluginDependency</string> - <string>5.IBShouldRemoveOnLegacySave</string> - <string>6.IBPluginDependency</string> - <string>6.IBShouldRemoveOnLegacySave</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{222, 559}, {480, 272}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{628, 654}</string> - <string>{{217, 442}, {480, 272}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>BDSKMainTableView</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="sourceID"/> - <int key="maxID">8</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">BDSKDocumentMainTableController</string> - <string key="superclassName">NSViewController</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">tableView</string> - <string key="NS.object.0">BDSKMainTableView</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDocumentMainTableController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">BDSKMainTableView</string> - <string key="superclassName">NSTableView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="897402482"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKMainTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="794203920"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKFieldEditor.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">NSMenu_BDSKExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKBookmarkOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKCitationFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKComplexStringFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDocumentSearch.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDragImageView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDragTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDragWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKEditorTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="794203920"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKGroupOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKImageFadeAnimation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKImagePopUpButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKItemPasteboardHelper.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKLinkedFile.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="897402482"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKNotesWindowController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKOrphanedFileServer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKSplitView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKStatusBar.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKTeXTask.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKTextImportController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKUndoManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">NSObject_BDSKExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="118397541"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">NSTableView_BDSKExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">vendorsrc/harmless/AMButtonBar.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">vendorsrc/kenferry/KFASHandlerAdditions-TypeTranslation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableHeaderView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">NSTableHeaderView_BDSKExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BibPref_Crossref.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableView</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>changeFont:</string> - <string>invertSelection:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - </object> - </object> - <reference key="sourceIdentifier" ref="118397541"/> - </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="712649215"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="865348963"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="253220988"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSApplication-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="541043170"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSControl-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OASteppableTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="712251078"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSMenu-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AddressBook.framework/Headers/ABActions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="712649215"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="865348963"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="253220988"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="541043170"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="712251078"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> - </object> - </object> - <object class="IBPartialClassDescription"... [truncated message content] |
From: <ama...@us...> - 2020-05-11 20:30:38
|
Revision: 1714 http://sourceforge.net/p/tcobrowser/code/1714 Author: amaxwell Date: 2020-05-11 20:30:36 +0000 (Mon, 11 May 2020) Log Message: ----------- enqueue change notifications so they can be coalesced when opening a large file Modified Paths: -------------- trunk/bibdesk/BibItem.m Modified: trunk/bibdesk/BibItem.m =================================================================== --- trunk/bibdesk/BibItem.m 2020-05-11 20:28:23 UTC (rev 1713) +++ trunk/bibdesk/BibItem.m 2020-05-11 20:30:36 UTC (rev 1714) @@ -2404,9 +2404,12 @@ [self updateMetadataForKey:key]; // make sure the UI is notified that the linked file has changed, as this is often called after setField:toValue: NSDictionary *notifInfo = [NSDictionary dictionaryWithObjectsAndKeys:key, @"key", nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:BDSKBibItemChangedNotification - object:self - userInfo:notifInfo]; + NSNotification *note = [NSNotification notificationWithName:BDSKBibItemChangedNotification object:self userInfo:notifInfo]; + [[NSNotificationQueue defaultQueue] enqueueNotification:note + postingStyle:NSPostWhenIdle + coalesceMask:NSNotificationCoalescingOnName + forModes:[NSArray arrayWithObject:NSDefaultRunLoopMode]]; + } static NSComparisonResult sortURLsByType(NSURL *first, NSURL *second, void *unused) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2020-05-11 20:28:25
|
Revision: 1713 http://sourceforge.net/p/tcobrowser/code/1713 Author: amaxwell Date: 2020-05-11 20:28:23 +0000 (Mon, 11 May 2020) Log Message: ----------- compiler problem Modified Paths: -------------- trunk/bibdesk/BDSKEditor.m Modified: trunk/bibdesk/BDSKEditor.m =================================================================== --- trunk/bibdesk/BDSKEditor.m 2016-06-20 18:58:34 UTC (rev 1712) +++ trunk/bibdesk/BDSKEditor.m 2020-05-11 20:28:23 UTC (rev 1713) @@ -2262,10 +2262,10 @@ if (control != tableView) { return charRange; } else if ([complexStringEditor isEditing]) { - return [[NSApp delegate] rangeForUserCompletion:charRange + return [(BDSKAppController *)[NSApp delegate] rangeForUserCompletion:charRange forBibTeXString:[textView string]]; } else { - return [[NSApp delegate] entry:[fields objectAtIndex:[tableView editedRow]] + return [(BDSKAppController *)[NSApp delegate] entry:[fields objectAtIndex:[tableView editedRow]] rangeForUserCompletion:charRange ofString:[textView string]]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2016-06-20 18:58:37
|
Revision: 1712 http://sourceforge.net/p/tcobrowser/code/1712 Author: amaxwell Date: 2016-06-20 18:58:34 +0000 (Mon, 20 Jun 2016) Log Message: ----------- add github external for fileview, allow non-https loads Modified Paths: -------------- trunk/bibdesk/Info.plist trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj Property Changed: ---------------- trunk/bibdesk/ Index: trunk/bibdesk =================================================================== --- trunk/bibdesk 2015-11-09 23:01:01 UTC (rev 1711) +++ trunk/bibdesk 2016-06-20 18:58:34 UTC (rev 1712) Property changes on: trunk/bibdesk ___________________________________________________________________ Modified: svn:externals ## -1 +1 ## -vendorsrc/FileView https://fileview.googlecode.com/svn/trunk/fileview +vendorsrc/FileView https://github.com/amaxwell/fileview Modified: trunk/bibdesk/Info.plist =================================================================== --- trunk/bibdesk/Info.plist 2015-11-09 23:01:01 UTC (rev 1711) +++ trunk/bibdesk/Info.plist 2016-06-20 18:58:34 UTC (rev 1712) @@ -235,6 +235,11 @@ <string>MainMenu</string> <key>NSPrincipalClass</key> <string>BDSKApplication</string> + <key>NSAppTransportSecurity</key> + <dict> + <key>NSAllowsArbitraryLoads</key> + <true/> + </dict> <key>NSServices</key> <array> <dict> Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj 2015-11-09 23:01:01 UTC (rev 1711) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj 2016-06-20 18:58:34 UTC (rev 1712) @@ -2697,7 +2697,7 @@ 00E51EF1FE8AB2E911C9CC38 /* Project object */ = { isa = PBXProject; attributes = { - LastTestingUpgradeCheck = 0700; + LastTestingUpgradeCheck = 0710; LastUpgradeCheck = 0500; }; buildConfigurationList = 4A4E085608AA75E90098FF0F /* Build configuration list for PBXProject "OmniAppKit" */; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj 2015-11-09 23:01:01 UTC (rev 1711) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj 2016-06-20 18:58:34 UTC (rev 1712) @@ -562,7 +562,7 @@ 00E51C1BFE8AAE2511C9CC38 /* Project object */ = { isa = PBXProject; attributes = { - LastTestingUpgradeCheck = 0700; + LastTestingUpgradeCheck = 0710; LastUpgradeCheck = 0500; }; buildConfigurationList = 4AA3CEDC08A01555004389CD /* Build configuration list for PBXProject "OmniBase" */; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj 2015-11-09 23:01:01 UTC (rev 1711) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj 2016-06-20 18:58:34 UTC (rev 1712) @@ -3568,7 +3568,7 @@ 00E51C5BFE8AAEA611C9CC38 /* Project object */ = { isa = PBXProject; attributes = { - LastTestingUpgradeCheck = 0700; + LastTestingUpgradeCheck = 0710; LastUpgradeCheck = 0500; }; buildConfigurationList = 4AD1C16408A9803A00C087FE /* Build configuration list for PBXProject "OmniFoundation" */; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2015-11-09 23:01:03
|
Revision: 1711 http://sourceforge.net/p/tcobrowser/code/1711 Author: amaxwell Date: 2015-11-09 23:01:01 +0000 (Mon, 09 Nov 2015) Log Message: ----------- fix compilation under Xcode 7 Modified Paths: -------------- trunk/bibdesk/BDSKLinkedFile.m trunk/bibdesk/DocumentGroupView.xib trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj trunk/bibdesk/vendorsrc/indexdata/yaz/objc/Default-Build-Settings.xcconfig Modified: trunk/bibdesk/BDSKLinkedFile.m =================================================================== --- trunk/bibdesk/BDSKLinkedFile.m 2014-10-02 19:13:20 UTC (rev 1710) +++ trunk/bibdesk/BDSKLinkedFile.m 2015-11-09 23:01:01 UTC (rev 1711) @@ -38,8 +38,6 @@ #import "BDSKLinkedFile.h" #import <CoreServices/CoreServices.h> -#include <openssl/bio.h> -#include <openssl/evp.h> static void BDSKDisposeAliasHandle(AliasHandle inAlias) { @@ -330,37 +328,11 @@ return [self initWithAlias:anAlias relativePath:relPath delegate:aDelegate]; } -static inline bool __BDSKCStringHasLinebreak(const char *str) -{ - while (*str++ != '\0') { - if (*str == '\n' || *str == '\r') - return true; - } - return false; -} - -static NSData * __BDSKCreateDataFromBase64String(NSString *encodedString) -{ - CFErrorRef error; - SecTransformRef decoder; - CFDataRef input, output = NULL; - - decoder = SecDecodeTransformCreate(kSecBase64Encoding, &error); - if (decoder) { - input = (CFDataRef)[encodedString dataUsingCFEncoding:CFStringGetFastestEncoding((CFStringRef)encodedString)]; - SecTransformSetAttribute(decoder, kSecTransformInputAttributeName, input, &error); - output = SecTransformExecute(decoder, &error); - CFRelease(decoder); - } - - return (NSData *)output; -} - - (id)initWithBase64String:(NSString *)base64String delegate:(id)aDelegate; { OBASSERT(nil != base64String); - NSData *data = __BDSKCreateDataFromBase64String(base64String); + NSData *data = [[NSData alloc] initWithBase64EncodedString:base64String options:NSDataBase64DecodingIgnoreUnknownCharacters]; NSDictionary *dictionary = [NSKeyedUnarchiver unarchiveObjectWithData:data]; [data release]; return [self initWithAliasData:[dictionary objectForKey:@"aliasData"] relativePath:[dictionary objectForKey:@"relativePath"] delegate:aDelegate]; @@ -565,34 +537,14 @@ return [(NSData *)data autorelease]; } -static NSString * __BDSKCreateBase64StringWithData(NSData *data) -{ - CFErrorRef error; - SecTransformRef encoder; - CFDataRef output; - - encoder = SecEncodeTransformCreate(kSecBase64Encoding, &error); - NSString *base64String = nil; - - if (encoder) { - SecTransformSetAttribute(encoder, kSecTransformInputAttributeName, (CFDataRef)data, &error); - output = SecTransformExecute(encoder, &error); - CFRelease(encoder); - - base64String = [[NSString alloc] initWithData:(NSData *)output encoding:NSASCIIStringEncoding]; - if (output) CFRelease(output); - } - return base64String; -} - - (NSString *)stringRelativeToPath:(NSString *)newBasePath; { NSData *data = [self aliasDataRelativeToPath:newBasePath]; NSString *path = [self path]; path = path && newBasePath ? [newBasePath relativePathToFilename:path] : relativePath; NSDictionary *dictionary = [[NSDictionary alloc] initWithObjectsAndKeys:data, @"aliasData", path, @"relativePath", nil]; - NSString *base64String = __BDSKCreateBase64StringWithData([NSKeyedArchiver archivedDataWithRootObject:dictionary]); - [dictionary release]; + NSString *base64String = [[[NSKeyedArchiver archivedDataWithRootObject:dictionary] base64EncodedStringWithOptions:0] retain]; + [dictionary release]; return [base64String autorelease]; } Modified: trunk/bibdesk/DocumentGroupView.xib =================================================================== --- trunk/bibdesk/DocumentGroupView.xib 2014-10-02 19:13:20 UTC (rev 1710) +++ trunk/bibdesk/DocumentGroupView.xib 2015-11-09 23:01:01 UTC (rev 1711) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment version="1050" identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="BDSKDocumentGroupViewController"> @@ -12,7 +12,7 @@ </connections> </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> - <customObject id="-3" userLabel="Application"/> + <customObject id="-3" userLabel="Application" customClass="NSObject"/> <customView id="1"> <rect key="frame" x="0.0" y="0.0" width="276" height="389"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -20,12 +20,12 @@ <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="11"> <rect key="frame" x="0.0" y="0.0" width="276" height="389"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <clipView key="contentView" id="R54-11-gh2"> + <clipView key="contentView" drawsBackground="NO" id="R54-11-gh2"> <rect key="frame" x="0.0" y="17" width="276" height="372"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" emptySelection="NO" autosaveColumns="NO" headerView="15" id="12" customClass="BDSKGroupOutlineView"> - <rect key="frame" x="0.0" y="0.0" width="276" height="372"/> + <tableView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" emptySelection="NO" autosaveColumns="NO" headerView="15" id="12" customClass="BDSKGroupOutlineView"> + <rect key="frame" x="0.0" y="0.0" width="276" height="19"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -47,13 +47,13 @@ </tableColumns> </tableView> </subviews> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <nil key="backgroundColor"/> </clipView> - <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="14"> + <scroller key="horizontalScroller" hidden="YES" appearanceType="vibrantLight" verticalHuggingPriority="750" horizontal="YES" id="14"> <rect key="frame" x="-100" y="-100" width="110" height="15"/> <autoresizingMask key="autoresizingMask"/> </scroller> - <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="13"> + <scroller key="verticalScroller" hidden="YES" appearanceType="vibrantLight" verticalHuggingPriority="750" horizontal="NO" id="13"> <rect key="frame" x="-30" y="17" width="15" height="444"/> <autoresizingMask key="autoresizingMask"/> </scroller> Modified: trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig 2014-10-02 19:13:20 UTC (rev 1710) +++ trunk/bibdesk/vendorsrc/OmniGroup/Configurations/Omni-Global-Common.xcconfig 2015-11-09 23:01:01 UTC (rev 1711) @@ -34,7 +34,7 @@ // Apple LLVM compiler 4.2 - Warning Policies //GCC_WARN_INHIBIT_ALL_WARNINGS //GCC_WARN_PEDANTIC -GCC_TREAT_WARNINGS_AS_ERRORS = YES +GCC_TREAT_WARNINGS_AS_ERRORS = NO // Apple LLVM compiler 4.2 - Warnings - All languages GCC_WARN_CHECK_SWITCH_STATEMENTS = YES Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj 2014-10-02 19:13:20 UTC (rev 1710) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniAppKit/OmniAppKit.xcodeproj/project.pbxproj 2015-11-09 23:01:01 UTC (rev 1711) @@ -148,13 +148,13 @@ 4AA1E6A208AA764600E2FF6B /* NSAppleEventDescriptor-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 66D9C72A029F5AF60097A138 /* NSAppleEventDescriptor-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6A308AA764600E2FF6B /* NSAppleScript-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 66D9C71B029F51620097A138 /* NSAppleScript-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6A408AA764600E2FF6B /* NSApplication-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F35FE8AB2E911C9CC38 /* NSApplication-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6A508AA764600E2FF6B /* NSAttributedString-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F36FE8AB2E911C9CC38 /* NSAttributedString-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6A508AA764600E2FF6B /* NSAttributedString-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F36FE8AB2E911C9CC38 /* NSAttributedString-OAExtensions.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6A608AA764600E2FF6B /* NSBezierPath-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F411EA1036D27330297A14E /* NSBezierPath-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6A708AA764600E2FF6B /* NSBrowser-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F37FE8AB2E911C9CC38 /* NSBrowser-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6A808AA764600E2FF6B /* NSBundle-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F38FE8AB2E911C9CC38 /* NSBundle-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6A808AA764600E2FF6B /* NSBundle-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F38FE8AB2E911C9CC38 /* NSBundle-OAExtensions.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6A908AA764600E2FF6B /* NSCell-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F39FE8AB2E911C9CC38 /* NSCell-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6AA08AA764600E2FF6B /* NSColor-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0145F2A9FFAFE867C697A15C /* NSColor-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6AB08AA764600E2FF6B /* NSControl-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F3AFE8AB2E911C9CC38 /* NSControl-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4AA1E6AB08AA764600E2FF6B /* NSControl-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F3AFE8AB2E911C9CC38 /* NSControl-OAExtensions.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4AA1E6AD08AA764600E2FF6B /* NSDocument-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 163F2FA8055776D80097A165 /* NSDocument-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6AE08AA764600E2FF6B /* NSDocumentController-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 000303DD014E0AC13997A12D /* NSDocumentController-OAExtensions.h */; }; 4AA1E6AF08AA764600E2FF6B /* NSFileManager-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = F500F43B0204C91901648025 /* NSFileManager-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -163,36 +163,36 @@ 4AA1E6B208AA764600E2FF6B /* NSImage-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F3DFE8AB2E911C9CC38 /* NSImage-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6B308AA764600E2FF6B /* NSMenu-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B9399D6FFCA29A4C697A10E /* NSMenu-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6B408AA764600E2FF6B /* NSObject-NSDraggingInfo-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A0AC9D005F529440097A149 /* NSObject-NSDraggingInfo-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6B508AA764600E2FF6B /* NSOutlineView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F3EFE8AB2E911C9CC38 /* NSOutlineView-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6B508AA764600E2FF6B /* NSOutlineView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F3EFE8AB2E911C9CC38 /* NSOutlineView-OAExtensions.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6B608AA764600E2FF6B /* NSPasteboard-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F3FFE8AB2E911C9CC38 /* NSPasteboard-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6B708AA764600E2FF6B /* NSPopUpButton-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F40FE8AB2E911C9CC38 /* NSPopUpButton-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6B808AA764600E2FF6B /* NSScrollView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F41FE8AB2E911C9CC38 /* NSScrollView-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6B808AA764600E2FF6B /* NSScrollView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F41FE8AB2E911C9CC38 /* NSScrollView-OAExtensions.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6B908AA764600E2FF6B /* NSSliderCell-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F42FE8AB2E911C9CC38 /* NSSliderCell-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6BA08AA764600E2FF6B /* NSSplitView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F43FE8AB2E911C9CC38 /* NSSplitView-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; - 4AA1E6BB08AA764600E2FF6B /* NSString-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F44FE8AB2E911C9CC38 /* NSString-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4AA1E6BA08AA764600E2FF6B /* NSSplitView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F43FE8AB2E911C9CC38 /* NSSplitView-OAExtensions.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; + 4AA1E6BB08AA764600E2FF6B /* NSString-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F44FE8AB2E911C9CC38 /* NSString-OAExtensions.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4AA1E6BC08AA764600E2FF6B /* NSTableView-OAColumnConfigurationExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = B594F4B70516718E0097A10E /* NSTableView-OAColumnConfigurationExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6BD08AA764600E2FF6B /* NSTableView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EAA6AE5FF476391C697A12F /* NSTableView-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6BE08AA764600E2FF6B /* NSText-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F45FE8AB2E911C9CC38 /* NSText-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6BE08AA764600E2FF6B /* NSText-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F45FE8AB2E911C9CC38 /* NSText-OAExtensions.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6BF08AA764600E2FF6B /* NSTextField-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F46FE8AB2E911C9CC38 /* NSTextField-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6C008AA764600E2FF6B /* NSTextStorage-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = F54F12680204F1370127B3D4 /* NSTextStorage-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6C108AA764600E2FF6B /* NSToolbar-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 66CD437A0132454A0097A13E /* NSToolbar-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6C208AA764600E2FF6B /* NSToolbarItem-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = F07B9A0D022AB6663897A113 /* NSToolbarItem-OAExtensions.h */; }; - 4AA1E6C308AA764600E2FF6B /* NSUserDefaults-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F47FE8AB2E911C9CC38 /* NSUserDefaults-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; - 4AA1E6C408AA764600E2FF6B /* NSView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F48FE8AB2E911C9CC38 /* NSView-OAExtensions.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6C308AA764600E2FF6B /* NSUserDefaults-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F47FE8AB2E911C9CC38 /* NSUserDefaults-OAExtensions.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; + 4AA1E6C408AA764600E2FF6B /* NSView-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F48FE8AB2E911C9CC38 /* NSView-OAExtensions.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6C508AA764600E2FF6B /* NSWindow-OAExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F49FE8AB2E911C9CC38 /* NSWindow-OAExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6C708AA764600E2FF6B /* OAPreferenceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F6DFE8AB2E911C9CC38 /* OAPreferenceClient.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6C708AA764600E2FF6B /* OAPreferenceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F6DFE8AB2E911C9CC38 /* OAPreferenceClient.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6C808AA764600E2FF6B /* OAPreferenceClientRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F6EFE8AB2E911C9CC38 /* OAPreferenceClientRecord.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6C908AA764600E2FF6B /* OAPreferenceController.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F6FFE8AB2E911C9CC38 /* OAPreferenceController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6CA08AA764600E2FF6B /* OAPreferencesIconView.h in Headers */ = {isa = PBXBuildFile; fileRef = 01563696FFE9F5FAC697A14E /* OAPreferencesIconView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6CB08AA764600E2FF6B /* OAPreferencesToolbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 6620D67A01335CA00097A13E /* OAPreferencesToolbar.h */; }; 4AA1E6CC08AA764600E2FF6B /* OAPreferencesWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 6620D673013359840097A13E /* OAPreferencesWindow.h */; }; - 4AA1E6CF08AA764600E2FF6B /* OAAquaButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F9AFE8AB2E911C9CC38 /* OAAquaButton.h */; settings = {ATTRIBUTES = (Public, Private, Project, ); }; }; + 4AA1E6CF08AA764600E2FF6B /* OAAquaButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F9AFE8AB2E911C9CC38 /* OAAquaButton.h */; settings = {ATTRIBUTES = (Private, Project, Public, ); }; }; 4AA1E6D008AA764600E2FF6B /* OABackgroundImageControl.h in Headers */ = {isa = PBXBuildFile; fileRef = B5FEDACF055862C20097A10E /* OABackgroundImageControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6D108AA764600E2FF6B /* OABrowserCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F89FE8AB2E911C9CC38 /* OABrowserCell.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6D108AA764600E2FF6B /* OABrowserCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F89FE8AB2E911C9CC38 /* OABrowserCell.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6D208AA764600E2FF6B /* OACalendarView.h in Headers */ = {isa = PBXBuildFile; fileRef = 114343E10066D6B4C697A12D /* OACalendarView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6D308AA764600E2FF6B /* OAChasingArrowsProgressIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 6389AAF4FFFFE7FAC697A14E /* OAChasingArrowsProgressIndicator.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6D408AA764600E2FF6B /* OAColorWell.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B14EF40573A3FF0097A113 /* OAColorWell.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6D508AA764600E2FF6B /* OAConfigurableColumnTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F8DFE8AB2E911C9CC38 /* OAConfigurableColumnTableView.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6D508AA764600E2FF6B /* OAConfigurableColumnTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F8DFE8AB2E911C9CC38 /* OAConfigurableColumnTableView.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6D608AA764600E2FF6B /* OAContextButton.h in Headers */ = {isa = PBXBuildFile; fileRef = B5C3F579050FE63D0097A10E /* OAContextButton.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6D708AA764600E2FF6B /* OAContextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 345057E506F209090097A113 /* OAContextControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6D808AA764600E2FF6B /* OAContextPopUpButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 345057E106F207DD0097A113 /* OAContextPopUpButton.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -210,9 +210,9 @@ 4AA1E6EA08AA764600E2FF6B /* OAOutlineViewEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 4006B5FCFF2D5911C697A12F /* OAOutlineViewEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6EB08AA764600E2FF6B /* OAPageSelectableDocumentProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F8CFE8AB2E911C9CC38 /* OAPageSelectableDocumentProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6EC08AA764600E2FF6B /* OAPatternColorPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3457306005D00FD50097A113 /* OAPatternColorPicker.h */; }; - 4AA1E6ED08AA764600E2FF6B /* OAPopUpButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F8EFE8AB2E911C9CC38 /* OAPopUpButton.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4AA1E6ED08AA764600E2FF6B /* OAPopUpButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F8EFE8AB2E911C9CC38 /* OAPopUpButton.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4AA1E6EE08AA764600E2FF6B /* OAResizingByteFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FF7E54AFF2C3BABC697A14E /* OAResizingByteFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6EF08AA764600E2FF6B /* OAScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F90FE8AB2E911C9CC38 /* OAScrollView.h */; settings = {ATTRIBUTES = (Public, Private, ); }; }; + 4AA1E6EF08AA764600E2FF6B /* OAScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F90FE8AB2E911C9CC38 /* OAScrollView.h */; settings = {ATTRIBUTES = (Private, Public, ); }; }; 4AA1E6F008AA764600E2FF6B /* OASearchField.h in Headers */ = {isa = PBXBuildFile; fileRef = B50281E0055710210097A10E /* OASearchField.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6F108AA764600E2FF6B /* OAShrinkingTextDisplayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 13F8BB49FF32715FC697A13D /* OAShrinkingTextDisplayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6F208AA764600E2FF6B /* OAShrinkyTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F51348101C5B6D40297A14E /* OAShrinkyTextField.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -223,9 +223,9 @@ 4AA1E6F708AA764600E2FF6B /* OASwitcherBarMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = B5CBF0810517D86A0097A10E /* OASwitcherBarMatrix.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6F808AA764600E2FF6B /* OASwoopView.h in Headers */ = {isa = PBXBuildFile; fileRef = A2177CD404FEC4FF0097A146 /* OASwoopView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6F908AA764600E2FF6B /* OATabbedWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F93FE8AB2E911C9CC38 /* OATabbedWindowController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4AA1E6FA08AA764600E2FF6B /* OATabView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F94FE8AB2E911C9CC38 /* OATabView.h */; settings = {ATTRIBUTES = (Public, Private, Project, ); }; }; - 4AA1E6FB08AA764600E2FF6B /* OATabViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F95FE8AB2E911C9CC38 /* OATabViewController.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; - 4AA1E6FC08AA764600E2FF6B /* OATextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F96FE8AB2E911C9CC38 /* OATextField.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4AA1E6FA08AA764600E2FF6B /* OATabView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F94FE8AB2E911C9CC38 /* OATabView.h */; settings = {ATTRIBUTES = (Private, Project, Public, ); }; }; + 4AA1E6FB08AA764600E2FF6B /* OATabViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F95FE8AB2E911C9CC38 /* OATabViewController.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; + 4AA1E6FC08AA764600E2FF6B /* OATextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F96FE8AB2E911C9CC38 /* OATextField.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4AA1E6FD08AA764600E2FF6B /* OATextWithIconCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 010A51C0005212DBC697A13D /* OATextWithIconCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6FE08AA764600E2FF6B /* OAThumbnailView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51F98FE8AB2E911C9CC38 /* OAThumbnailView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4AA1E6FF08AA764600E2FF6B /* OAToolbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 34476AE306DF790B0097A113 /* OAToolbar.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -2650,7 +2650,7 @@ productInstallPath = "$(USER_LIBRARY_DIR)/Bundles"; productName = OAUnitTests; productReference = 4AA1E81108AA764700E2FF6B /* OAUnitTests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; 4AA1E81208AA764700E2FF6B /* OAMakeImageSizeIntegral */ = { isa = PBXNativeTarget; @@ -2697,6 +2697,7 @@ 00E51EF1FE8AB2E911C9CC38 /* Project object */ = { isa = PBXProject; attributes = { + LastTestingUpgradeCheck = 0700; LastUpgradeCheck = 0500; }; buildConfigurationList = 4A4E085608AA75E90098FF0F /* Build configuration list for PBXProject "OmniAppKit" */; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj 2014-10-02 19:13:20 UTC (rev 1710) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniBase/OmniBase.xcodeproj/project.pbxproj 2015-11-09 23:01:01 UTC (rev 1711) @@ -534,7 +534,7 @@ name = OBUnitTests; productName = OBUnitTests; productReference = 34EE20D114F0354300722491 /* OBUnitTests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; 4A33D40608A0191B003A3FA5 /* OmniBase */ = { isa = PBXNativeTarget; @@ -562,6 +562,7 @@ 00E51C1BFE8AAE2511C9CC38 /* Project object */ = { isa = PBXProject; attributes = { + LastTestingUpgradeCheck = 0700; LastUpgradeCheck = 0500; }; buildConfigurationList = 4AA3CEDC08A01555004389CD /* Build configuration list for PBXProject "OmniBase" */; Modified: trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj 2014-10-02 19:13:20 UTC (rev 1710) +++ trunk/bibdesk/vendorsrc/OmniGroup/Frameworks/OmniFoundation/OmniFoundation.xcodeproj/project.pbxproj 2015-11-09 23:01:01 UTC (rev 1711) @@ -478,15 +478,15 @@ 4A4E063208AA72B10098FF0F /* OFAlias.h in Headers */ = {isa = PBXBuildFile; fileRef = E2FCCB3C062205A40097A11C /* OFAlias.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E063308AA72B10098FF0F /* OFCacheFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BB21F1104014AD113F763DD /* OFCacheFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E063608AA72B10098FF0F /* OFScratchFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CDAFE8AAEA611C9CC38 /* OFScratchFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A4E063908AA72B10098FF0F /* OFCapitalizeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CECFE8AAEA611C9CC38 /* OFCapitalizeFormatter.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; - 4A4E063A08AA72B10098FF0F /* OFDateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CEDFE8AAEA611C9CC38 /* OFDateFormatter.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4A4E063908AA72B10098FF0F /* OFCapitalizeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CECFE8AAEA611C9CC38 /* OFCapitalizeFormatter.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; + 4A4E063A08AA72B10098FF0F /* OFDateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CEDFE8AAEA611C9CC38 /* OFDateFormatter.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4A4E063B08AA72B10098FF0F /* OFMultipleNumberFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = F5FBE7A8025BEF9F0100084B /* OFMultipleNumberFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A4E063C08AA72B10098FF0F /* OFSimpleStringFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CEEFE8AAEA611C9CC38 /* OFSimpleStringFormatter.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; - 4A4E063D08AA72B10098FF0F /* OFSocialSecurityFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CEFFE8AAEA611C9CC38 /* OFSocialSecurityFormatter.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; - 4A4E063F08AA72B10098FF0F /* OFTelephoneFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CF1FE8AAEA611C9CC38 /* OFTelephoneFormatter.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4A4E063C08AA72B10098FF0F /* OFSimpleStringFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CEEFE8AAEA611C9CC38 /* OFSimpleStringFormatter.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; + 4A4E063D08AA72B10098FF0F /* OFSocialSecurityFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CEFFE8AAEA611C9CC38 /* OFSocialSecurityFormatter.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; + 4A4E063F08AA72B10098FF0F /* OFTelephoneFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CF1FE8AAEA611C9CC38 /* OFTelephoneFormatter.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4A4E064008AA72B10098FF0F /* OFTimeSpanFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 28C3E2D2FEF0F1AAC697A12D /* OFTimeSpanFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A4E064108AA72B10098FF0F /* OFUppercaseFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CF2FE8AAEA611C9CC38 /* OFUppercaseFormatter.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; - 4A4E064208AA72B10098FF0F /* OFZipCodeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CF3FE8AAEA611C9CC38 /* OFZipCodeFormatter.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4A4E064108AA72B10098FF0F /* OFUppercaseFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CF2FE8AAEA611C9CC38 /* OFUppercaseFormatter.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; + 4A4E064208AA72B10098FF0F /* OFZipCodeFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CF3FE8AAEA611C9CC38 /* OFZipCodeFormatter.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4A4E064408AA72B10098FF0F /* OFReadWriteLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CFEFE8AAEA611C9CC38 /* OFReadWriteLock.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E064508AA72B10098FF0F /* OFSimpleLock-hppa.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51CFFFE8AAEA611C9CC38 /* OFSimpleLock-hppa.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E064608AA72B10098FF0F /* OFSimpleLock-i386.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D00FE8AAEA611C9CC38 /* OFSimpleLock-i386.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -530,10 +530,10 @@ 4A4E067B08AA72B10098FF0F /* NSProcessInfo-OFExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D3CFE8AAEA611C9CC38 /* NSProcessInfo-OFExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E067C08AA72B10098FF0F /* NSScanner-OFExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D3DFE8AAEA611C9CC38 /* NSScanner-OFExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E067D08AA72B10098FF0F /* NSString-OFExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D3EFE8AAEA611C9CC38 /* NSString-OFExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A4E067E08AA72B10098FF0F /* NSString-OFPathExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D3FFE8AAEA611C9CC38 /* NSString-OFPathExtensions.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4A4E067E08AA72B10098FF0F /* NSString-OFPathExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D3FFE8AAEA611C9CC38 /* NSString-OFPathExtensions.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4A4E067F08AA72B10098FF0F /* NSThread-OFExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D40FE8AAEA611C9CC38 /* NSThread-OFExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E068008AA72B10098FF0F /* NSUndoManager-OFExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 467ADC25003CE443C697A14B /* NSUndoManager-OFExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A4E068108AA72B10098FF0F /* NSUserDefaults-OFExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D43FE8AAEA611C9CC38 /* NSUserDefaults-OFExtensions.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4A4E068108AA72B10098FF0F /* NSUserDefaults-OFExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D43FE8AAEA611C9CC38 /* NSUserDefaults-OFExtensions.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4A4E068408AA72B10098FF0F /* OFChildScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D64FE8AAEA611C9CC38 /* OFChildScheduler.h */; }; 4A4E068508AA72B10098FF0F /* OFConcreteInvocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D65FE8AAEA611C9CC38 /* OFConcreteInvocation.h */; }; 4A4E068608AA72B10098FF0F /* OFDedicatedThreadScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D66FE8AAEA611C9CC38 /* OFDedicatedThreadScheduler.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -551,10 +551,10 @@ 4A4E069308AA72B10098FF0F /* OFMessageQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D71FE8AAEA611C9CC38 /* OFMessageQueue.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E069408AA72B10098FF0F /* OFMessageQueueDelegateProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D72FE8AAEA611C9CC38 /* OFMessageQueueDelegateProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E069508AA72B10098FF0F /* OFMessageQueuePriorityProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D73FE8AAEA611C9CC38 /* OFMessageQueuePriorityProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A4E069608AA72B10098FF0F /* OFObject-Queue.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D74FE8AAEA611C9CC38 /* OFObject-Queue.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4A4E069608AA72B10098FF0F /* OFObject-Queue.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D74FE8AAEA611C9CC38 /* OFObject-Queue.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4A4E069708AA72B10098FF0F /* OFQueueProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D75FE8AAEA611C9CC38 /* OFQueueProcessor.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E069808AA72B10098FF0F /* OFResultHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D76FE8AAEA611C9CC38 /* OFResultHolder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A4E069908AA72B10098FF0F /* OFRunLoopQueueProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D77FE8AAEA611C9CC38 /* OFRunLoopQueueProcessor.h */; settings = {ATTRIBUTES = (Public, Project, ); }; }; + 4A4E069908AA72B10098FF0F /* OFRunLoopQueueProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D77FE8AAEA611C9CC38 /* OFRunLoopQueueProcessor.h */; settings = {ATTRIBUTES = (Project, Public, ); }; }; 4A4E069A08AA72B10098FF0F /* OFRunLoopScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D78FE8AAEA611C9CC38 /* OFRunLoopScheduler.h */; }; 4A4E069B08AA72B10098FF0F /* OFScheduledEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D79FE8AAEA611C9CC38 /* OFScheduledEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4A4E069C08AA72B10098FF0F /* OFScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E51D7AFE8AAEA611C9CC38 /* OFScheduler.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -3541,7 +3541,7 @@ productInstallPath = "$(USER_LIBRARY_DIR)/Bundles"; productName = OFUnitTests; productReference = 4A4E07CF08AA72B10098FF0F /* OFUnitTests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; 4A4E07D008AA72B10098FF0F /* OFMainThreadLockTest */ = { isa = PBXNativeTarget; @@ -3568,6 +3568,7 @@ 00E51C5BFE8AAEA611C9CC38 /* Project object */ = { isa = PBXProject; attributes = { + LastTestingUpgradeCheck = 0700; LastUpgradeCheck = 0500; }; buildConfigurationList = 4AD1C16408A9803A00C087FE /* Build configuration list for PBXProject "OmniFoundation" */; Modified: trunk/bibdesk/vendorsrc/indexdata/yaz/objc/Default-Build-Settings.xcconfig =================================================================== --- trunk/bibdesk/vendorsrc/indexdata/yaz/objc/Default-Build-Settings.xcconfig 2014-10-02 19:13:20 UTC (rev 1710) +++ trunk/bibdesk/vendorsrc/indexdata/yaz/objc/Default-Build-Settings.xcconfig 2015-11-09 23:01:01 UTC (rev 1711) @@ -6,7 +6,7 @@ // The CPP defines were taken from running ./configure and then copying a compiler line echoed to the Terminal. If the autoconf build changes, this should change also. -GCC_PREPROCESSOR_DEFINITIONS = STDC_HEADERS=1 HAVE_SYS_TYPES_H=1 HAVE_SYS_STAT_H=1 HAVE_STDLIB_H=1 HAVE_STRING_H=1 HAVE_MEMORY_H=1 HAVE_STRINGS_H=1 HAVE_INTTYPES_H=1 HAVE_STDINT_H=1 HAVE_UNISTD_H=1 HAVE_DLFCN_H=1 HAVE_DIRENT_H=1 HAVE_FNMATCH_H=1 HAVE_WCHAR_H=1 HAVE_LOCALE_H=1 HAVE_LANGINFO_H=1 HAVE_PWD_H=1 HAVE_SYS_SELECT_H=1 HAVE_SYS_SOCKET_H=1 HAVE_SYS_STAT_H=1 HAVE_SYS_TIME_H=1 HAVE_SYS_TYPES_H=1 HAVE_SYS_UN_H=1 HAVE_SYS_WAIT_H=1 HAVE_UNISTD_H=1 HAVE_NETINET_IF_ETHER_H=1 HAVE_NETINET_IN_SYSTM_H=1 STDC_HEADERS=1 HAVE_LONG_LONG=1 HAVE_LIBCRYPTO=1 HAVE_LIBSSL=1 HAVE_READLINE_READLINE_H=1 HAVE_READLINE_HISTORY_H=1 HAVE_READLINE_COMPLETION_OVER=1 HAVE_ICONV_H=1 HAVE_GETADDRINFO=1 HAVE_VSNPRINTF=1 HAVE_GETTIMEOFDAY=1 HAVE_POLL=1 HAVE_STRERROR_R=1 HAVE_LOCALTIME_R=1 HAVE_USLEEP=1 YAZ_SOCKLEN_T=socklen_t YAZ_USE_NEW_LOG=1 HAVE_LIBPTHREAD=1 YAZ_HAVE_XML2=1 YAZ_HAVE_XSLT=1 HAVE_XSLTSAVERESULTTOSTRING=1 HAVE_OPENSSL_SSL_H=1 YAZ_POSIX_THREADS=1 REENTRANT +GCC_PREPROCESSOR_DEFINITIONS = STDC_HEADERS=1 HAVE_SYS_TYPES_H=1 HAVE_SYS_STAT_H=1 HAVE_STDLIB_H=1 HAVE_STRING_H=1 HAVE_MEMORY_H=1 HAVE_STRINGS_H=1 HAVE_INTTYPES_H=1 HAVE_STDINT_H=1 HAVE_UNISTD_H=1 HAVE_DLFCN_H=1 HAVE_DIRENT_H=1 HAVE_FNMATCH_H=1 HAVE_WCHAR_H=1 HAVE_LOCALE_H=1 HAVE_LANGINFO_H=1 HAVE_PWD_H=1 HAVE_SYS_SELECT_H=1 HAVE_SYS_SOCKET_H=1 HAVE_SYS_STAT_H=1 HAVE_SYS_TIME_H=1 HAVE_SYS_TYPES_H=1 HAVE_SYS_UN_H=1 HAVE_SYS_WAIT_H=1 HAVE_UNISTD_H=1 HAVE_NETINET_IF_ETHER_H=1 HAVE_NETINET_IN_SYSTM_H=1 STDC_HEADERS=1 HAVE_LONG_LONG=1 HAVE_LIBCRYPTO=1 HAVE_LIBSSL=1 HAVE_READLINE_READLINE_H=1 HAVE_READLINE_HISTORY_H=1 HAVE_READLINE_COMPLETION_OVER=1 HAVE_ICONV_H=1 HAVE_GETADDRINFO=1 HAVE_VSNPRINTF=1 HAVE_GETTIMEOFDAY=1 HAVE_POLL=1 HAVE_STRERROR_R=1 HAVE_LOCALTIME_R=1 HAVE_USLEEP=1 YAZ_SOCKLEN_T=socklen_t YAZ_USE_NEW_LOG=1 HAVE_LIBPTHREAD=1 YAZ_HAVE_XML2=1 YAZ_HAVE_XSLT=1 HAVE_XSLTSAVERESULTTOSTRING=1 HAVE_OPENSSL_SSL_H=0 YAZ_POSIX_THREADS=1 REENTRANT // Set to be bundled with a project by default This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2014-10-02 19:13:24
|
Revision: 1710 http://sourceforge.net/p/tcobrowser/code/1710 Author: amaxwell Date: 2014-10-02 19:13:20 +0000 (Thu, 02 Oct 2014) Log Message: ----------- remove IB plugin dependency Modified Paths: -------------- trunk/bibdesk/DocumentColumnView.xib trunk/bibdesk/DocumentFileView.xib trunk/bibdesk/DocumentGroupView.xib Modified: trunk/bibdesk/DocumentColumnView.xib =================================================================== --- trunk/bibdesk/DocumentColumnView.xib 2014-01-10 00:53:24 UTC (rev 1709) +++ trunk/bibdesk/DocumentColumnView.xib 2014-10-02 19:13:20 UTC (rev 1710) @@ -1,1241 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> - <data> - <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">11C74</string> - <string key="IBDocument.InterfaceBuilderVersion">851</string> - <string key="IBDocument.AppKitVersion">1138.23</string> - <string key="IBDocument.HIToolboxVersion">567.00</string> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.mac.amaxwell.FileViewIBPlugin</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>851</string> - <string>1</string> - </object> - </object> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="2"/> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.mac.amaxwell.FileViewIBPlugin</string> - </object> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomObject" id="1001"> - <string key="NSClassName">BDSKDocumentColumnViewController</string> - </object> - <object class="NSCustomObject" id="1003"> - <string key="NSClassName">FirstResponder</string> - </object> - <object class="NSCustomObject" id="1004"> - <string key="NSClassName">NSApplication</string> - </object> - <object class="NSCustomView" id="1005"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="1010330384"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="453983201"> - <reference key="NSNextResponder" ref="1010330384"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="FVColumnView" id="502832309"> - <reference key="NSNextResponder" ref="453983201"/> - <int key="NSvFlags">274</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="set.sortedObjects" ref="0"/> - </object> - <string key="NSFrameSize">{214, 461}</string> - <reference key="NSSuperview" ref="453983201"/> - <nil key="backgroundColor"/> - <bool key="editable">NO</bool> - <double key="minIconScale">0.5</double> - <double key="maxIconScale">10</double> - <double key="iconScale">1</double> - </object> - </object> - <string key="NSFrameSize">{214, 461}</string> - <reference key="NSSuperview" ref="1010330384"/> - <reference key="NSNextKeyView" ref="502832309"/> - <reference key="NSDocView" ref="502832309"/> - <object class="NSColor" key="NSBGColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> - </object> - </object> - <int key="NScvFlags">4</int> - </object> - <object class="NSScroller" id="624106136"> - <reference key="NSNextResponder" ref="1010330384"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{198, 1}, {15, 445}}</string> - <reference key="NSSuperview" ref="1010330384"/> - <reference key="NSTarget" ref="1010330384"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.28482973575592041</double> - </object> - <object class="NSScroller" id="843958819"> - <reference key="NSNextResponder" ref="1010330384"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {40, 15}}</string> - <reference key="NSSuperview" ref="1010330384"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="1010330384"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.50602412223815918</double> - </object> - </object> - <string key="NSFrameSize">{214, 461}</string> - <reference key="NSSuperview" ref="1005"/> - <reference key="NSNextKeyView" ref="453983201"/> - <int key="NSsFlags">133648</int> - <reference key="NSVScroller" ref="624106136"/> - <reference key="NSHScroller" ref="843958819"/> - <reference key="NSContentView" ref="453983201"/> - </object> - </object> - <string key="NSFrameSize">{214, 461}</string> - <reference key="NSSuperview"/> - <string key="NSClassName">NSView</string> - </object> - </object> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="1005"/> - </object> - <int key="connectionID">6</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">columnView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="502832309"/> - </object> - <int key="connectionID">7</int> - </object> - </object> - <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <reference key="object" ref="0"/> - <reference key="children" ref="1000"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-2</int> - <reference key="object" ref="1001"/> - <reference key="parent" ref="0"/> - <string key="objectName">File's Owner</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-1</int> - <reference key="object" ref="1003"/> - <reference key="parent" ref="0"/> - <string key="objectName">First Responder</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-3</int> - <reference key="object" ref="1004"/> - <reference key="parent" ref="0"/> - <string key="objectName">Application</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1</int> - <reference key="object" ref="1005"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1010330384"/> - </object> - <reference key="parent" ref="0"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">2</int> - <reference key="object" ref="1010330384"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="624106136"/> - <reference ref="843958819"/> - <reference ref="502832309"/> - </object> - <reference key="parent" ref="1005"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3</int> - <reference key="object" ref="624106136"/> - <reference key="parent" ref="1010330384"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">4</int> - <reference key="object" ref="843958819"/> - <reference key="parent" ref="1010330384"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="502832309"/> - <reference key="parent" ref="1010330384"/> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>1.IBEditorWindowLastContentRect</string> - <string>1.IBPluginDependency</string> - <string>1.WindowOrigin</string> - <string>1.editorWindowContentRectSynchronizationRect</string> - <string>2.IBPluginDependency</string> - <string>3.IBPluginDependency</string> - <string>4.IBPluginDependency</string> - <string>5.IBPluginDependency</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{{322, 395}, {214, 461}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{628, 654}</string> - <string>{{217, 442}, {480, 272}}</string> - <string>com.mac.amaxwell.FileViewIBPlugin</string> - <string>com.mac.amaxwell.FileViewIBPlugin</string> - <string>com.mac.amaxwell.FileViewIBPlugin</string> - <string>com.mac.amaxwell.FileViewIBPlugin</string> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="sourceID"/> - <int key="maxID">7</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">BDSKDocumentColumnViewController</string> - <string key="superclassName">NSViewController</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">columnView</string> - <string key="NS.object.0">FVColumnView</string> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <string key="NS.key.0">columnView</string> - <object class="IBToOneOutletInfo" key="NS.object.0"> - <string key="name">columnView</string> - <string key="candidateClassName">FVColumnView</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BDSKDocumentColumnViewController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">NSMenu_BDSKExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">NSObject_BDSKExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">vendorsrc/kenferry/KFASHandlerAdditions-TypeTranslation.h</string> - </object> - </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">FVColumnView</string> - <string key="superclassName">FileView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="797608036"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">FileView.framework/Headers/FileView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">FileView</string> - <string key="superclassName">NSView</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>changeFinderLabel:</string> - <string>delete:</string> - <string>deselectAll:</string> - <string>openSelectedURLs:</string> - <string>previewAction:</string> - <string>reloadSelectedIcons:</string> - <string>selectNextIcon:</string> - <string>selectPreviousIcon:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>changeFinderLabel:</string> - <string>delete:</string> - <string>deselectAll:</string> - <string>openSelectedURLs:</string> - <string>previewAction:</string> - <string>reloadSelectedIcons:</string> - <string>selectNextIcon:</string> - <string>selectPreviousIcon:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">changeFinderLabel:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">delete:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">deselectAll:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">openSelectedURLs:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">previewAction:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">reloadSelectedIcons:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">selectNextIcon:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">selectPreviousIcon:</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> - <reference key="sourceIdentifier" ref="797608036"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="300028969"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1006612812"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="452936496"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="570085587"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowRestoration.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSApplication-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="727259320"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="894786655"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSLayoutConstraint.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSControl-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OASteppableTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="434132083"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSMenu-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AddressBook.framework/Headers/ABActions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="300028969"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="1006612812"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="452936496"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="727259320"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="434132083"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="106882408"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">CoreImage.framework/Headers/CIImageProvider.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ExceptionHandling.framework/Headers/NSExceptionHandler.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="797608036"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSError.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ImageKit.framework/Headers/IKImageBrowserView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ImageKit.framework/Headers/IKSaveOptions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ImageKit.framework/Headers/ImageKitDeprecated.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSObject-NSDraggingInfo-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSTableView-OAColumnConfigurationExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSTableView-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSWindowController-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="67536388"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OAApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OACalendarView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OAConfigurableColumnTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OAContextControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OADataSourceTableColumn.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OADefaultSettingIndicatorButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OAFindControllerTargetProtocol.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OAFontView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OASearchField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="685935256"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OAStackView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OATabbedWindowController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/OAToolbar.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniBase.framework/Headers/OBObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniBase.framework/Headers/OBPostLoader.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/NSObject-OFAppleScriptExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/NSObject-OFExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFMessageQueuePriorityProtocol.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFNull.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFObject-Queue.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFRemoveScriptCommand.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFWeakRetainConcreteImplementation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniFoundation.framework/Headers/OFXMLElement.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">PDFKit.framework/Headers/PDFDocument.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">PDFKit.framework/Headers/PDFView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzComposer.framework/Headers/QCCompositionParameterView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzComposer.framework/Headers/QCCompositionPickerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzFilters.framework/Headers/QuartzFilterManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuickLookUI.framework/Headers/QLPreviewPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebEditingDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebFrameLoadDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebJavaPlugIn.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPlugin.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPluginContainer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebPolicyDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebResourceLoadDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebScriptObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">WebKit.framework/Headers/WebUIDelegate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <reference key="sourceIdentifier" ref="570085587"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSResponder-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <reference key="sourceIdentifier" ref="67536388"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSScrollView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSScrollView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">OmniAppKit.framework/Headers/NSScrollView-OAExtensions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSScroller</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSScroller.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/He... [truncated message content] |
From: <ama...@us...> - 2014-01-10 00:53:28
|
Revision: 1709 http://sourceforge.net/p/tcobrowser/code/1709 Author: amaxwell Date: 2014-01-10 00:53:24 +0000 (Fri, 10 Jan 2014) Log Message: ----------- add a comment on ordering, since it's weird Modified Paths: -------------- trunk/bibdesk/BDSKTeXTask.m Modified: trunk/bibdesk/BDSKTeXTask.m =================================================================== --- trunk/bibdesk/BDSKTeXTask.m 2014-01-10 00:50:07 UTC (rev 1708) +++ trunk/bibdesk/BDSKTeXTask.m 2014-01-10 00:53:24 UTC (rev 1709) @@ -458,10 +458,11 @@ // nuke the log files in case the run fails without generating new ones (not very likely) [self removeFilesFromPreviousRun]; - [pendingTasks addObject:[self texTask]]; - [pendingTasks addObject:[self texTask]]; - [pendingTasks addObject:[self bibtexTask]]; - [pendingTasks addObject:[self texTask]]; + // these will be invoked in reverse (LIFO) order + [pendingTasks addObject:[self texTask]]; // step 4 (for crossrefs) + [pendingTasks addObject:[self texTask]]; // step 3 + [pendingTasks addObject:[self bibtexTask]]; // step 2 + [pendingTasks addObject:[self texTask]]; // step 1 return [self invokePendingTasks]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2014-01-10 00:50:11
|
Revision: 1708 http://sourceforge.net/p/tcobrowser/code/1708 Author: amaxwell Date: 2014-01-10 00:50:07 +0000 (Fri, 10 Jan 2014) Log Message: ----------- need another pdftex run to fix up crossrefs Modified Paths: -------------- trunk/bibdesk/BDSKTeXTask.m Modified: trunk/bibdesk/BDSKTeXTask.m =================================================================== --- trunk/bibdesk/BDSKTeXTask.m 2014-01-03 01:10:27 UTC (rev 1707) +++ trunk/bibdesk/BDSKTeXTask.m 2014-01-10 00:50:07 UTC (rev 1708) @@ -459,9 +459,10 @@ [self removeFilesFromPreviousRun]; [pendingTasks addObject:[self texTask]]; + [pendingTasks addObject:[self texTask]]; [pendingTasks addObject:[self bibtexTask]]; [pendingTasks addObject:[self texTask]]; - + return [self invokePendingTasks]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2014-01-03 01:10:33
|
Revision: 1707 http://sourceforge.net/p/tcobrowser/code/1707 Author: amaxwell Date: 2014-01-03 01:10:27 +0000 (Fri, 03 Jan 2014) Log Message: ----------- add support for non-autofiling addition of linked files Modified Paths: -------------- trunk/bibdesk/BDSKEditor.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj Modified: trunk/bibdesk/BDSKEditor.m =================================================================== --- trunk/bibdesk/BDSKEditor.m 2013-12-31 21:51:32 UTC (rev 1706) +++ trunk/bibdesk/BDSKEditor.m 2014-01-03 01:10:27 UTC (rev 1707) @@ -1485,7 +1485,7 @@ return YES; } -- (BOOL)fileView:(FileView *)fileView replaceURLsAtIndexes:(NSIndexSet *)aSet withURLs:(NSArray *)newURLs; +- (BOOL)fileView:(FileView *)fileView replaceURLsAtIndexes:(NSIndexSet *)aSet withURLs:(NSArray *)newURLs dragOperation:(NSDragOperation)dragOperation; { BDSKLinkedFile *aFile; NSEnumerator *enumerator = [newURLs objectEnumerator]; @@ -1501,8 +1501,12 @@ [oldURL release]; [publication insertObject:aFile inFilesAtIndex:idx]; [[self document] userAddedURL:aURL forPublication:publication]; - if ([aFile isFile]) - [publication autoFileLinkedFile:aFile]; + if ([aFile isFile]) { + // default to autofile + if (dragOperation & NSDragOperationGeneric) + [publication autoFileLinkedFile:aFile]; + // NSDragOperationCopy should probably do just that… + } [aFile release]; } idx = [aSet indexGreaterThanIndex:idx]; @@ -1517,7 +1521,7 @@ return YES; } -- (void)fileView:(FileView *)aFileView insertURLs:(NSArray *)absoluteURLs atIndexes:(NSIndexSet *)aSet; +- (void)fileView:(FileView *)aFileView insertURLs:(NSArray *)absoluteURLs atIndexes:(NSIndexSet *)aSet dragOperation:(NSDragOperation)dragOperation; { BDSKLinkedFile *aFile; NSEnumerator *enumerator = [absoluteURLs objectEnumerator]; @@ -1528,8 +1532,12 @@ (aFile = [[BDSKLinkedFile alloc] initWithURL:aURL delegate:publication])) { [publication insertObject:aFile inFilesAtIndex:idx - offset]; [[self document] userAddedURL:aURL forPublication:publication]; - if ([aFile isFile]) - [publication autoFileLinkedFile:aFile]; + if ([aFile isFile]) { + // default to autofile + if (dragOperation & NSDragOperationGeneric) + [publication autoFileLinkedFile:aFile]; + // NSDragOperationCopy should probably do just that… + } [aFile release]; } else { // the indexes in aSet assume that we inserted the file Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-12-31 21:51:32 UTC (rev 1706) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2014-01-03 01:10:27 UTC (rev 1707) @@ -1112,7 +1112,7 @@ F9022C65075802E300C3F701 /* BibDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BibDocument.h; sourceTree = "<group>"; }; F9022C66075802E300C3F701 /* BibDocument.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BibDocument.m; sourceTree = "<group>"; }; F9022C67075802E300C3F701 /* BDSKEditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BDSKEditor.h; sourceTree = "<group>"; }; - F9022C68075802E300C3F701 /* BDSKEditor.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKEditor.m; sourceTree = "<group>"; }; + F9022C68075802E300C3F701 /* BDSKEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BDSKEditor.m; sourceTree = "<group>"; }; F9022C69075802E300C3F701 /* BDSKFiler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BDSKFiler.h; sourceTree = "<group>"; }; F9022C6A075802E300C3F701 /* BDSKFiler.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKFiler.m; sourceTree = "<group>"; }; F9022C6D075802E300C3F701 /* BibItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BibItem.h; sourceTree = "<group>"; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-12-31 21:51:34
|
Revision: 1706 http://sourceforge.net/p/tcobrowser/code/1706 Author: amaxwell Date: 2013-12-31 21:51:32 +0000 (Tue, 31 Dec 2013) Log Message: ----------- fix some issues with restoring window state after a crash Modified Paths: -------------- trunk/bibdesk/BDSKAppController.m trunk/bibdesk/BibDocument.m Modified: trunk/bibdesk/BDSKAppController.m =================================================================== --- trunk/bibdesk/BDSKAppController.m 2013-12-04 19:48:19 UTC (rev 1705) +++ trunk/bibdesk/BDSKAppController.m 2013-12-31 21:51:32 UTC (rev 1706) @@ -279,8 +279,11 @@ if([[OFPreferenceWrapper sharedPreferenceWrapper] boolForKey:BDSKUsesTeXKey]) [BDSKPreviewer sharedPreviewer]; - if([[OFPreferenceWrapper sharedPreferenceWrapper] boolForKey:BDSKShowingPreviewKey]) + if([[OFPreferenceWrapper sharedPreferenceWrapper] boolForKey:BDSKShowingPreviewKey]) { [[BDSKPreviewer sharedPreviewer] showWindow:self]; + // annoying when the previewer is the key window at launch + [[[[[[NSDocumentController sharedDocumentController] mainDocument] windowControllers] firstObject] window] makeKeyAndOrderFront:nil]; + } // copy files to application support NSFileManager *fileManager = [NSFileManager defaultManager]; Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2013-12-04 19:48:19 UTC (rev 1705) +++ trunk/bibdesk/BibDocument.m 2013-12-31 21:51:32 UTC (rev 1706) @@ -377,35 +377,9 @@ } - (void)showWindows{ + [super showWindows]; - // some xattr setup has to be done after the window is on-screen - NSDictionary *xattrDefaults = [self mainWindowSetupDictionaryFromExtendedAttributes]; - - NSArray *groupsToExpand = [xattrDefaults objectForKey:BDSKDocumentGroupsToExpandKey]; - for (NSString *groupName in groupsToExpand) { - for (id <BDSKRootGroup>rootGroup in [groups rootGroups]) { - if ([[rootGroup name] isEqual:groupName]) - [groupOutlineView expandItem:rootGroup]; - } - } - - NSData *groupData = [xattrDefaults objectForKey:BDSKSelectedGroupsKey]; - if ([groupData length]) { - // !!! archiving loses the parent; this may not be the best place for this fix - NSSet *archivedSelection = [NSSet setWithArray:[NSKeyedUnarchiver unarchiveObjectWithData:groupData]]; - NSMutableArray *toSelect = [NSMutableArray arrayWithCapacity:[archivedSelection count]]; - for (id group in groups) { - if ([archivedSelection containsObject:group]) - [toSelect addObject:group]; - } - [self selectGroups:toSelect]; - } - - [self selectItemsForCiteKeys:[xattrDefaults objectForKey:BDSKSelectedPublicationsKey defaultObject:[NSArray array]] selectLibrary:NO]; - NSPoint scrollPoint = [xattrDefaults pointForKey:BDSKDocumentScrollPercentageKey defaultValue:NSZeroPoint]; - [[tableView enclosingScrollView] setScrollPositionAsPercentage:scrollPoint]; - // Get the search string keyword if available (Spotlight passes this) NSAppleEventDescriptor *event = [[NSAppleEventManager sharedAppleEventManager] currentAppleEvent]; NSString *searchString = [[event descriptorForKeyword:keyAESearchText] stringValue]; @@ -432,6 +406,8 @@ } } + // this isn't part of restoration, since we assume it's already been done if the window is restored. + if (docState.displayMigrationAlert) { docState.displayMigrationAlert = NO; // If a single file was migrated, this alert will be shown even if all other BibItems already use BDSKLinkedFile. However, I think that's an edge case, since the user had to manually add that pub in a text editor or by setting the local-url field. Items imported or added in BD will already use BDSKLinkedFile, so this notification won't be posted. @@ -608,6 +584,30 @@ [self updateCategoryGroupsPreservingSelection:NO]; [saveTextEncodingPopupButton setEncoding:0]; + + NSArray *groupsToExpand = [xattrDefaults objectForKey:BDSKDocumentGroupsToExpandKey]; + for (NSString *groupName in groupsToExpand) { + for (id <BDSKRootGroup>rootGroup in [groups rootGroups]) { + if ([[rootGroup name] isEqual:groupName]) + [groupOutlineView expandItem:rootGroup]; + } + } + + NSData *groupData = [xattrDefaults objectForKey:BDSKSelectedGroupsKey]; + if ([groupData length]) { + // !!! archiving loses the parent; this may not be the best place for this fix + NSSet *archivedSelection = [NSSet setWithArray:[NSKeyedUnarchiver unarchiveObjectWithData:groupData]]; + NSMutableArray *toSelect = [NSMutableArray arrayWithCapacity:[archivedSelection count]]; + for (id group in groups) { + if ([archivedSelection containsObject:group]) + [toSelect addObject:group]; + } + [self selectGroups:toSelect]; + } + + [self selectItemsForCiteKeys:[xattrDefaults objectForKey:BDSKSelectedPublicationsKey defaultObject:[NSArray array]] selectLibrary:NO]; + NSPoint scrollPoint = [xattrDefaults pointForKey:BDSKDocumentScrollPercentageKey defaultValue:NSZeroPoint]; + [[tableView enclosingScrollView] setScrollPositionAsPercentage:scrollPoint]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-12-04 19:48:21
|
Revision: 1705 http://sourceforge.net/p/tcobrowser/code/1705 Author: amaxwell Date: 2013-12-04 19:48:19 +0000 (Wed, 04 Dec 2013) Log Message: ----------- use FVCacheFile code for temp dir, and open the directory Modified Paths: -------------- trunk/bibdesk/NSFileManager_BDSKExtensions.m Modified: trunk/bibdesk/NSFileManager_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSFileManager_BDSKExtensions.m 2013-11-20 23:42:19 UTC (rev 1704) +++ trunk/bibdesk/NSFileManager_BDSKExtensions.m 2013-12-04 19:48:19 UTC (rev 1705) @@ -41,54 +41,60 @@ @implementation NSFileManager (BDSKExtensions) -static NSString *temporaryBaseDirectory = nil; +static NSString *_temporaryBaseDirectory = nil; +static int _temporaryBaseDirFD = -1; // we can't use +initialize in a category, and +load is too dangerous __attribute__((constructor)) static void createTemporaryDirectory() { - // chewable items are automatically cleaned up at restart, and it's hidden from the user - FSRef chewableRef; - OSErr err = FSFindFolder(kUserDomain, kChewableItemsFolderType, TRUE, &chewableRef); + NSAutoreleasePool *pool = [NSAutoreleasePool new]; + // chewable items folder is now deleted on a schedule, not just at startup + // docs say this returns nil in case of failure...so we'll check for it just in case + NSString *tempDir = NSTemporaryDirectory(); + if (nil == tempDir) { + fprintf(stderr, "NSTemporaryDirectory() returned nil in createTemporaryDirectory()\n"); + tempDir = @"/tmp"; + } - CFAllocatorRef alloc = CFAllocatorGetDefault(); - CFURLRef chewableURL = NULL; - if (noErr == err) - chewableURL = CFURLCreateFromFSRef(alloc, &chewableRef); + // mkdtemp needs a writable string + char *template = strdup([[tempDir stringByAppendingPathComponent:@"bibdesk.XXXXXX"] fileSystemRepresentation]); - CFStringRef baseName = CFStringCreateWithFileSystemRepresentation(alloc, "bibdesk"); - CFURLRef newURL = CFURLCreateCopyAppendingPathComponent(alloc, chewableURL, baseName, TRUE); - FSRef newRef; - NSUInteger i = 1; + // use mkdtemp to avoid race conditions + const char *tempPath = mkdtemp(template); - // loop until CFURLGetFSRef fails, indicating we don't have a file yet - while (CFURLGetFSRef(newURL, &newRef)) { - CFRelease(baseName); - CFRelease(newURL); - baseName = CFStringCreateWithFormat(alloc, NULL, CFSTR("bibdesk-%li"), (unsigned long)i++); - newURL = CFURLCreateCopyAppendingPathComponent(alloc, chewableURL, baseName, TRUE); + if (NULL == tempPath) { + // if this call fails the OS will probably crap out soon, so there's no point in dying gracefully + perror("mkdtemp failed"); + exit(1); } - if (chewableURL) CFRelease(chewableURL); + _temporaryBaseDirectory = (NSString *)CFStringCreateWithFileSystemRepresentation(NULL, tempPath); - assert(NULL != newURL); + // attempt to keep dirhelper from deleting this + // http://lists.apple.com/archives/cocoa-dev/2009/Jan/msg01595.html + _temporaryBaseDirFD = open(tempPath, O_RDONLY); + NSCParameterAssert(_temporaryBaseDirFD >= 0); - NSInteger nameLength = CFStringGetLength(baseName); - UniChar *nameBuf = CFAllocatorAllocate(alloc, nameLength * sizeof(UniChar), 0); - CFStringGetCharacters(baseName, CFRangeMake(0, nameLength), nameBuf); + free(template); - err = FSCreateDirectoryUnicode(&chewableRef, nameLength, nameBuf, kFSCatInfoNone, NULL, NULL, NULL, NULL); - CFAllocatorDeallocate(alloc, nameBuf); - - if (noErr == err) - temporaryBaseDirectory = (NSString *)CFURLCopyFileSystemPath(newURL, kCFURLPOSIXPathStyle); - - if (newURL) CFRelease(newURL); - if (baseName) CFRelease(baseName); - - assert(NULL != temporaryBaseDirectory); + assert(NULL != _temporaryBaseDirectory); + [pool release]; } +__attribute__((destructor)) +static void destroyTemporaryDirectory() +{ + NSAutoreleasePool *pool = [NSAutoreleasePool new]; + // clean up at exit; should never be used after this, but set to nil anyway + (void) close(_temporaryBaseDirFD); + if (NO == [[NSFileManager defaultManager] removeItemAtPath:_temporaryBaseDirectory error:NULL]) { + NSLog(@"Unable to remove temp directory %@", _temporaryBaseDirectory); + _temporaryBaseDirectory = nil; + } + [pool release]; +} + - (NSString *)currentApplicationSupportPathForCurrentUser{ static NSString *path = nil; @@ -168,7 +174,7 @@ { if(nil == fileName) fileName = [[NSProcessInfo processInfo] globallyUniqueString]; - return [self uniqueFilePathWithName:fileName atPath:temporaryBaseDirectory]; + return [self uniqueFilePathWithName:fileName atPath:_temporaryBaseDirectory]; } // This method is subject to a race condition in our temporary directory if we pass the same baseName to this method and temporaryFileWithBasename: simultaneously; hence the lock in uniqueFilePathWithName:atPath:, even though it and temporaryFileWithBasename: are not thread safe or secure. @@ -183,9 +189,9 @@ } NSUInteger i = 0; - finalPath = [temporaryBaseDirectory stringByAppendingPathComponent:baseName]; + finalPath = [_temporaryBaseDirectory stringByAppendingPathComponent:baseName]; while ([self fileExistsAtPath:finalPath]) { - finalPath = [temporaryBaseDirectory stringByAppendingPathComponent:[NSString stringWithFormat:@"%@-%li", baseName, (unsigned long)++i]]; + finalPath = [_temporaryBaseDirectory stringByAppendingPathComponent:[NSString stringWithFormat:@"%@-%li", baseName, (unsigned long)++i]]; } // raise if we can't create a file in the chewable folder? @@ -206,7 +212,7 @@ NSString *fullPath = [directory stringByAppendingPathComponent:fileName]; NSInteger i = 0; - // this method is always invoked from the main thread, but we don't want multiple threads in temporaryBaseDirectory (which may be passed as directory here); could make the lock conditional, but performance isn't a concern here + // this method is always invoked from the main thread, but we don't want multiple threads in _temporaryBaseDirectory (which may be passed as directory here); could make the lock conditional, but performance isn't a concern here @synchronized(self) { // if the file exists, try /directory/filename-i.extension while([self fileExistsAtPath:fullPath]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-11-20 23:42:21
|
Revision: 1704 http://sourceforge.net/p/tcobrowser/code/1704 Author: amaxwell Date: 2013-11-20 23:42:19 +0000 (Wed, 20 Nov 2013) Log Message: ----------- fix shell scripts Modified Paths: -------------- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-11-20 21:44:20 UTC (rev 1703) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-11-20 23:42:19 UTC (rev 1704) @@ -3067,7 +3067,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "##\n## This takes a while to generate, so it's not worth\n## the wait for development builds.\n##\nif [ ${BUILD_STYLE} = \"Debug\" ]; then\n# Check to see if a previous version exists and create it\n# if not, or else pbxcp will complain.\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\nfi\n#\n# Run the genstrings build phase\n#\ncd ${SOURCE_ROOT} && \\\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nmv English.lproj/Localizable.strings English.lproj/Localizable.strings.bak \nfi\n\n# skip OmniBase/macros.h because of genstrings crash\n# skip vendorsrc entirely? need to process .h files?\n\n/usr/bin/genstrings -q -o \"${SOURCE_ROOT}/English.lproj\" \\\n-skipTable BibTeXKeys \\\n-skipTable ZoomValues \\\n-skipTable TemplateOptions \\\n*.m 2>&1 | sed -e 's/^/warning: /g' | \\\nsed -e 's/warning:.*Warning:/warning:/g' >&2\n"; + shellScript = "##\n## This takes a while to generate, so it's not worth\n## the wait for development builds.\n##\nif [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n# Check to see if a previous version exists and create it\n# if not, or else pbxcp will complain.\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\nfi\n#\n# Run the genstrings build phase\n#\ncd ${SOURCE_ROOT} && \\\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nmv English.lproj/Localizable.strings English.lproj/Localizable.strings.bak \nfi\n\n# skip OmniBase/macros.h because of genstrings crash\n# skip vendorsrc entirely? need to process .h files?\n\n/usr/bin/genstrings -q -o \"${SOURCE_ROOT}/English.lproj\" \\\n-skipTable BibTeXKeys \\\n-skipTable ZoomValues \\\n-skipTable TemplateOptions \\\n*.m 2>&1 | sed -e 's/^/warning: /g' | \\\nsed -e 's/warning:.*Warning:/warning:/g' >&2\n"; }; F9FF213B09E83BAB00BB1706 /* Strip framework header files */ = { isa = PBXShellScriptBuildPhase; @@ -3081,7 +3081,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ ${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\n\necho \"*** stripping header files from frameworks ***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\" -type file -name \"*.h\" -delete\n\n#echo \"*** stripping .DS_STORE files ***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\" -type file -name \".DS_STORE\" -delete\n\n#echo \"*** stripping IB files from NIBs ***\"\n#find \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}\" -type file \\( -name \"classes.nib\" -or -name \"info.nib\" -or -name \"data.dependency\" \\) -delete\n\nexit 0"; + shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\nexit 0\nfi\n\necho \"*** stripping header files from frameworks ***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\" -type file -name \"*.h\" -delete\n\n#echo \"*** stripping .DS_STORE files ***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\" -type file -name \".DS_STORE\" -delete\n\n#echo \"*** stripping IB files from NIBs ***\"\n#find \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}\" -type file \\( -name \"classes.nib\" -or -name \"info.nib\" -or -name \"data.dependency\" \\) -delete\n\nexit 0"; }; /* End PBXShellScriptBuildPhase section */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-11-20 21:44:23
|
Revision: 1703 http://sourceforge.net/p/tcobrowser/code/1703 Author: amaxwell Date: 2013-11-20 21:44:20 +0000 (Wed, 20 Nov 2013) Log Message: ----------- fix window nib name and connect window outlet Modified Paths: -------------- trunk/bibdesk/BDSKTextViewFindController.m trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/keyedobjects.nib Added Paths: ----------- trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/designable.nib Removed Paths: ------------- trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/classes.nib trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/info.nib Modified: trunk/bibdesk/BDSKTextViewFindController.m =================================================================== --- trunk/bibdesk/BDSKTextViewFindController.m 2013-11-20 21:43:35 UTC (rev 1702) +++ trunk/bibdesk/BDSKTextViewFindController.m 2013-11-20 21:44:20 UTC (rev 1703) @@ -53,7 +53,7 @@ @implementation BDSKTextViewFindController - (id)init { - if (self = [super initWithWindowNibName:@"BDSKTextViewFindPanel.nib"]) { + if (self = [super initWithWindowNibName:@"BDSKTextViewFindPanel"]) { findFieldEditor = nil; } return self; Deleted: trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/classes.nib =================================================================== --- trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/classes.nib 2013-11-20 21:43:35 UTC (rev 1702) +++ trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/classes.nib 2013-11-20 21:44:20 UTC (rev 1703) @@ -1,58 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {performFindPanelAction = id; }; - CLASS = BDSKTextViewFindController; - LANGUAGE = ObjC; - OUTLETS = {findTypePopUp = NSPopUpButton; }; - SUPERCLASS = OAFindController; - }, - { - ACTIONS = {"" = id; replace = id; replaceAll = id; replaceAndFind = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - enterSelection = id; - findNext = id; - findPrevious = id; - findTypeChanged = id; - panelFindNext = id; - panelFindNextAndClosePanel = id; - panelFindPrevious = id; - replace = id; - replaceAll = id; - replaceAndFind = id; - showFindPanel = id; - }; - CLASS = OAFindController; - LANGUAGE = ObjC; - OUTLETS = { - additionalControlsBox = NSBox; - currentPattern = id; - findNextButton = NSButton; - findPanel = NSWindow; - findPreviousButton = NSButton; - findTypeMatrix = NSMatrix; - ignoreCaseButton = NSButton; - regularExpressionControlsView = NSView; - replaceAllButton = NSButton; - replaceAndFindButton = NSButton; - replaceButton = NSButton; - replaceInSelectionCheckbox = NSButton; - replaceTextForm = NSForm; - searchTextForm = NSForm; - stringControlsView = NSView; - subexpressionPopUp = NSPopUpButton; - wholeWordButton = NSButton; - }; - SUPERCLASS = OFObject; - }, - {CLASS = OBObject; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = OFObject; LANGUAGE = ObjC; SUPERCLASS = OBObject; }, - {CLASS = "java.lang.Object"; LANGUAGE = Java; } - ); - IBVersion = 1; -} \ No newline at end of file Added: trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/designable.nib =================================================================== --- trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/designable.nib (rev 0) +++ trunk/bibdesk/English.lproj/BDSKTextViewFindPanel.nib/designable.nib 2013-11-20 21:44:20 UTC (rev 1703) @@ -0,0 +1,1355 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> + <data> + <int key="IBDocument.SystemTarget">1090</int> + <string key="IBDocument.SystemVersion">12F45</string> + <string key="IBDocument.InterfaceBuilderVersion">4514</string> + <string key="IBDocument.AppKitVersion">1187.40</string> + <string key="IBDocument.HIToolboxVersion">626.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">4514</string> + </object> + <array key="IBDocument.IntegratedClassDependencies"> + <string>NSButton</string> + <string>NSButtonCell</string> + <string>NSCustomObject</string> + <string>NSForm</string> + <string>NSFormCell</string> + <string>NSMenu</string> + <string>NSMenuItem</string> + <string>NSPopUpButton</string> + <string>NSPopUpButtonCell</string> + <string>NSView</string> + <string>NSWindowTemplate</string> + </array> + <array key="IBDocument.PluginDependencies"> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </array> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> + </object> + <array class="NSMutableArray" key="IBDocument.RootObjects" id="29129934"> + <object class="NSCustomObject" id="547109921"> + <string key="NSClassName">BDSKTextViewFindController</string> + </object> + <object class="NSCustomObject" id="314667498"> + <string key="NSClassName">FirstResponder</string> + </object> + <object class="NSCustomObject" id="98545803"> + <string key="NSClassName">NSApplication</string> + </object> + <object class="NSWindowTemplate" id="718197171"> + <int key="NSWindowStyleMask">11</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{24, 305}, {528, 182}}</string> + <int key="NSWTFlags">-529006592</int> + <string key="NSWindowTitle">Find</string> + <object class="NSMutableString" key="NSWindowClass"> + <characters key="NS.bytes">NSPanel</characters> + </object> + <object class="NSMutableString" key="NSViewClass"> + <characters key="NS.bytes">View</characters> + </object> + <nil key="NSUserInterfaceItemIdentifier"/> + <object class="NSView" key="NSWindowView" id="1060880516"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="NSForm" id="635528718"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{32, 137}, {476, 22}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSNumRows">1</int> + <int key="NSNumCols">1</int> + <array class="NSMutableArray" key="NSCells"> + <object class="NSFormCell" id="198761728"> + <int key="NSCellFlags">342884417</int> + <int key="NSCellFlags2">1024</int> + <string key="NSContents"/> + <object class="NSFont" key="NSSupport" id="594562325"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="635528718"/> + <double key="NSTitleWidth">76</double> + <object class="NSCell" key="NSTitleCell"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">67108864</int> + <string key="NSContents">Find string:</string> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="635528718"/> + </object> + </object> + </array> + <string key="NSCellSize">{476, 22}</string> + <string key="NSIntercellSpacing">{0, 0}</string> + <int key="NSMatrixFlags">83886080</int> + <string key="NSCellClass">NSActionCell</string> + <object class="NSFormCell" key="NSProtoCell" id="16266627"> + <int key="NSCellFlags">342884416</int> + <int key="NSCellFlags2">1024</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="594562325"/> + <double key="NSTitleWidth">76</double> + <object class="NSCell" key="NSTitleCell"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">67108864</int> + <string key="NSContents">Field:</string> + <reference key="NSSupport" ref="594562325"/> + </object> + </object> + <int key="NSSelectedRow">-1</int> + <int key="NSSelectedCol">-1</int> + <object class="NSColor" key="NSBackgroundColor" id="156127450"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + </object> + </object> + <object class="NSColor" key="NSCellBackgroundColor" id="689607877"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + <reference key="NSFont" ref="594562325"/> + </object> + <object class="NSButton" id="43681747"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{328, 13}, {93, 32}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <int key="NSTag">3</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="807144268"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Previous</string> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="43681747"/> + <int key="NSTag">3</int> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <object class="NSFont" key="NSAlternateImage" id="875319328"> + <string key="NSName">Helvetica</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSButton" id="651904534"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{14, 12}, {104, 32}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <int key="NSTag">4</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="834289447"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Replace All</string> + <object class="NSFont" key="NSSupport" id="28"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">12</double> + <int key="NSfFlags">4883</int> + </object> + <reference key="NSControlView" ref="651904534"/> + <int key="NSTag">4</int> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <object class="NSFont" key="NSAlternateImage"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">12</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSButton" id="660068835"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{202, 12}, {126, 32}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <int key="NSTag">6</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="610827952"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">137887744</int> + <string key="NSContents">Replace & Find</string> + <reference key="NSSupport" ref="28"/> + <reference key="NSControlView" ref="660068835"/> + <int key="NSTag">6</int> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <object class="NSFont" key="NSAlternateImage" id="70232591"> + <string key="NSName">Helvetica</string> + <double key="NSSize">12</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSButton" id="475885927"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{118, 12}, {84, 32}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <int key="NSTag">5</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="850825015"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">137887744</int> + <string key="NSContents">Replace</string> + <reference key="NSSupport" ref="28"/> + <reference key="NSControlView" ref="475885927"/> + <int key="NSTag">5</int> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="70232591"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSForm" id="28236233"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{20, 107}, {488, 22}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSNumRows">1</int> + <int key="NSNumCols">1</int> + <array class="NSMutableArray" key="NSCells"> + <object class="NSFormCell" id="631045473"> + <int key="NSCellFlags">342884417</int> + <int key="NSCellFlags2">1024</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="28236233"/> + <double key="NSTitleWidth">88</double> + <object class="NSCell" key="NSTitleCell"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">67108864</int> + <string key="NSContents">Replace with:</string> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="28236233"/> + </object> + </object> + </array> + <string key="NSCellSize">{488, 22}</string> + <string key="NSIntercellSpacing">{0, 0}</string> + <int key="NSMatrixFlags">83886080</int> + <string key="NSCellClass">NSActionCell</string> + <object class="NSFormCell" key="NSProtoCell" id="412450158"> + <int key="NSCellFlags">342884416</int> + <int key="NSCellFlags2">1024</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="594562325"/> + <double key="NSTitleWidth">88</double> + <object class="NSCell" key="NSTitleCell"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">67108864</int> + <string key="NSContents">Field:</string> + <reference key="NSSupport" ref="594562325"/> + </object> + </object> + <int key="NSSelectedRow">-1</int> + <int key="NSSelectedCol">-1</int> + <reference key="NSBackgroundColor" ref="156127450"/> + <reference key="NSCellBackgroundColor" ref="689607877"/> + <reference key="NSFont" ref="594562325"/> + </object> + <object class="NSButton" id="1023481083"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{421, 13}, {93, 32}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <int key="NSTag">2</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="197152965"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Next</string> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="1023481083"/> + <int key="NSTag">2</int> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="875319328"/> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSButton" id="15150089"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{110, 59}, {199, 18}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="252969117"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Replace All in selection only</string> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="15150089"/> + <int key="NSButtonFlags">1211912448</int> + <int key="NSButtonFlags2">2</int> + <object class="NSButtonImageSource" key="NSAlternateImage" id="522569892"> + <string key="NSImageName">NSSwitch</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSPopUpButton" id="722851862"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{332, 75}, {179, 26}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="421385620"> + <int key="NSCellFlags">-2076180416</int> + <int key="NSCellFlags2">1024</int> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="722851862"/> + <int key="NSButtonFlags">109199360</int> + <int key="NSButtonFlags2">1</int> + <object class="NSFont" key="NSAlternateImage"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="905897147"> + <reference key="NSMenu" ref="429669007"/> + <string key="NSTitle">Textual</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <object class="NSCustomResource" key="NSOnImage" id="304882165"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + </object> + <object class="NSCustomResource" key="NSMixedImage" id="173245263"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + </object> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="421385620"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="429669007"> + <object class="NSMutableString" key="NSTitle"> + <characters key="NS.bytes">OtherViews</characters> + </object> + <array class="NSMutableArray" key="NSMenuItems"> + <reference ref="905897147"/> + <object class="NSMenuItem" id="409093569"> + <reference key="NSMenu" ref="429669007"/> + <string key="NSTitle">Regular Expression</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="304882165"/> + <reference key="NSMixedImage" ref="173245263"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">1</int> + <reference key="NSTarget" ref="421385620"/> + </object> + </array> + </object> + <int key="NSPreferredEdge">3</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">1</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSButton" id="395179973"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">260</int> + <string key="NSFrame">{{110, 79}, {103, 19}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="482681749"> + <int key="NSCellFlags">-2080374784</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Ignore Case</string> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="395179973"/> + <int key="NSButtonFlags">1211912448</int> + <int key="NSButtonFlags2">0</int> + <object class="NSCustomResource" key="NSNormalImage" id="516988137"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <reference key="NSAlternateImage" ref="522569892"/> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSButton" id="40780665"> + <reference key="NSNextResponder" ref="1060880516"/> + <int key="NSvFlags">260</int> + <string key="NSFrame">{{217, 80}, {97, 18}}</string> + <reference key="NSSuperview" ref="1060880516"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="225388198"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Whole Word</string> + <reference key="NSSupport" ref="594562325"/> + <reference key="NSControlView" ref="40780665"/> + <int key="NSButtonFlags">1211912448</int> + <int key="NSButtonFlags2">0</int> + <reference key="NSNormalImage" ref="516988137"/> + <reference key="NSAlternateImage" ref="522569892"/> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + </array> + <string key="NSFrameSize">{528, 182}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> + </object> + </array> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <array class="NSMutableArray" key="connectionRecords"> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">findPreviousButton</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="43681747"/> + </object> + <int key="connectionID">31</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">searchTextForm</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="635528718"/> + </object> + <int key="connectionID">33</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">panelFindNextAndClosePanel:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="635528718"/> + </object> + <int key="connectionID">77</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">panelFindNextAndClosePanel:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="28236233"/> + </object> + <int key="connectionID">79</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">replaceTextForm</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="28236233"/> + </object> + <int key="connectionID">85</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">findNextButton</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="1023481083"/> + </object> + <int key="connectionID">99</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">replaceInSelectionCheckbox</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="15150089"/> + </object> + <int key="connectionID">137</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">replaceAllButton</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="651904534"/> + </object> + <int key="connectionID">139</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">replaceButton</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="475885927"/> + </object> + <int key="connectionID">140</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">replaceAndFindButton</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="660068835"/> + </object> + <int key="connectionID">141</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">findTypeChanged:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="722851862"/> + </object> + <int key="connectionID">168</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">performFindPanelAction:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="651904534"/> + </object> + <int key="connectionID">183</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">performFindPanelAction:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="475885927"/> + </object> + <int key="connectionID">184</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">performFindPanelAction:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="660068835"/> + </object> + <int key="connectionID">185</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">performFindPanelAction:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="43681747"/> + </object> + <int key="connectionID">186</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">performFindPanelAction:</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="1023481083"/> + </object> + <int key="connectionID">188</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">findTypePopUp</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="722851862"/> + </object> + <int key="connectionID">189</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">ignoreCaseButton</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="395179973"/> + </object> + <int key="connectionID">196</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">wholeWordButton</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="40780665"/> + </object> + <int key="connectionID">197</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">window</string> + <reference key="source" ref="547109921"/> + <reference key="destination" ref="718197171"/> + </object> + <int key="connectionID">213</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="718197171"/> + <reference key="destination" ref="547109921"/> + </object> + <int key="connectionID">38</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">initialFirstResponder</string> + <reference key="source" ref="718197171"/> + <reference key="destination" ref="635528718"/> + </object> + <int key="connectionID">39</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="635528718"/> + <reference key="destination" ref="547109921"/> + </object> + <int key="connectionID">37</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="635528718"/> + <reference key="destination" ref="631045473"/> + </object> + <int key="connectionID">94</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="43681747"/> + <reference key="destination" ref="1023481083"/> + </object> + <int key="connectionID">100</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="651904534"/> + <reference key="destination" ref="475885927"/> + </object> + <int key="connectionID">91</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="660068835"/> + <reference key="destination" ref="43681747"/> + </object> + <int key="connectionID">93</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="475885927"/> + <reference key="destination" ref="660068835"/> + </object> + <int key="connectionID">92</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="28236233"/> + <reference key="destination" ref="395179973"/> + </object> + <int key="connectionID">199</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="1023481083"/> + <reference key="destination" ref="635528718"/> + </object> + <int key="connectionID">171</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="15150089"/> + <reference key="destination" ref="722851862"/> + </object> + <int key="connectionID">169</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="722851862"/> + <reference key="destination" ref="651904534"/> + </object> + <int key="connectionID">200</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="395179973"/> + <reference key="destination" ref="40780665"/> + </object> + <int key="connectionID">194</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="40780665"/> + <reference key="destination" ref="15150089"/> + </object> + <int key="connectionID">198</int> + </object> + </array> + <object class="IBMutableOrderedSet" key="objectRecords"> + <array key="orderedObjects"> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <array key="object" id="0"/> + <reference key="children" ref="29129934"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="547109921"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="314667498"/> + <reference key="parent" ref="0"/> + <string key="objectName">First Responder</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5</int> + <reference key="object" ref="718197171"/> + <array class="NSMutableArray" key="children"> + <reference ref="1060880516"/> + </array> + <reference key="parent" ref="0"/> + <string key="objectName">Find Panel</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">10</int> + <reference key="object" ref="1060880516"/> + <array class="NSMutableArray" key="children"> + <reference ref="635528718"/> + <reference ref="43681747"/> + <reference ref="651904534"/> + <reference ref="660068835"/> + <reference ref="475885927"/> + <reference ref="28236233"/> + <reference ref="1023481083"/> + <reference ref="15150089"/> + <reference ref="722851862"/> + <reference ref="395179973"/> + <reference ref="40780665"/> + </array> + <reference key="parent" ref="718197171"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">8</int> + <reference key="object" ref="635528718"/> + <array class="NSMutableArray" key="children"> + <reference ref="198761728"/> + <reference ref="16266627"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">69</int> + <reference key="object" ref="198761728"/> + <reference key="parent" ref="635528718"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">11</int> + <reference key="object" ref="43681747"/> + <array class="NSMutableArray" key="children"> + <reference ref="807144268"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">47</int> + <reference key="object" ref="651904534"/> + <array class="NSMutableArray" key="children"> + <reference ref="834289447"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">50</int> + <reference key="object" ref="660068835"/> + <array class="NSMutableArray" key="children"> + <reference ref="610827952"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">51</int> + <reference key="object" ref="475885927"/> + <array class="NSMutableArray" key="children"> + <reference ref="850825015"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">70</int> + <reference key="object" ref="28236233"/> + <array class="NSMutableArray" key="children"> + <reference ref="631045473"/> + <reference ref="412450158"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">71</int> + <reference key="object" ref="631045473"/> + <reference key="parent" ref="28236233"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">96</int> + <reference key="object" ref="1023481083"/> + <array class="NSMutableArray" key="children"> + <reference ref="197152965"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">136</int> + <reference key="object" ref="15150089"/> + <array class="NSMutableArray" key="children"> + <reference ref="252969117"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">151</int> + <reference key="object" ref="722851862"/> + <array class="NSMutableArray" key="children"> + <reference ref="421385620"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">191</int> + <reference key="object" ref="395179973"/> + <array class="NSMutableArray" key="children"> + <reference ref="482681749"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">192</int> + <reference key="object" ref="40780665"/> + <array class="NSMutableArray" key="children"> + <reference ref="225388198"/> + </array> + <reference key="parent" ref="1060880516"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">202</int> + <reference key="object" ref="807144268"/> + <reference key="parent" ref="43681747"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">203</int> + <reference key="object" ref="834289447"/> + <reference key="parent" ref="651904534"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">204</int> + <reference key="object" ref="610827952"/> + <reference key="parent" ref="660068835"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">205</int> + <reference key="object" ref="850825015"/> + <reference key="parent" ref="475885927"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">206</int> + <reference key="object" ref="197152965"/> + <reference key="parent" ref="1023481083"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">207</int> + <reference key="object" ref="252969117"/> + <reference key="parent" ref="15150089"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">208</int> + <reference key="object" ref="421385620"/> + <array class="NSMutableArray" key="children"> + <reference ref="429669007"/> + </array> + <reference key="parent" ref="722851862"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">209</int> + <reference key="object" ref="482681749"/> + <reference key="parent" ref="395179973"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">210</int> + <reference key="object" ref="225388198"/> + <reference key="parent" ref="40780665"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">211</int> + <reference key="object" ref="16266627"/> + <reference key="parent" ref="635528718"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">212</int> + <reference key="object" ref="412450158"/> + <reference key="parent" ref="28236233"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">152</int> + <reference key="object" ref="429669007"/> + <array class="NSMutableArray" key="children"> + <reference ref="409093569"/> + <reference ref="905897147"/> + </array> + <reference key="parent" ref="421385620"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">154</int> + <reference key="object" ref="409093569"/> + <reference key="parent" ref="429669007"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">153</int> + <reference key="object" ref="905897147"/> + <reference key="parent" ref="429669007"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-3</int> + <reference key="object" ref="98545803"/> + <reference key="parent" ref="0"/> + <string key="objectName">Application</string> + </object> + </array> + </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="11.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="43681747"/> + <string key="toolTip">Find the previous match.</string> + </object> + </object> + <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="136.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="15150089"/> + <string key="toolTip">Choose this when Replace All should replace only in the selected items.</string> + </object> + </object> + <string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="151.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="722851862"/> + <string key="toolTip">Select whether to search using textual string matches or regular expression searches.</string> + </object> + </object> + <string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="191.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="395179973"/> + <string key="toolTip">Choose this for case insensitive find.</string> + </object> + </object> + <string key="191.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="192.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="40780665"/> + <string key="toolTip">Choose this to match only whole words.</string> + </object> + </object> + <string key="192.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="47.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="651904534"/> + <string key="toolTip">Replace all matches.</string> + </object> + </object> + <string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="50.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="660068835"/> + <string key="toolTip">Replace the current match an find the next match.</string> + </object> + </object> + <string key="50.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="51.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="475885927"/> + <string key="toolTip">Replace the current match.</string> + </object> + </object> + <string key="51.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="70.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="28236233"/> + <string key="toolTip">Text or regular expression to replace matches with.</string> + </object> + </object> + <string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="71.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="8.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="635528718"/> + <string key="toolTip">Text or regular expression to match.</string> + </object> + </object> + <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="96.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="1023481083"/> + <string key="toolTip">Find the next match.</string> + </object> + </object> + <string key="96.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> + <nil key="activeLocalization"/> + <dictionary class="NSMutableDictionary" key="localizations"/> + <nil key="sourceID"/> + <int key="maxID">213</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <array class="NSMutableArray" key="referencedPartialClassDescriptions"> + <object class="IBPartialClassDescription"> + <string key="className">BDSKTextViewFindController</string> + <string key="superclassName">OAFindController</string> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="findTypeChanged:">id</string> + <string key="performFindPanelAction:">id</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="findTypeChanged:"> + <string key="name">findTypeChanged:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="performFindPanelAction:"> + <string key="name">performFindPanelAction:</string> + <string key="candidateClassName">id</string> + </object> + </dictionary> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">findTypePopUp</string> + <string key="NS.object.0">NSPopUpButton</string> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">findTypePopUp</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">findTypePopUp</string> + <string key="candidateClassName">NSPopUpButton</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/BDSKTextViewFindController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">visualizeConstraintsForPickedView:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">visualizeConstraintsForPickedView:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">visualizeConstraintsForPickedView:</string> + <string key="candidateClassName">id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/NSWindow.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindowController</string> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="hideWindow:">id</string> + <string key="toggleShowingWindow:">id</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="hideWindow:"> + <string key="name">hideWindow:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="toggleShowingWindow:"> + <string key="name">toggleShowingWindow:</string> + <string key="candidateClassName">id</string> + </object> + </dictionary> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/NSWindowController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">OAFindController</string> + <string key="superclassName">NSWindowController</string> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="enterSelection:">id</string> + <string key="findNext:">id</string> + <string key="findPrevious:">id</string> + <string key="findTypeChanged:">id</string> + <string key="panelFindNext:">id</string> + <string key="panelFindNextAndClosePanel:">id</string> + <string key="panelFindPrevious:">id</string> + <string key="replace:">id</string> + <string key="replaceAll:">id</string> + <string key="replaceAndFind:">id</string> + <string key="showFindPanel:">id</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="enterSelection:"> + <string key="name">enterSelection:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="findNext:"> + <string key="name">findNext:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="findPrevious:"> + <string key="name">findPrevious:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="findTypeChanged:"> + <string key="name">findTypeChanged:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="panelFindNext:"> + <string key="name">panelFindNext:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="panelFindNextAndClosePanel:"> + <string key="name">panelFindNextAndClosePanel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="panelFindPrevious:"> + <string key="name">panelFindPrevious:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="replace:"> + <string key="name">replace:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="replaceAll:"> + <string key="name">replaceAll:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="replaceAndFind:"> + <string key="name">replaceAndFind:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="showFindPanel:"> + <string key="name">showFindPanel:</string> + <string key="candidateClassName">id</string> + </object> + </dictionary> + <dictionary class="NSMutableDictionary" key="outlets"> + <string key="additionalControlsBox">NSBox</string> + <string key="captureGroupPopUp">NSPopUpButton</string> + <string key="findNextButton">NSButton</string> + <string key="findPreviousButton">NSButton</string> + <string key="findTypeMatrix">NSMatrix</string> + <string key="ignoreCaseButton">NSButton</string> + <string key="regularExpressionControlsView">NSView</string> + <string key="replaceAllButton">NSButton</string> + <string key="replaceAndFindButton">NSButton</string> + <string key="replaceButton">NSButton</string> + <string key="replaceInSelectionCheckbox">NSButton</string> + <string key="replaceTextForm">NSForm</string> + <string key="searchTextForm">NSForm</string> + <string key="stringControlsView">NSVi... [truncated message content] |
From: <ama...@us...> - 2013-11-20 21:43:38
|
Revision: 1702 http://sourceforge.net/p/tcobrowser/code/1702 Author: amaxwell Date: 2013-11-20 21:43:35 +0000 (Wed, 20 Nov 2013) Log Message: ----------- fix some warnings Modified Paths: -------------- trunk/bibdesk/BibDocument.m trunk/bibdesk/SkimNotesAgent/NSFileManager_ExtendedAttributes.m trunk/bibdesk/vendorsrc/BDistributed/BDAlias/BDAlias.m Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2013-11-07 18:23:30 UTC (rev 1701) +++ trunk/bibdesk/BibDocument.m 2013-11-20 21:43:35 UTC (rev 1702) @@ -2287,7 +2287,7 @@ if (title) [newBI setField:BDSKTitleString toValue:title]; [pubs addObject:newBI]; - } else { + } else if (error) { *error = [NSError mutableLocalErrorWithCode:kBDSKParserFailed localizedDescription:NSLocalizedString(@"Did not find expected URL on the pasteboard", @"Error description")]; } Modified: trunk/bibdesk/SkimNotesAgent/NSFileManager_ExtendedAttributes.m =================================================================== --- trunk/bibdesk/SkimNotesAgent/NSFileManager_ExtendedAttributes.m 2013-11-07 18:23:30 UTC (rev 1701) +++ trunk/bibdesk/SkimNotesAgent/NSFileManager_ExtendedAttributes.m 2013-11-20 21:43:35 UTC (rev 1702) @@ -179,9 +179,6 @@ // let NSData worry about freeing the buffer NSData *attribute = [[NSData alloc] initWithBytesNoCopy:namebuf length:bufSize]; - NSPropertyListFormat format; - NSString *errorString; - // the plist parser logs annoying messages when failing to parse non-plist data, so sniff the header (this is correct for the binary plist that we use for split data) static NSData *plistHeaderData = nil; if (nil == plistHeaderData) { @@ -190,9 +187,8 @@ } id plist = nil; - if ([attribute length] >= [plistHeaderData length] && [plistHeaderData isEqual:[attribute subdataWithRange:NSMakeRange(0, [plistHeaderData length])]]) - plist = [NSPropertyListSerialization propertyListFromData:attribute mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&errorString]; + plist = [NSPropertyListSerialization propertyListWithData:attribute options:0 format:NULL error:error]; // even if it's a plist, it may not be a dictionary or have the key we're looking for if (plist && [plist respondsToSelector:@selector(objectForKey:)] && [[plist objectForKey:WRAPPER_KEY] boolValue]) { @@ -218,6 +214,9 @@ [attribute release]; attribute = success ? [[buffer bunzip2] copy] : nil; } + else if (plist) { + if (error) *error = [NSError errorWithDomain:@"BDSKErrorDomain" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, NSLocalizedString(@"Not a Skim property list", @""), NSLocalizedDescriptionKey, nil]]; + } return [attribute autorelease]; } @@ -229,14 +228,12 @@ if (nil == data) { if (outError) *outError = [NSError errorWithDomain:@"BDSKErrorDomain" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, error, NSUnderlyingErrorKey, nil]]; } else { - NSString *errorString; - plist = [NSPropertyListSerialization propertyListFromData:data - mutabilityOption:NSPropertyListImmutable + plist = [NSPropertyListSerialization propertyListWithData:data + options:0 format:NULL - errorDescription:&errorString]; + error:&error]; if (nil == plist) { - if (outError) *outError = [NSError errorWithDomain:@"BDSKErrorDomain" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errorString, NSLocalizedDescriptionKey, nil]]; - [errorString release]; + if (outError) *outError = [NSError errorWithDomain:@"BDSKErrorDomain" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, error, NSUnderlyingErrorKey, nil]]; } } return plist; @@ -313,19 +310,19 @@ return success; } -- (BOOL)setExtendedAttributeNamed:(NSString *)attr toPropertyListValue:(id)plist atPath:(NSString *)path options:(BDSKXattrFlags)options error:(NSError **)error; +- (BOOL)setExtendedAttributeNamed:(NSString *)attr toPropertyListValue:(id)plist atPath:(NSString *)path options:(BDSKXattrFlags)options error:(NSError **)outError; { - NSString *errorString; - NSData *data = [NSPropertyListSerialization dataFromPropertyList:plist - format:NSPropertyListBinaryFormat_v1_0 - errorDescription:&errorString]; + NSError *error; + NSData *data = [NSPropertyListSerialization dataWithPropertyList:plist + format:NSPropertyListBinaryFormat_v1_0 + options:0 + error:&error]; BOOL success; if (nil == data) { - if (error) *error = [NSError errorWithDomain:@"BDSKErrorDomain" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errorString, NSLocalizedDescriptionKey, nil]]; - [errorString release]; + if (outError) *outError = [NSError errorWithDomain:@"BDSKErrorDomain" code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, error, NSUnderlyingErrorKey, nil]]; success = NO; } else { - success = [self setExtendedAttributeNamed:attr toValue:data atPath:path options:options error:error]; + success = [self setExtendedAttributeNamed:attr toValue:data atPath:path options:options error:outError]; } return success; } @@ -360,9 +357,6 @@ // let NSData worry about freeing the buffer NSData *attribute = [[NSData alloc] initWithBytesNoCopy:namebuf length:bufSize]; - NSPropertyListFormat format; - NSString *errorString; - // the plist parser logs annoying messages when failing to parse non-plist data, so sniff the header (this is correct for the binary plist that we use for split data) static NSData *plistHeaderData = nil; if (nil == plistHeaderData) { @@ -373,7 +367,7 @@ id plist = nil; if ([attribute length] >= [plistHeaderData length] && [plistHeaderData isEqual:[attribute subdataWithRange:NSMakeRange(0, [plistHeaderData length])]]) - plist = [NSPropertyListSerialization propertyListFromData:attribute mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&errorString]; + plist = [NSPropertyListSerialization propertyListWithData:attribute options:0 format:NULL error:error]; // even if it's a plist, it may not be a dictionary or have the key we're looking for if (plist && [plist respondsToSelector:@selector(objectForKey:)] && [[plist objectForKey:WRAPPER_KEY] boolValue]) { Modified: trunk/bibdesk/vendorsrc/BDistributed/BDAlias/BDAlias.m =================================================================== --- trunk/bibdesk/vendorsrc/BDistributed/BDAlias/BDAlias.m 2013-11-07 18:23:30 UTC (rev 1701) +++ trunk/bibdesk/vendorsrc/BDistributed/BDAlias/BDAlias.m 2013-11-20 21:43:35 UTC (rev 1702) @@ -143,13 +143,13 @@ - (id)initWithAliasHandle:(AliasHandle)alias { - id ret = [super init]; + self = [super init]; - if (ret != nil) { + if (self) { _alias = alias; } - return ret; + return self; } - (id)initWithData:(NSData *)data This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-11-07 18:23:33
|
Revision: 1701 http://sourceforge.net/p/tcobrowser/code/1701 Author: amaxwell Date: 2013-11-07 18:23:30 +0000 (Thu, 07 Nov 2013) Log Message: ----------- disable stripping to silence a warning Modified Paths: -------------- trunk/bibdesk/BibDesk-Release.xcconfig trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj Modified: trunk/bibdesk/BibDesk-Release.xcconfig =================================================================== --- trunk/bibdesk/BibDesk-Release.xcconfig 2013-11-07 18:23:02 UTC (rev 1700) +++ trunk/bibdesk/BibDesk-Release.xcconfig 2013-11-07 18:23:30 UTC (rev 1701) @@ -2,8 +2,6 @@ // ARCHS = $(ARCHS_STANDARD_32_64_BIT) COPY_PHASE_STRIP = YES -STRIP_INSTALLED_PRODUCT = YES -STRIP_STYLE = all GCC_FAST_OBJC_DISPATCH = YES GCC_AUTO_VECTORIZATION = NO GCC_ENABLE_FIX_AND_CONTINUE = NO @@ -16,9 +14,6 @@ // block NSAssert and assert in release builds // GCC_PREPROCESSOR_DEFINITIONS = NS_BLOCK_ASSERTIONS NDEBUG -// I think this is set to avoid a compiler warning on BibDesk_vers.c -GCC_INPUT_FILETYPE = sourcecode.c.objc - GCC_WARN_CHECK_SWITCH_STATEMENTS = YES GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-11-07 18:23:02 UTC (rev 1700) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-11-07 18:23:30 UTC (rev 1701) @@ -3871,6 +3871,7 @@ baseConfigurationReference = F95C5E970D10E87C00C81970 /* BibDesk-Debug.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3886,6 +3887,7 @@ "$(SRCROOT)/$(INFOPLIST_FILE)", ); PRODUCT_NAME = BibDesk; + STRIP_INSTALLED_PRODUCT = NO; VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; }; @@ -3896,6 +3898,7 @@ baseConfigurationReference = F95C5E950D10E85400C81970 /* BibDesk-Release.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3911,6 +3914,7 @@ "$(SRCROOT)/$(INFOPLIST_FILE)", ); PRODUCT_NAME = BibDesk; + STRIP_INSTALLED_PRODUCT = NO; VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; }; @@ -3920,6 +3924,7 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3935,6 +3940,7 @@ "$(SRCROOT)/$(INFOPLIST_FILE)", ); PRODUCT_NAME = BibDesk; + STRIP_INSTALLED_PRODUCT = NO; VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; }; @@ -4086,6 +4092,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; + COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1008; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; @@ -4093,6 +4100,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.4; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + STRIP_INSTALLED_PRODUCT = NO; VERSIONING_SYSTEM = "apple-generic"; WARNING_CFLAGS = ( "-Wall", @@ -4107,11 +4115,13 @@ baseConfigurationReference = F95C5E950D10E85400C81970 /* BibDesk-Release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; + COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; GCC_OPTIMIZATION_LEVEL = s; MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = macosx; + STRIP_INSTALLED_PRODUCT = NO; }; name = Release; }; @@ -4119,10 +4129,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; + COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = macosx; + STRIP_INSTALLED_PRODUCT = NO; }; name = Test; }; Modified: trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2013-11-07 18:23:02 UTC (rev 1700) +++ trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2013-11-07 18:23:30 UTC (rev 1701) @@ -196,10 +196,12 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; + COPY_PHASE_STRIP = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; + STRIP_INSTALLED_PRODUCT = NO; }; name = Debug; }; @@ -207,9 +209,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; + COPY_PHASE_STRIP = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; SDKROOT = macosx; + STRIP_INSTALLED_PRODUCT = NO; }; name = Release; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-11-07 18:23:05
|
Revision: 1700 http://sourceforge.net/p/tcobrowser/code/1700 Author: amaxwell Date: 2013-11-07 18:23:02 +0000 (Thu, 07 Nov 2013) Log Message: ----------- silence category override warning Modified Paths: -------------- trunk/bibdesk/NSTextView_BDSKExtensions.m Modified: trunk/bibdesk/NSTextView_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSTextView_BDSKExtensions.m 2013-10-30 18:45:46 UTC (rev 1699) +++ trunk/bibdesk/NSTextView_BDSKExtensions.m 2013-11-07 18:23:02 UTC (rev 1700) @@ -45,12 +45,17 @@ static BDSKTextViewFindController *findController = nil; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation" + - (IBAction)performFindPanelAction:(id)sender{ if (findController == nil) findController = [[BDSKTextViewFindController alloc] init]; [findController performFindPanelAction:sender]; } +#pragma clang diagnostic pop + // flag changes during a drag are not forwarded to the application, so we fix that at the end of the drag - (void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation{ // there is not original implementation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-30 18:45:50
|
Revision: 1699 http://sourceforge.net/p/tcobrowser/code/1699 Author: amaxwell Date: 2013-10-30 18:45:46 +0000 (Wed, 30 Oct 2013) Log Message: ----------- add shared schemes and codesign frameworks and helpers Modified Paths: -------------- trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj Added Paths: ----------- trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme Modified: trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2013-10-30 18:45:07 UTC (rev 1698) +++ trunk/bibdesk/BibImporter/BibImporter.xcodeproj/project.pbxproj 2013-10-30 18:45:46 UTC (rev 1699) @@ -284,6 +284,7 @@ F95CC106087F54B2002C5694 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -293,6 +294,7 @@ F95CC107087F54B2002C5694 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-10-30 18:45:07 UTC (rev 1698) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-10-30 18:45:46 UTC (rev 1699) @@ -144,9 +144,9 @@ CED65AC00906BE1F003EED90 /* BibPref_ScriptHooks.m in Sources */ = {isa = PBXBuildFile; fileRef = CED65ABE0906BE1F003EED90 /* BibPref_ScriptHooks.m */; }; CED65DC90907A2FD003EED90 /* BDSKParseFormatCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = CED65DC70907A2FD003EED90 /* BDSKParseFormatCommand.m */; }; CED65DCD0907A338003EED90 /* BDSKScriptHook+Scripting.m in Sources */ = {isa = PBXBuildFile; fileRef = CED65DCB0907A338003EED90 /* BDSKScriptHook+Scripting.m */; }; - CEE23BDC0BFBA775002B746B /* Scripts in CopyFiles */ = {isa = PBXBuildFile; fileRef = CEE23BD50BFBA6D6002B746B /* Scripts */; }; - CEE23BE40BFBA78F002B746B /* previewtemplate.tex in CopyFiles */ = {isa = PBXBuildFile; fileRef = F91B5CC7076579830011ED22 /* previewtemplate.tex */; }; - CEE23BE50BFBA78F002B746B /* template.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = F91B5CE407657A200011ED22 /* template.txt */; }; + CEE23BDC0BFBA775002B746B /* Scripts in Copy template support */ = {isa = PBXBuildFile; fileRef = CEE23BD50BFBA6D6002B746B /* Scripts */; }; + CEE23BE40BFBA78F002B746B /* previewtemplate.tex in Copy template support */ = {isa = PBXBuildFile; fileRef = F91B5CC7076579830011ED22 /* previewtemplate.tex */; }; + CEE23BE50BFBA78F002B746B /* template.txt in Copy template support */ = {isa = PBXBuildFile; fileRef = F91B5CE407657A200011ED22 /* template.txt */; }; CEEA4C6A0B57B0D400434059 /* BDSKBooleanValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEA4C680B57B0D400434059 /* BDSKBooleanValueTransformer.m */; }; CEEC6C55093A411E00A64F54 /* BDSKCollapsibleView.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEC6C53093A411E00A64F54 /* BDSKCollapsibleView.m */; }; CEEC70E2093B6EC200A64F54 /* BDSKDragImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEC70E0093B6EC200A64F54 /* BDSKDragImageView.m */; }; @@ -154,7 +154,7 @@ CEEFDE010B03ED0200668BB0 /* BDSKScriptGroupSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEFDDFD0B03ED0200668BB0 /* BDSKScriptGroupSheetController.m */; }; CEEFDE030B03ED0200668BB0 /* BDSKURLGroupSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEEFDDFF0B03ED0200668BB0 /* BDSKURLGroupSheetController.m */; }; CEF1817F0CEB702000716E85 /* Bookmarks.plist in Resources */ = {isa = PBXBuildFile; fileRef = CEF1817E0CEB701F00716E85 /* Bookmarks.plist */; }; - CEF181BD0CEB711700716E85 /* Bookmarks.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = CEF1817E0CEB701F00716E85 /* Bookmarks.plist */; }; + CEF181BD0CEB711700716E85 /* Bookmarks.plist in Copy template support */ = {isa = PBXBuildFile; fileRef = CEF1817E0CEB701F00716E85 /* Bookmarks.plist */; }; CEF71ADB0B91BBCB003A2771 /* BDSKNotesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF71AD90B91BBCB003A2771 /* BDSKNotesWindowController.m */; }; CEF7295709CC88AB00802D48 /* BDSKFieldSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF7295509CC88AB00802D48 /* BDSKFieldSheetController.m */; }; CEF7A6690915115B00BE9E02 /* BDSKScriptMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF7A6670915115B00BE9E02 /* BDSKScriptMenu.m */; }; @@ -224,10 +224,10 @@ F9022DEA0758095000C3F701 /* OmniFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9022DE60758095000C3F701 /* OmniFoundation.framework */; }; F9022DEE0758099D00C3F701 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9022DEB0758099D00C3F701 /* ApplicationServices.framework */; }; F9022DEF0758099D00C3F701 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9022DEC0758099D00C3F701 /* Carbon.framework */; }; - F9022FB107580A9600C3F701 /* AGRegex.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022DE30758095000C3F701 /* AGRegex.framework */; }; - F9022FB207580A9600C3F701 /* OmniAppKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022DE40758095000C3F701 /* OmniAppKit.framework */; }; - F9022FB307580A9600C3F701 /* OmniBase.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022DE50758095000C3F701 /* OmniBase.framework */; }; - F9022FB407580A9600C3F701 /* OmniFoundation.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9022DE60758095000C3F701 /* OmniFoundation.framework */; }; + F9022FB107580A9600C3F701 /* AGRegex.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = F9022DE30758095000C3F701 /* AGRegex.framework */; }; + F9022FB207580A9600C3F701 /* OmniAppKit.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = F9022DE40758095000C3F701 /* OmniAppKit.framework */; }; + F9022FB307580A9600C3F701 /* OmniBase.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = F9022DE50758095000C3F701 /* OmniBase.framework */; }; + F9022FB407580A9600C3F701 /* OmniFoundation.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = F9022DE60758095000C3F701 /* OmniFoundation.framework */; }; F9022FCB07580B9400C3F701 /* BDSKAppController+Scripting.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022FBC07580B9400C3F701 /* BDSKAppController+Scripting.m */; }; F9022FCD07580B9400C3F701 /* BibAuthor+Scripting.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022FBE07580B9400C3F701 /* BibAuthor+Scripting.m */; }; F9022FD007580B9400C3F701 /* BDSKSearchForCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F9022FC107580B9400C3F701 /* BDSKSearchForCommand.m */; }; @@ -287,7 +287,7 @@ F94DE74C09CB46FF00B5FD51 /* BDSKPersistentSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = F94DE74A09CB46FF00B5FD51 /* BDSKPersistentSearch.m */; }; F955039D1088ED560014BD99 /* BDSKIEEEXploreParser.h in Headers */ = {isa = PBXBuildFile; fileRef = F955039B1088ED560014BD99 /* BDSKIEEEXploreParser.h */; }; F955039E1088ED560014BD99 /* BDSKIEEEXploreParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F955039C1088ED560014BD99 /* BDSKIEEEXploreParser.m */; }; - F95B874E0D567E8E005DC4F3 /* BibDesk.qlgenerator in CopyFiles */ = {isa = PBXBuildFile; fileRef = F98C6FD00CDD30A2002FCAD8 /* BibDesk.qlgenerator */; }; + F95B874E0D567E8E005DC4F3 /* BibDesk.qlgenerator in Copy Quick Look plugin */ = {isa = PBXBuildFile; fileRef = F98C6FD00CDD30A2002FCAD8 /* BibDesk.qlgenerator */; }; F95CC0C3087F5378002C5694 /* NSFileManager_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F95CC0C1087F5378002C5694 /* NSFileManager_BDSKExtensions.m */; }; F95D3FAF09DDF6A900D793A6 /* BibPref_Sharing.m in Sources */ = {isa = PBXBuildFile; fileRef = F95D3FAD09DDF6A900D793A6 /* BibPref_Sharing.m */; }; F95ED6950B07BA4E00000BBF /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F95ED6910B07BA4E00000BBF /* ExceptionHandling.framework */; }; @@ -327,16 +327,16 @@ F9A6772E07D2D57F00782ACD /* MultiplePageView.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A6772C07D2D57F00782ACD /* MultiplePageView.m */; }; F9AB08150E6394A10055C7A1 /* BDSKTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F9AB08130E6394A10055C7A1 /* BDSKTask.m */; }; F9ABEC9F086E11B500741FC5 /* BTParse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9ABEC9E086E11B500741FC5 /* BTParse.framework */; }; - F9ABECC7086E12B700741FC5 /* BTParse.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9ABEC9E086E11B500741FC5 /* BTParse.framework */; }; + F9ABECC7086E12B700741FC5 /* BTParse.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = F9ABEC9E086E11B500741FC5 /* BTParse.framework */; }; F9B3405E0BBC16720072C2B0 /* BibItem_PubMedLookup.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B3405C0BBC16720072C2B0 /* BibItem_PubMedLookup.m */; }; F9B39F310FACCBBE00FF8853 /* BDSKPubMedXMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B39F2F0FACCBBE00FF8853 /* BDSKPubMedXMLParser.m */; }; F9B800950B41DFAF00A5A615 /* BDSKSearchGroupSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B800930B41DFAF00A5A615 /* BDSKSearchGroupSheetController.m */; }; F9B801840B41E89500A5A615 /* yaz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9B801830B41E89500A5A615 /* yaz.framework */; }; - F9B801930B41E8D600A5A615 /* yaz.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9B801830B41E89500A5A615 /* yaz.framework */; }; + F9B801930B41E8D600A5A615 /* yaz.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = F9B801830B41E89500A5A615 /* yaz.framework */; }; F9B8019F0B41E91F00A5A615 /* BDSKZoomGroupServer.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B8019D0B41E91F00A5A615 /* BDSKZoomGroupServer.m */; }; F9B88D990B7D14B700D5D42C /* BDSKFileMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = F9B88D970B7D14B700D5D42C /* BDSKFileMatcher.m */; }; F9B945F70E1A9B5A00395BA4 /* FileView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9B945F60E1A9B5A00395BA4 /* FileView.framework */; }; - F9B946080E1A9B9600395BA4 /* FileView.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F9B945F60E1A9B5A00395BA4 /* FileView.framework */; }; + F9B946080E1A9B9600395BA4 /* FileView.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = F9B945F60E1A9B5A00395BA4 /* FileView.framework */; }; F9BA452F100E334400FE4435 /* BDSKCOinSParser.h in Headers */ = {isa = PBXBuildFile; fileRef = F9BA452D100E334400FE4435 /* BDSKCOinSParser.h */; }; F9BA4530100E334400FE4435 /* BDSKCOinSParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F9BA452E100E334400FE4435 /* BDSKCOinSParser.m */; }; F9BBCDFB0F6CBB27001CFAE0 /* BibDocument_GroupDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = F9BBCDF90F6CBB27001CFAE0 /* BibDocument_GroupDataSource.m */; }; @@ -401,7 +401,7 @@ F9DC8B110F5B46E400A57DE3 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F9DC8B100F5B46E400A57DE3 /* Credits.rtf */; }; F9DC8B150F5B46E400A57DE3 /* PreferenceSearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = F9DC8B140F5B46E400A57DE3 /* PreferenceSearchTerms.plist */; }; F9DCEA50094B7D1100AEE662 /* BDSKTextWithIconCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F9DCEA4E094B7D1100AEE662 /* BDSKTextWithIconCell.m */; }; - F9DE8DFB087F74D3006F0427 /* BibImporter.mdimporter in CopyFiles */ = {isa = PBXBuildFile; fileRef = F95CC113087F54BF002C5694 /* BibImporter.mdimporter */; }; + F9DE8DFB087F74D3006F0427 /* BibImporter.mdimporter in Copy Spotlight plugin */ = {isa = PBXBuildFile; fileRef = F95CC113087F54BF002C5694 /* BibImporter.mdimporter */; }; F9DE8E56087F81A4006F0427 /* cacheDoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = F9DE8E55087F81A4006F0427 /* cacheDoc.icns */; }; F9DF3BC209B7605E00342ADE /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9DF3BC109B7605E00342ADE /* SystemConfiguration.framework */; }; F9E069B70981A03B00AEFBE7 /* BDSKWebOfScienceParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F9E069B50981A03B00AEFBE7 /* BDSKWebOfScienceParser.m */; }; @@ -739,53 +739,57 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - F9022E8B07580A7C00C3F701 /* CopyFiles */ = { + F9022E8B07580A7C00C3F701 /* Copy frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - F9B946080E1A9B9600395BA4 /* FileView.framework in CopyFiles */, - F9B801930B41E8D600A5A615 /* yaz.framework in CopyFiles */, - F9ABECC7086E12B700741FC5 /* BTParse.framework in CopyFiles */, - F9022FB107580A9600C3F701 /* AGRegex.framework in CopyFiles */, - F9022FB207580A9600C3F701 /* OmniAppKit.framework in CopyFiles */, - F9022FB307580A9600C3F701 /* OmniBase.framework in CopyFiles */, - F9022FB407580A9600C3F701 /* OmniFoundation.framework in CopyFiles */, + F9B946080E1A9B9600395BA4 /* FileView.framework in Copy frameworks */, + F9B801930B41E8D600A5A615 /* yaz.framework in Copy frameworks */, + F9ABECC7086E12B700741FC5 /* BTParse.framework in Copy frameworks */, + F9022FB107580A9600C3F701 /* AGRegex.framework in Copy frameworks */, + F9022FB207580A9600C3F701 /* OmniAppKit.framework in Copy frameworks */, + F9022FB307580A9600C3F701 /* OmniBase.framework in Copy frameworks */, + F9022FB407580A9600C3F701 /* OmniFoundation.framework in Copy frameworks */, ); + name = "Copy frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - F91B5C4E076412A10011ED22 /* CopyFiles */ = { + F91B5C4E076412A10011ED22 /* Copy template support */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 12; files = ( - CEE23BDC0BFBA775002B746B /* Scripts in CopyFiles */, - CEE23BE40BFBA78F002B746B /* previewtemplate.tex in CopyFiles */, - CEE23BE50BFBA78F002B746B /* template.txt in CopyFiles */, - CEF181BD0CEB711700716E85 /* Bookmarks.plist in CopyFiles */, + CEE23BDC0BFBA775002B746B /* Scripts in Copy template support */, + CEE23BE40BFBA78F002B746B /* previewtemplate.tex in Copy template support */, + CEE23BE50BFBA78F002B746B /* template.txt in Copy template support */, + CEF181BD0CEB711700716E85 /* Bookmarks.plist in Copy template support */, ); + name = "Copy template support"; runOnlyForDeploymentPostprocessing = 0; }; - F95B874D0D567E84005DC4F3 /* CopyFiles */ = { + F95B874D0D567E84005DC4F3 /* Copy Quick Look plugin */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = Contents/Library/QuickLook; dstSubfolderSpec = 1; files = ( - F95B874E0D567E8E005DC4F3 /* BibDesk.qlgenerator in CopyFiles */, + F95B874E0D567E8E005DC4F3 /* BibDesk.qlgenerator in Copy Quick Look plugin */, ); + name = "Copy Quick Look plugin"; runOnlyForDeploymentPostprocessing = 0; }; - F95CC0ED087F542F002C5694 /* CopyFiles */ = { + F95CC0ED087F542F002C5694 /* Copy Spotlight plugin */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = Contents/Library/Spotlight; dstSubfolderSpec = 1; files = ( - F9DE8DFB087F74D3006F0427 /* BibImporter.mdimporter in CopyFiles */, + F9DE8DFB087F74D3006F0427 /* BibImporter.mdimporter in Copy Spotlight plugin */, ); + name = "Copy Spotlight plugin"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -2482,22 +2486,21 @@ isa = PBXNativeTarget; buildConfigurationList = F993F1BC08553A61007A7657 /* Build configuration list for PBXNativeTarget "BibDesk" */; buildPhases = ( - F9E0B071083E450C000109C6 /* ShellScript */, + F9E0B071083E450C000109C6 /* Generate localized strings */, 8D1107290486CEB800E47090 /* Resources */, - CEF8343E0C77502C00A3AD51 /* ShellScript */, - CEF834480C7750F000A3AD51 /* ShellScript */, + CEF8343E0C77502C00A3AD51 /* Build help files */, + CEF834480C7750F000A3AD51 /* Copy help files */, 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, - F9022E8B07580A7C00C3F701 /* CopyFiles */, - F920DB22075C2D40000C5FCA /* Rez */, + F9022E8B07580A7C00C3F701 /* Copy frameworks */, CE424A430D0F121400F824E7 /* Headers */, - F91B5C4E076412A10011ED22 /* CopyFiles */, - F95CC0ED087F542F002C5694 /* CopyFiles */, - F95B874D0D567E84005DC4F3 /* CopyFiles */, - F9FF213B09E83BAB00BB1706 /* ShellScript */, - F91E54660853576600208CDF /* ShellScript */, - F99D19440E1933CC00F25963 /* ShellScript */, - F9B413210F86E8E000663E37 /* ShellScript */, + F91B5C4E076412A10011ED22 /* Copy template support */, + F95CC0ED087F542F002C5694 /* Copy Spotlight plugin */, + F95B874D0D567E84005DC4F3 /* Copy Quick Look plugin */, + F9FF213B09E83BAB00BB1706 /* Strip framework header files */, + F91E54660853576600208CDF /* Index help */, + F99D19440E1933CC00F25963 /* Change FileView install name */, + F9B413210F86E8E000663E37 /* Sign frameworks */, ); buildRules = ( ); @@ -2948,18 +2951,8 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXRezBuildPhase section */ - F920DB22075C2D40000C5FCA /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXRezBuildPhase section */ - /* Begin PBXShellScriptBuildPhase section */ - CEF8343E0C77502C00A3AD51 /* ShellScript */ = { + CEF8343E0C77502C00A3AD51 /* Build help files */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 12; files = ( @@ -2970,6 +2963,7 @@ "$(SRCROOT)/English.lproj/BibDesk Help/bibdesk.texi", "$(SRCROOT)/English.lproj/BibDesk Help/version.texi", ); + name = "Build help files"; outputPaths = ( "$(DERIVED_FILE_DIR)/BibDesk Help/English.lproj/BibDesk Help/BibDesk Help.html", ); @@ -2977,7 +2971,7 @@ shellPath = /bin/sh; shellScript = "HELP_NAME=\"BibDesk Help\"\n\nINPUT=\"${HELP_NAME}/bibdesk.texi\"\nTOOLS=\"${HELP_NAME}\"\nDEST=\"${HELP_NAME}\"\nPREFIX=\"${HELP_NAME}\";\n\nTARGET=\"${DERIVED_FILE_DIR}/${HELP_NAME}\"\n\ncd \"${SOURCE_ROOT}\"\n\n[ -d \"${TARGET}\" ] || /bin/mkdir -p \"${TARGET}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tif [ -f \"${LOC_DIR}/${INPUT}\" ]; then\n\t\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t\t[ -d \"${LOC_TARGET}\" ] && /bin/rm -rf \"${LOC_TARGET}\"/* || /bin/mkdir -p \"${LOC_TARGET}\"; \\\n\t\techo \"*** Creating help files in ${LOC_TARGET} ***\"; \\\n\t\t\"${TOOLS}/texi2html\" \"${LOC_DIR}/${INPUT}\" --init-file=\"${TOOLS}/applehelp.init\" --prefix=\"${PREFIX}\" --output=\"${LOC_TARGET}\" --split=node --nonumber && \\\n\t\tpython \"${TOOLS}/postprocess-nontitle.py\" \"${LOC_TARGET}/${PREFIX}_\"*.html; \\\n\tfi\ndone;\n"; }; - CEF834480C7750F000A3AD51 /* ShellScript */ = { + CEF834480C7750F000A3AD51 /* Copy help files */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -2985,6 +2979,7 @@ inputPaths = ( "$(DERIVED_FILE_DIR)/BibDesk Help/English.lproj/BibDesk Help/BibDesk Help.html", ); + name = "Copy help files"; outputPaths = ( "$(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/English.lproj/BibDesk Help/BibDesk Help.html", ); @@ -2992,13 +2987,14 @@ shellPath = /bin/sh; shellScript = "HELP_NAME=\"BibDesk Help\"\n\nSOURCE=\"${DERIVED_FILE_DIR}/${HELP_NAME}\";\nTARGET=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\";\nDEST=\"${HELP_NAME}\";\n\ncd \"${SOURCE}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tif [ -d \"${LOC_DIR}/${DEST}\" ]; then\n\t\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t\techo \"*** Copying help files from ${SOURCE}/${LOC_DIR}/${DEST} to ${LOC_TARGET} ***\"; \\\n\t\t/bin/rm -rf \"${LOC_TARGET}/\"*.html; \\\n\t\t/bin/cp -Rf \"${LOC_DIR}/${DEST}/\"*.html \"${LOC_TARGET}\"; \\\n\tfi\ndone;\n"; }; - F91E54660853576600208CDF /* ShellScript */ = { + F91E54660853576600208CDF /* Index help */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Index help"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -3031,52 +3027,56 @@ shellPath = /bin/sh; shellScript = "####\n##\n## If you feel an undying urge to improve this,\n## discuss it with the poor slob that does the\n## releases first (and test it thoroughly)!\n##\n####\n\n# template image in source folder\nSRC_IMAGE=\"${SOURCE_ROOT}/BibDesk.dmg\"\n\n# temporary image\nDST_IMAGE=/tmp/BibDesk.dmg\n\n# final distribution image\nFINAL_IMAGE=\"$HOME/Desktop/BibDesk.dmg\"\n\n# see if this file already exists and bail\nif [ -f ${FINAL_IMAGE} ]; then\n\techo \"error: ${FINAL_IMAGE} exists\"\n\texit 1\nfi\n\n# see if a volume is already mounted or a\n# previous cp operation was botched\nif [ -e '/Volumes/BibDesk' ]; then\n\techo 'error: /Volumes/BibDesk exists'\n\techo 'warning: opening /Volumes in Finder'\n\t/usr/bin/open /Volumes/BibDesk\n\texit 1\nfi\n\n# remove temp image from a previous run\nif [ -f ${DST_IMAGE} ]; then\n\techo \"warning: removing ${DST_IMAGE}\"\n\t/bin/rm ${DST_IMAGE}\n\tif [ $? != 0 ]; then\n\t\techo \"error: failed to remove ${DST_IMAGE}\"\n\t\texit 1\n\tfi\nfi\n\n# stored zipped in svn, so unzip if needed\n# pass o to overwrite, or unzip waits for stdin\n# when trying to unpack the resource fork/EA\n\nif [ ! -f ${SRC_IMAGE} ]; then\n\t/usr/bin/unzip -uo ${SRC_IMAGE}.zip\n\tif [ $? != 0 ]; then\n\t\techo \"error: failed to unzip ${SRC_IMAGE}.zip\"\n\t\texit 1\n\tfi\nfi\n\n# copy empty image to /tmp\n/bin/cp ${SRC_IMAGE} /tmp\nif [ $? != 0 ]; then\n\techo \"error: failed to copy ${SRC_IMAGE} to /tmp\"\n\texit 1\nfi\n\n# mount image and use CpMac to copy all files\n/usr/bin/hdiutil attach ${DST_IMAGE}\nif [ $? != 0 ]; then\n\techo \"error: failed to mount ${DST_IMAGE}\"\n\texit 1\nfi\n\n${SYSTEM_DEVELOPER_TOOLS}/CpMac -r ${BUILT_PRODUCTS_DIR}/BibDesk.app /Volumes/BibDesk\nif [ $? != 0 ]; then\n\techo \"error: failed to copy ${BUILT_PRODUCTS_DIR}/BibDesk.app\"\n\texit 1\nfi\n\n# tell finder to set the icon position\n/usr/bin/osascript -e \"tell application \\\"Finder\\\" to set the position of item 1 of the disk named \\\"BibDesk\\\" to {204, 148}\"\n\nif [ $? != 0 ]; then\n\techo \"error: Finder failed to set position\"\n\texit 1\nfi\n\n# data is copied, so unmount the volume\n/usr/sbin/diskutil eject /Volumes/BibDesk\nif [ $? != 0 ]; then\n\techo \"error: failed to eject /Volumes/BibDesk\"\n\texit 1\nfi\n\n# convert image to read only and compress\n/usr/bin/hdiutil convert ${DST_IMAGE} -format UDZO -imagekey zlib-level=9 -o ${FINAL_IMAGE}\nif [ $? != 0 ]; then\n\techo \"error: failed to convert ${DST_IMAGE}\"\n\texit 1\nfi\n\n# set internet-enable bit for Safari, even\n# though I dislike internet-enabled images...\n/usr/bin/hdiutil internet-enable -YES ${FINAL_IMAGE}\nif [ $? != 0 ]; then\n\techo \"error: failed to internet-enable ${DST_IMAGE}\"\n\texit 1\nfi\n\nexit 0"; }; - F99D19440E1933CC00F25963 /* ShellScript */ = { + F99D19440E1933CC00F25963 /* Change FileView install name */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Change FileView install name"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "/usr/bin/install_name_tool -change \\\n'@loader_path/../../../../../../../FileView.framework/Versions/A/FileView' \\\n'@executable_path/../Frameworks/FileView.framework/Versions/A/FileView' \\\n\"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\""; }; - F9B413210F86E8E000663E37 /* ShellScript */ = { + F9B413210F86E8E000663E37 /* Sign frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Sign frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/usr/bin/codesign --deep -f -s \"TeX Live Utility Signing Certificate\" \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\""; + shellScript = "LOCATION=\"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\nIDENTITY=\"TeX Live Utility Signing Certificate\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/FileView.framework/Versions/A\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/OmniBase.framework/Versions/A\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/OmniFoundation.framework/Versions/A\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/OmniAppKit.framework/Versions/A\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/BTParse.framework/Versions/A\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/AGRegex.framework/Versions/A\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/yaz.framework/Versions/A\"\n\n"; }; - F9E0B071083E450C000109C6 /* ShellScript */ = { + F9E0B071083E450C000109C6 /* Generate localized strings */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); + name = "Generate localized strings"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "##\n## This takes a while to generate, so it's not worth\n## the wait for development builds.\n##\nif [ ${BUILD_STYLE} = \"Debug\" ]; then\n# Check to see if a previous version exists and create it\n# if not, or else pbxcp will complain.\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\nfi\n#\n# Run the genstrings build phase\n#\ncd ${SOURCE_ROOT} && \\\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nmv English.lproj/Localizable.strings English.lproj/Localizable.strings.bak \nfi\n\n# skip OmniBase/macros.h because of genstrings crash\n# skip vendorsrc entirely? need to process .h files?\n\n/usr/bin/genstrings -q -o \"${SOURCE_ROOT}/English.lproj\" \\\n-skipTable BibTeXKeys \\\n-skipTable ZoomValues \\\n-skipTable TemplateOptions \\\n*.m 2>&1 | sed -e 's/^/warning: /g' | \\\nsed -e 's/warning:.*Warning:/warning:/g' >&2\n"; }; - F9FF213B09E83BAB00BB1706 /* ShellScript */ = { + F9FF213B09E83BAB00BB1706 /* Strip framework header files */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 12; files = ( ); inputPaths = ( ); + name = "Strip framework header files"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -4085,6 +4085,7 @@ F993F20308553A61007A7657 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; CURRENT_PROJECT_VERSION = 1008; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; @@ -4105,6 +4106,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F95C5E950D10E85400C81970 /* BibDesk-Release.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; GCC_OPTIMIZATION_LEVEL = s; @@ -4116,6 +4118,7 @@ F993F20508553A61007A7657 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; DEBUG_INFORMATION_FORMAT = dwarf; GCC_AUTO_VECTORIZATION = NO; MACOSX_DEPLOYMENT_TARGET = 10.4; Added: trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme (rev 0) +++ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Debug).xcscheme 2013-10-30 18:45:46 UTC (rev 1699) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "0500" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> + <Testables> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </TestAction> + <LaunchAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + buildConfiguration = "Debug" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + buildConfiguration = "Release" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> Added: trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme (rev 0) +++ trunk/bibdesk/Bibdesk.xcodeproj/xcshareddata/xcschemes/BibDesk (Release).xcscheme 2013-10-30 18:45:46 UTC (rev 1699) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "0500" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> + <Testables> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </TestAction> + <LaunchAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + buildConfiguration = "Release" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + buildConfiguration = "Release" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8D1107260486CEB800E47090" + BuildableName = "BibDesk.app" + BlueprintName = "BibDesk" + ReferencedContainer = "container:Bibdesk.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> Modified: trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj 2013-10-30 18:45:07 UTC (rev 1698) +++ trunk/bibdesk/QuickLook-BibDesk/QuickLook-BibDesk.xcodeproj/project.pbxproj 2013-10-30 18:45:46 UTC (rev 1699) @@ -288,6 +288,7 @@ 2CA326230896AD4900168862 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; @@ -299,6 +300,7 @@ 2CA326240896AD4900168862 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; SDKROOT = macosx; Modified: trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2013-10-30 18:45:07 UTC (rev 1698) +++ trunk/bibdesk/SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2013-10-30 18:45:46 UTC (rev 1699) @@ -195,6 +195,7 @@ 1DEB927908733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; @@ -205,6 +206,7 @@ 1DEB927A08733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "TeX Live Utility Signing Certificate"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; SDKROOT = macosx; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-30 18:45:09
|
Revision: 1698 http://sourceforge.net/p/tcobrowser/code/1698 Author: amaxwell Date: 2013-10-30 18:45:07 +0000 (Wed, 30 Oct 2013) Log Message: ----------- always create bitmap Modified Paths: -------------- trunk/bibdesk/NSImage_BDSKExtensions.m Modified: trunk/bibdesk/NSImage_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSImage_BDSKExtensions.m 2013-10-29 22:00:56 UTC (rev 1697) +++ trunk/bibdesk/NSImage_BDSKExtensions.m 2013-10-30 18:45:07 UTC (rev 1698) @@ -176,52 +176,50 @@ for (NSBitmapImageRep *rep in [folderIcon representations]) { // when compiling with 10.6 as min version, this is an NSIconRefImageRep, which is a direct subclass of NSImageRep - if ([rep isKindOfClass:[NSBitmapImageRep class]] == NO) { - NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL - pixelsWide:[rep pixelsWide] - pixelsHigh:[rep pixelsHigh] - bitsPerSample:8 - samplesPerPixel:4 - hasAlpha:YES - isPlanar:NO - colorSpaceName:[rep colorSpaceName] - bitmapFormat:0 - bytesPerRow:0 - bitsPerPixel:32]; - [NSGraphicsContext saveGraphicsState]; - [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]]; - [[NSColor clearColor] setFill]; - NSRect dstRect = NSMakeRect(0, 0, [bitmap pixelsWide], [bitmap pixelsHigh]); - NSRectFillUsingOperation(dstRect, NSCompositeCopy); - [rep drawInRect:dstRect fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0 respectFlipped:YES hints:nil]; - [NSGraphicsContext restoreGraphicsState]; - rep = [bitmap autorelease]; - } + // convert to NSBitmapImageRep to avoid going through IconServices, which gets slower with each OS release + NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL + pixelsWide:[rep pixelsWide] + pixelsHigh:[rep pixelsHigh] + bitsPerSample:8 + samplesPerPixel:4 + hasAlpha:YES + isPlanar:NO + colorSpaceName:[rep colorSpaceName] + bitmapFormat:0 + bytesPerRow:0 + bitsPerPixel:32]; + [NSGraphicsContext saveGraphicsState]; + [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]]; + [[NSColor clearColor] setFill]; + NSRect dstRect = NSMakeRect(0, 0, [bitmap pixelsWide], [bitmap pixelsHigh]); + NSRectFillUsingOperation(dstRect, NSCompositeCopy); + [rep drawInRect:dstRect fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0 respectFlipped:YES hints:nil]; + [NSGraphicsContext restoreGraphicsState]; - if ([rep isKindOfClass:[NSBitmapImageRep class]]) { - - CIFilter *colorFilter = [CIFilter filterWithName:@"CIColorControls"]; - NSParameterAssert(colorFilter); - [colorFilter setDefaults]; - [colorFilter setValue:[NSNumber numberWithFloat:2.0] forKey:kCIInputSaturationKey]; - [colorFilter setValue:[NSNumber numberWithFloat:0.50] forKey:kCIInputBrightnessKey]; - [colorFilter setValue:[NSNumber numberWithFloat:1.75] forKey:kCIInputContrastKey]; - - CIImage *inputImage = [[CIImage alloc] initWithBitmapImageRep:rep]; - [colorFilter setValue:inputImage forKey:kCIInputImageKey]; - [inputImage release]; - - CIFilter *hueFilter = [CIFilter filterWithName:@"CIHueAdjust"]; - NSParameterAssert(hueFilter); - [hueFilter setDefaults]; - [hueFilter setValue:[NSNumber numberWithFloat:-M_PI] forKey:kCIInputAngleKey]; - [hueFilter setValue:[colorFilter valueForKey:kCIOutputImageKey] forKey:kCIInputImageKey]; - - // NSCIImageRep draws with artifacts around the image - rep = [[NSBitmapImageRep alloc] initWithCIImage:[hueFilter valueForKey:kCIOutputImageKey]]; - [newReps addObject:rep]; - [rep release]; - } + CIFilter *colorFilter = [CIFilter filterWithName:@"CIColorControls"]; + NSParameterAssert(colorFilter); + [colorFilter setDefaults]; + [colorFilter setValue:[NSNumber numberWithFloat:2.0] forKey:kCIInputSaturationKey]; + [colorFilter setValue:[NSNumber numberWithFloat:0.50] forKey:kCIInputBrightnessKey]; + [colorFilter setValue:[NSNumber numberWithFloat:1.75] forKey:kCIInputContrastKey]; + + CIImage *inputImage = [[CIImage alloc] initWithBitmapImageRep:bitmap]; + [bitmap release]; + + [colorFilter setValue:inputImage forKey:kCIInputImageKey]; + [inputImage release]; + + CIFilter *hueFilter = [CIFilter filterWithName:@"CIHueAdjust"]; + NSParameterAssert(hueFilter); + [hueFilter setDefaults]; + [hueFilter setValue:[NSNumber numberWithFloat:-M_PI] forKey:kCIInputAngleKey]; + [hueFilter setValue:[colorFilter valueForKey:kCIOutputImageKey] forKey:kCIInputImageKey]; + + // NSCIImageRep draws with artifacts around the image + rep = [[NSBitmapImageRep alloc] initWithCIImage:[hueFilter valueForKey:kCIOutputImageKey]]; + [newReps addObject:rep]; + [rep release]; + } if ([newReps count]) { yellowFolderImage = [[NSImage alloc] initWithSize:[folderIcon size]]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-29 22:00:58
|
Revision: 1697 http://sourceforge.net/p/tcobrowser/code/1697 Author: amaxwell Date: 2013-10-29 22:00:56 +0000 (Tue, 29 Oct 2013) Log Message: ----------- revert change to config Modified Paths: -------------- trunk/bibdesk/BibDesk-Common.xcconfig trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj Modified: trunk/bibdesk/BibDesk-Common.xcconfig =================================================================== --- trunk/bibdesk/BibDesk-Common.xcconfig 2013-10-29 21:59:03 UTC (rev 1696) +++ trunk/bibdesk/BibDesk-Common.xcconfig 2013-10-29 22:00:56 UTC (rev 1697) @@ -1,4 +1,4 @@ -SDKROOT = macosx10.8 +SDKROOT = macosx DEBUG_INFORMATION_FORMAT = dwarf-with-dsym MACOSX_DEPLOYMENT_TARGET = 10.7 COPY_PHASE_STRIP = YES Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-10-29 21:59:03 UTC (rev 1696) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-10-29 22:00:56 UTC (rev 1697) @@ -722,6 +722,20 @@ remoteGlobalIDString = 8D57630D048677EA00EA77CD; remoteInfo = BibImporter; }; + F9F07A7A1820675400E74F1F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F9AA02F3092FA2CA0094A059 /* OmniFoundation.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 344D562417BD47110049F9E5; + remoteInfo = OFNetStateNotifierTest; + }; + F9F07A7C1820675400E74F1F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F9AA02F3092FA2CA0094A059 /* OmniFoundation.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 342691D317C578F600B1372F; + remoteInfo = OFNetStateNotifier; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -2362,6 +2376,8 @@ F974E6EC11F8C697006E7029 /* OFRandomRepeatTest */, F920351317F0BEE400796A10 /* OFXMLParsingTest */, F920351517F0BEE400796A10 /* OFXMLIdHash */, + F9F07A7B1820675400E74F1F /* OFNetStateNotifierTest */, + F9F07A7D1820675400E74F1F /* OFNetStateNotifier.app */, ); name = Products; sourceTree = "<group>"; @@ -2806,6 +2822,20 @@ remoteRef = F9C7E5940BEA3C9400D65C7F /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + F9F07A7B1820675400E74F1F /* OFNetStateNotifierTest */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = OFNetStateNotifierTest; + remoteRef = F9F07A7A1820675400E74F1F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F9F07A7D1820675400E74F1F /* OFNetStateNotifier.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = OFNetStateNotifier.app; + remoteRef = F9F07A7C1820675400E74F1F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-29 21:59:06
|
Revision: 1696 http://sourceforge.net/p/tcobrowser/code/1696 Author: amaxwell Date: 2013-10-29 21:59:03 +0000 (Tue, 29 Oct 2013) Log Message: ----------- load nib using 10.8 and later method Modified Paths: -------------- trunk/bibdesk/BibDesk-Common.xcconfig trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.h trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.m Modified: trunk/bibdesk/BibDesk-Common.xcconfig =================================================================== --- trunk/bibdesk/BibDesk-Common.xcconfig 2013-10-29 21:38:58 UTC (rev 1695) +++ trunk/bibdesk/BibDesk-Common.xcconfig 2013-10-29 21:59:03 UTC (rev 1696) @@ -1,4 +1,4 @@ -SDKROOT = macosx +SDKROOT = macosx10.8 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym MACOSX_DEPLOYMENT_TARGET = 10.7 COPY_PHASE_STRIP = YES Modified: trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.h =================================================================== --- trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.h 2013-10-29 21:38:58 UTC (rev 1695) +++ trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.h 2013-10-29 21:59:03 UTC (rev 1696) @@ -44,6 +44,7 @@ IBOutlet BDSKClearView *clearView; NSMutableArray *values; NSDateFormatter *dateFormatter; + NSArray *topLevelObjects; } + (NSBitmapImageRep *)imageRepWithMetadataItem:(id)anItem; Modified: trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.m =================================================================== --- trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.m 2013-10-29 21:38:58 UTC (rev 1695) +++ trunk/bibdesk/QuickLook-BibDesk/BDSKSpotlightIconController.m 2013-10-29 21:59:03 UTC (rev 1696) @@ -65,7 +65,8 @@ self = [super init]; if (self) { // manually load the nib, since +[NSBundle loadNibName...] won't work - BOOL loaded = [BDSKGetQLMainBundle() loadNibFile:[self windowNibName] externalNameTable:[NSDictionary dictionaryWithObject:self forKey:@"NSOwner"] withZone:[self zone]]; + BOOL loaded = [BDSKGetQLMainBundle() loadNibNamed:[self windowNibName] owner:self topLevelObjects:&topLevelObjects]; + [topLevelObjects retain]; if (loaded) { values = [[NSMutableArray alloc] initWithCapacity:16]; dateFormatter = [[NSDateFormatter alloc] init]; @@ -80,6 +81,7 @@ - (void)dealloc { + [topLevelObjects release]; [values release]; [dateFormatter release]; [super dealloc]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-29 21:39:01
|
Revision: 1695 http://sourceforge.net/p/tcobrowser/code/1695 Author: amaxwell Date: 2013-10-29 21:38:58 +0000 (Tue, 29 Oct 2013) Log Message: ----------- avoid notification queue, as it was delaying selection and keeping it from being restored at launch Modified Paths: -------------- trunk/bibdesk/BibDocument_GroupDataSource.m Modified: trunk/bibdesk/BibDocument_GroupDataSource.m =================================================================== --- trunk/bibdesk/BibDocument_GroupDataSource.m 2013-10-29 21:38:12 UTC (rev 1694) +++ trunk/bibdesk/BibDocument_GroupDataSource.m 2013-10-29 21:38:58 UTC (rev 1695) @@ -232,7 +232,7 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)notification; { NSNotification *note = [NSNotification notificationWithName:BDSKGroupTableSelectionChangedNotification object:self]; - [[NSNotificationQueue defaultQueue] enqueueNotification:note postingStyle:NSPostWhenIdle coalesceMask:NSNotificationCoalescingOnName forModes:nil]; + [[NSNotificationCenter defaultCenter] postNotification:note]; docState.didImport = NO; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-29 21:38:16
|
Revision: 1694 http://sourceforge.net/p/tcobrowser/code/1694 Author: amaxwell Date: 2013-10-29 21:38:12 +0000 (Tue, 29 Oct 2013) Log Message: ----------- compatibility with new OmniAppKit Modified Paths: -------------- trunk/bibdesk/BDSKTextViewFindController.m Modified: trunk/bibdesk/BDSKTextViewFindController.m =================================================================== --- trunk/bibdesk/BDSKTextViewFindController.m 2013-10-29 21:37:47 UTC (rev 1693) +++ trunk/bibdesk/BDSKTextViewFindController.m 2013-10-29 21:38:12 UTC (rev 1694) @@ -47,14 +47,13 @@ static NSString *BDSKTextViewFindPanelTitle = @"Find"; @interface BDSKTextViewFindController (Private) -- (void)loadInterface; - (id <OAFindPattern>)currentPatternWithBackwardsFlag:(BOOL)backwardsFlag; @end @implementation BDSKTextViewFindController - (id)init { - if (self = [super init]) { + if (self = [super initWithWindowNibName:@"BDSKTextViewFindPanel.nib"]) { findFieldEditor = nil; } return self; @@ -143,13 +142,11 @@ @implementation BDSKTextViewFindController (Private) // overwrite of private OAFindController methods, load our interface instead -- (void)loadInterface; +- (void)windowDidLoad; { - [[NSBundle mainBundle] loadNibNamed:@"BDSKTextViewFindPanel.nib" owner:self]; - [[self replaceInSelectionCheckbox] retain]; [[self window] setFrameUsingName:BDSKTextViewFindPanelTitle]; [[self window] setFrameAutosaveName:BDSKTextViewFindPanelTitle]; - [self findTypeChanged:self]; + [super windowDidLoad]; } - (id <OAFindPattern>)currentPatternWithBackwardsFlag:(BOOL)backwardsFlag; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-29 21:37:49
|
Revision: 1693 http://sourceforge.net/p/tcobrowser/code/1693 Author: amaxwell Date: 2013-10-29 21:37:47 +0000 (Tue, 29 Oct 2013) Log Message: ----------- remove method now in AppKit Modified Paths: -------------- trunk/bibdesk/NSArray_BDSKExtensions.h trunk/bibdesk/NSArray_BDSKExtensions.m Modified: trunk/bibdesk/NSArray_BDSKExtensions.h =================================================================== --- trunk/bibdesk/NSArray_BDSKExtensions.h 2013-10-28 03:28:49 UTC (rev 1692) +++ trunk/bibdesk/NSArray_BDSKExtensions.h 2013-10-29 21:37:47 UTC (rev 1693) @@ -41,8 +41,6 @@ @interface NSArray (BDSKExtensions) -- (id)firstObject; - - (NSIndexSet *)indexesOfObjects:(NSArray *)objects; - (NSIndexSet *)indexesOfObjectsIdenticalTo:(NSArray *)objects; - (NSArray *)objectsAtIndexSpecifiers:(NSArray *)indexes; Modified: trunk/bibdesk/NSArray_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSArray_BDSKExtensions.m 2013-10-28 03:28:49 UTC (rev 1692) +++ trunk/bibdesk/NSArray_BDSKExtensions.m 2013-10-29 21:37:47 UTC (rev 1693) @@ -42,11 +42,6 @@ @implementation NSArray (BDSKExtensions) -- (id)firstObject; -{ - return [self count] ? [self objectAtIndex:0] : nil; -} - - (NSArray *)objectsAtIndexSpecifiers:(NSArray *)indexes; { NSMutableArray *array = [NSMutableArray array]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ama...@us...> - 2013-10-28 03:28:52
|
Revision: 1692 http://sourceforge.net/p/tcobrowser/code/1692 Author: amaxwell Date: 2013-10-28 03:28:49 +0000 (Mon, 28 Oct 2013) Log Message: ----------- more fixes for latest Xcode compatibility Modified Paths: -------------- trunk/bibdesk/BDSKSearchBookmarkController.m trunk/bibdesk/BDSKSearchGroup.m trunk/bibdesk/BDSKTextViewFindController.m trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj Modified: trunk/bibdesk/BDSKSearchBookmarkController.m =================================================================== --- trunk/bibdesk/BDSKSearchBookmarkController.m 2013-10-28 03:27:19 UTC (rev 1691) +++ trunk/bibdesk/BDSKSearchBookmarkController.m 2013-10-28 03:28:49 UTC (rev 1692) @@ -581,7 +581,7 @@ } - (NSDictionary *)dictionaryValue { - NSMutableDictionary *dictionary = nil; + NSDictionary *dictionary = nil; if (bookmarkType == BDSKSearchBookmarkTypeFolder) { dictionary = [NSDictionary dictionaryWithObjectsAndKeys:BDSKSearchBookmarkTypeFolderString, BOOKMARK_TYPE_KEY, [children valueForKey:@"dictionaryValue"], CHILDREN_KEY, label, LABEL_KEY, nil]; } else if (bookmarkType == BDSKSearchBookmarkTypeSeparator) { Modified: trunk/bibdesk/BDSKSearchGroup.m =================================================================== --- trunk/bibdesk/BDSKSearchGroup.m 2013-10-28 03:27:19 UTC (rev 1691) +++ trunk/bibdesk/BDSKSearchGroup.m 2013-10-28 03:28:49 UTC (rev 1692) @@ -57,12 +57,12 @@ - (id)initWithType:(NSString *)typeName name:(NSString *)aName; { - return [self initWithType:typeName serverInfo:[NSDictionary dictionaryWithObject:aName forKey:@"database"] searchTerm:nil]; + return [self initWithType:typeName serverInfo:(id)[NSDictionary dictionaryWithObject:aName forKey:@"database"] searchTerm:nil]; } - (id)initWithName:(NSString *)aName; { - return [self initWithType:BDSKSearchGroupEntrez serverInfo:[NSDictionary dictionaryWithObject:aName forKey:@"database"] searchTerm:nil]; + return [self initWithType:BDSKSearchGroupEntrez serverInfo:(id)[NSDictionary dictionaryWithObject:aName forKey:@"database"] searchTerm:nil]; } - (id)initWithType:(NSString *)aType serverInfo:(BDSKServerInfo *)info searchTerm:(NSString *)string; Modified: trunk/bibdesk/BDSKTextViewFindController.m =================================================================== --- trunk/bibdesk/BDSKTextViewFindController.m 2013-10-28 03:27:19 UTC (rev 1691) +++ trunk/bibdesk/BDSKTextViewFindController.m 2013-10-28 03:28:49 UTC (rev 1692) @@ -156,23 +156,27 @@ { id <OAFindPattern> pattern; NSString *findString; - - if ([[self window] isVisible]) + + if ([self isWindowLoaded] && [self.window isVisible]) { findString = [[[self searchTextForm] cellAtIndex:0] stringValue]; - else + [self saveFindText:findString]; + } else findString = [self restoreFindText]; - [self saveFindText:findString]; - + if (![findString length]) return nil; - - if ([[findTypePopUp selectedItem] tag] == 0) { + + [self window]; // Load interface if needed + if ([[[self findTypeMatrix] selectedCell] tag] == 0) { pattern = [[OAFindPattern alloc] initWithString:findString ignoreCase:[[self ignoreCaseButton] state] wholeWord:[[self wholeWordButton] state] backwards:backwardsFlag]; } else { - pattern = [[BDSKRegExFindPattern alloc] initWithString:findString ignoreCase:[[self ignoreCaseButton] state] backwards:backwardsFlag]; + [self controlTextDidEndEditing:nil]; // make sure the _captureGroupPopUp is set correctly + NSInteger captureGroup = [[self captureGroupPopUp] indexOfSelectedItem] - 1; + pattern = [[OARegExFindPattern alloc] initWithPattern:findString selectedCaptureGroup:captureGroup backwards:backwardsFlag]; } - [self setCurrentPattern:pattern]; + [_currentPattern release]; + _currentPattern = pattern; return pattern; } Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj =================================================================== --- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-10-28 03:27:19 UTC (rev 1691) +++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2013-10-28 03:28:49 UTC (rev 1692) @@ -3025,7 +3025,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/usr/bin/codesign -f -s \"TeX Live Utility Signing Certificate\" \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\""; + shellScript = "/usr/bin/codesign --deep -f -s \"TeX Live Utility Signing Certificate\" \"${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}\""; }; F9E0B071083E450C000109C6 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |