diff options
| author | rowanbeentje <rowan@beent.je> | 2013-05-21 22:53:10 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2013-05-21 22:53:10 +0000 |
| commit | 2737ac00c38513d976fda08104a5014221b0c99c (patch) | |
| tree | 38829f7d5d9982b9648259cae0a269ef1640dd18 | |
| parent | 9432986de1d25527b133715ab12a8dffc2c5f6b6 (diff) | |
| download | sequelpro-2737ac00c38513d976fda08104a5014221b0c99c.tar.gz sequelpro-2737ac00c38513d976fda08104a5014221b0c99c.tar.bz2 sequelpro-2737ac00c38513d976fda08104a5014221b0c99c.zip | |
- Fix all the Xcode 4.6.2 build warnings, and tweak warning settings to enable some more
66 files changed, 529 insertions, 2144 deletions
diff --git a/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h b/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h index b513865e..8c81207f 100644 --- a/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h +++ b/Frameworks/PSMTabBar/PSMOverflowPopUpButton.h @@ -26,8 +26,6 @@ - (void)notificationReceived:(NSNotification *)notification; // Animations -- (void)setAnimatingAlternateImage:(BOOL)flag; -- (BOOL)animatingAlternateImage; - (void)animateStep:(NSTimer *)timer; // archiving diff --git a/Frameworks/PSMTabBar/PSMTabBarCell.m b/Frameworks/PSMTabBar/PSMTabBarCell.m index 809d9061..94b22021 100644 --- a/Frameworks/PSMTabBar/PSMTabBarCell.m +++ b/Frameworks/PSMTabBar/PSMTabBarCell.m @@ -153,7 +153,7 @@ - (NSAttributedString *)attributedStringValue { - return [(id <PSMTabStyle>)[_controlView style] attributedStringValueForTabCell:self]; + return [[(PSMTabBarControl *)_controlView style] attributedStringValueForTabCell:self]; } - (NSInteger)tabState @@ -323,22 +323,22 @@ - (NSRect)indicatorRectForFrame:(NSRect)cellFrame { - return [(id <PSMTabStyle>)[_controlView style] indicatorRectForTabCell:self]; + return [[(PSMTabBarControl *)_controlView style] indicatorRectForTabCell:self]; } - (NSRect)closeButtonRectForFrame:(NSRect)cellFrame { - return [(id <PSMTabStyle>)[_controlView style] closeButtonRectForTabCell:self withFrame:cellFrame]; + return [[(PSMTabBarControl *)_controlView style] closeButtonRectForTabCell:self withFrame:cellFrame]; } - (CGFloat)minimumWidthOfCell { - return [(id <PSMTabStyle>)[_controlView style] minimumWidthOfTabCell:self]; + return [[(PSMTabBarControl *)_controlView style] minimumWidthOfTabCell:self]; } - (CGFloat)desiredWidthOfCell { - return [(id <PSMTabStyle>)[_controlView style] desiredWidthOfTabCell:self]; + return [[(PSMTabBarControl *)_controlView style] desiredWidthOfTabCell:self]; } #pragma mark - @@ -354,7 +354,7 @@ return; } - [(id <PSMTabStyle>)[_controlView style] drawTabCell:self]; + [[(PSMTabBarControl *)_controlView style] drawTabCell:self]; } #pragma mark - diff --git a/Frameworks/PSMTabBar/PSMTabBarControl.m b/Frameworks/PSMTabBar/PSMTabBarControl.m index 6a062efe..ffac0255 100644 --- a/Frameworks/PSMTabBar/PSMTabBarControl.m +++ b/Frameworks/PSMTabBar/PSMTabBarControl.m @@ -363,22 +363,23 @@ { id <PSMTabStyle> newStyle; - if ([name isEqualToString:@"Aqua"]) { - //newStyle = [[PSMAquaTabStyle alloc] init]; +/* if ([name isEqualToString:@"Aqua"]) { + newStyle = [[PSMAquaTabStyle alloc] init]; } else if ([name isEqualToString:@"Unified"]) { - //newStyle = [[PSMUnifiedTabStyle alloc] init]; + newStyle = [[PSMUnifiedTabStyle alloc] init]; } else if ([name isEqualToString:@"Adium"]) { - //newStyle = [[PSMAdiumTabStyle alloc] init]; + newStyle = [[PSMAdiumTabStyle alloc] init]; } else if ([name isEqualToString:@"Card"]) { - //newStyle = [[PSMCardTabStyle alloc] init]; + newStyle = [[PSMCardTabStyle alloc] init]; } else if ([name isEqualToString:@"Metal"]) { - //newStyle = [[PSMMetalTabStyle alloc] init]; + newStyle = [[PSMMetalTabStyle alloc] init]; - } else if ([name isEqualToString:@"SequelPro"]) { + } else */ + if ([name isEqualToString:@"SequelPro"]) { newStyle = [[PSMSequelProTabStyle alloc] init]; } else { diff --git a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj index 2a635675..8860f175 100644 --- a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj +++ b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj @@ -358,7 +358,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0460; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "QueryKit" */; compatibilityVersion = "Xcode 3.2"; @@ -455,11 +455,16 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/QueryKit-Prefix.pch"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; @@ -679,12 +684,17 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH_ACTUAL)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/QueryKit-Prefix.pch"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; @@ -699,11 +709,16 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/QueryKit-Prefix.pch"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; diff --git a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj index 1644f7d5..ad34eef8 100644 --- a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj +++ b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj @@ -435,7 +435,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0460; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "SPMySQLFramework" */; compatibilityVersion = "Xcode 3.2"; @@ -565,11 +565,16 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH_ACTUAL)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; @@ -593,10 +598,15 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; @@ -619,10 +629,15 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQL Private APIs.h b/Frameworks/SPMySQLFramework/Source/SPMySQL Private APIs.h index c3c57e3f..50d40eac 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQL Private APIs.h +++ b/Frameworks/SPMySQLFramework/Source/SPMySQL Private APIs.h @@ -112,4 +112,4 @@ static inline id SPMySQLResultGetObject(SPMySQLResult* self, char* bytes, NSUInt if (!cachedMethodPointer) cachedMethodPointer = (SPMySQLResultGetObjectMethodPtr)[self methodForSelector:cachedSelector]; return cachedMethodPointer(self, cachedSelector, bytes, length, fieldType, fieldIndex); -}
\ No newline at end of file +} diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Conversion.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Conversion.m index 0a3cf99b..aa9a228b 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Conversion.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Conversion.m @@ -94,4 +94,4 @@ return [NSString stringWithCString:cString encoding:stringEncoding]; } -@end
\ No newline at end of file +@end diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m index 2065c998..2d19b872 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Databases & Tables.m @@ -256,4 +256,4 @@ return YES; } -@end
\ No newline at end of file +@end diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m index f2b5fc48..38eb104f 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m @@ -412,4 +412,4 @@ NSLog(@"SPMySQL Framework was asked for the MySQL charset for the string encoding '%llu', which is currently unhandled.", (unsigned long long)aStringEncoding); return nil; } -@end
\ No newline at end of file +@end diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m index c007a07e..f437ca87 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m @@ -673,4 +673,4 @@ } } -@end
\ No newline at end of file +@end diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Server Info.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Server Info.m index 59a384a9..2df42677 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Server Info.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Server Info.m @@ -176,4 +176,4 @@ return ![self queryErrored]; } -@end
\ No newline at end of file +@end diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLFramework_Prefix.pch b/Frameworks/SPMySQLFramework/Source/SPMySQLFramework_Prefix.pch index 8528c29c..470098b8 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLFramework_Prefix.pch +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLFramework_Prefix.pch @@ -8,4 +8,4 @@ #import "mysql.h" #import "SPMySQL.h" -#import "SPMySQLUtilities.h"
\ No newline at end of file +#import "SPMySQLUtilities.h" diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLResult Categories/Field Definitions.m b/Frameworks/SPMySQLFramework/Source/SPMySQLResult Categories/Field Definitions.m index 2db121bd..8617cdc3 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLResult Categories/Field Definitions.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLResult Categories/Field Definitions.m @@ -554,4 +554,4 @@ const SPMySQLResultCharset SPMySQLCharsetMap[] = } } -@end
\ No newline at end of file +@end diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLUtilities.h b/Frameworks/SPMySQLFramework/Source/SPMySQLUtilities.h index 0a8c19b0..6d2a28b9 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLUtilities.h +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLUtilities.h @@ -42,4 +42,4 @@ static double _elapsedSecondsSinceAbsoluteTime(uint64_t comparisonTime) Nanoseconds elapsedTime = AbsoluteToNanoseconds(*(AbsoluteTime *)&(elapsedTime_t)); return (((double)UnsignedWideToUInt64(elapsedTime)) * 1e-9); -}
\ No newline at end of file +} diff --git a/Interfaces/English.lproj/AboutPanel.xib b/Interfaces/English.lproj/AboutPanel.xib index 013f78ec..246c0a8d 100644 --- a/Interfaces/English.lproj/AboutPanel.xib +++ b/Interfaces/English.lproj/AboutPanel.xib @@ -1,18 +1,29 @@ <?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">10K549</string> - <string key="IBDocument.InterfaceBuilderVersion">851</string> - <string key="IBDocument.AppKitVersion">1038.36</string> - <string key="IBDocument.HIToolboxVersion">461.00</string> + <int key="IBDocument.SystemTarget">1060</int> + <string key="IBDocument.SystemVersion">12D78</string> + <string key="IBDocument.InterfaceBuilderVersion">3084</string> + <string key="IBDocument.AppKitVersion">1187.37</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">851</string> + <string key="NS.object.0">3084</string> </object> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="10"/> + <string>NSButton</string> + <string>NSButtonCell</string> + <string>NSCustomObject</string> + <string>NSImageCell</string> + <string>NSImageView</string> + <string>NSScrollView</string> + <string>NSScroller</string> + <string>NSTextField</string> + <string>NSTextFieldCell</string> + <string>NSTextView</string> + <string>NSView</string> + <string>NSWindowTemplate</string> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -43,10 +54,10 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="1050049484"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -80,9 +91,8 @@ <string>NeXT TIFF v4.0 pasteboard type</string> </object> </object> - <string key="NSFrameSize">{262, 14}</string> + <string key="NSFrameSize">{262, 239}</string> <reference key="NSSuperview" ref="364361801"/> - <reference key="NSWindow"/> <object class="NSTextContainer" key="NSTextContainer" id="384294599"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> @@ -95,7 +105,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="384294599"/> </object> - <int key="NSLMFlags">6</int> + <int key="NSLMFlags">38</int> <nil key="NSDelegate"/> </object> <reference key="NSTextView" ref="339500391"/> @@ -103,7 +113,7 @@ <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">2309</int> + <int key="NSFlags">67111173</int> <int key="NSTextCheckingTypes">0</int> <nil key="NSMarkedAttributes"/> <object class="NSColor" key="NSBackgroundColor" id="707775022"> @@ -117,7 +127,7 @@ <string>NSBackgroundColor</string> <string>NSColor</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSColor" id="42502212"> <int key="NSColorSpace">6</int> @@ -125,7 +135,7 @@ <string key="NSColorName">selectedTextBackgroundColor</string> <object class="NSColor" key="NSColor" id="744387868"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" id="438966767"> @@ -148,7 +158,7 @@ <string>NSCursor</string> <string>NSUnderline</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSColor" id="730743561"> <int key="NSColorSpace">1</int> @@ -162,22 +172,39 @@ </object> </object> <nil key="NSDefaultParagraphStyle"/> + <nil key="NSTextFinder"/> + <int key="NSPreferredTextFinderStyle">0</int> </object> <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{537, 1e+07}</string> - <string key="NSMinize">{262, 0}</string> + <string key="NSMaxSize">{537, 10000000}</string> <nil key="NSDelegate"/> </object> </object> <string key="NSFrame">{{1, 1}, {262, 239}}</string> <reference key="NSSuperview" ref="380936327"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="339500391"/> <reference key="NSDocView" ref="339500391"/> <reference key="NSBGColor" ref="707775022"/> <object class="NSCursor" key="NSCursor" id="359847792"> - <string key="NSHotSpot">{4, -5}</string> - <int key="NSCursorType">1</int> + <string key="NSHotSpot">{4, 5}</string> + <object class="NSImage" key="NSImage"> + <int key="NSImageFlags">79691776</int> + <object class="NSArray" key="NSReps"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="5"/> + <object class="NSURL"> + <nil key="NS.base"/> + <string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string> + </object> + </object> + </object> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> + </object> </object> <int key="NScvFlags">4</int> </object> @@ -186,7 +213,7 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{263, 1}, {11, 239}}</string> <reference key="NSSuperview" ref="380936327"/> - <reference key="NSWindow"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="380936327"/> <string key="NSAction">_doScroller:</string> @@ -197,7 +224,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> <reference key="NSSuperview" ref="380936327"/> - <reference key="NSWindow"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="380936327"/> <string key="NSAction">_doScroller:</string> @@ -207,22 +234,23 @@ </object> <string key="NSFrame">{{207, 20}, {275, 241}}</string> <reference key="NSSuperview" ref="1050049484"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="364361801"/> - <int key="NSsFlags">18</int> + <int key="NSsFlags">133138</int> <reference key="NSVScroller" ref="149906670"/> <reference key="NSHScroller" ref="824050607"/> <reference key="NSContentView" ref="364361801"/> + <double key="NSMinMagnification">0.25</double> + <double key="NSMaxMagnification">4</double> + <double key="NSMagnification">1</double> </object> <object class="NSTextField" id="536817638"> <reference key="NSNextResponder" ref="1050049484"/> <int key="NSvFlags">256</int> <string key="NSFrame">{{8, 74}, {191, 22}}</string> <reference key="NSSuperview" ref="1050049484"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="530496386"> - <int key="NSCellFlags">-2079195584</int> + <int key="NSCellFlags">-2079326144</int> <int key="NSCellFlags2">138413056</int> <string key="NSContents">Sequel Pro</string> <object class="NSFont" key="NSSupport"> @@ -244,16 +272,16 @@ <reference key="NSColor" ref="99130919"/> </object> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSButton" id="104294750"> <reference key="NSNextResponder" ref="1050049484"/> <int key="NSvFlags">256</int> <string key="NSFrame">{{23, 12}, {161, 32}}</string> <reference key="NSSuperview" ref="1050049484"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="631472894"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">License</string> <object class="NSFont" key="NSSupport" id="938980022"> @@ -262,7 +290,7 @@ <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="104294750"/> - <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">1</int> <reference key="NSAlternateImage" ref="938980022"/> <string key="NSAlternateContents"/> @@ -272,6 +300,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSImageView" id="303754159"> <reference key="NSNextResponder" ref="1050049484"/> @@ -290,10 +319,9 @@ </object> <string key="NSFrame">{{29, 104}, {149, 157}}</string> <reference key="NSSuperview" ref="1050049484"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="402884078"> - <int key="NSCellFlags">130560</int> + <int key="NSCellFlags">134217728</int> <int key="NSCellFlags2">33554432</int> <object class="NSCustomResource" key="NSContents"> <string key="NSClassName">NSImage</string> @@ -304,6 +332,7 @@ <int key="NSStyle">0</int> <bool key="NSAnimates">NO</bool> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSEditable">YES</bool> </object> <object class="NSTextField" id="626585761"> @@ -311,10 +340,9 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{8, 52}, {191, 14}}</string> <reference key="NSSuperview" ref="1050049484"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="265504093"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">138548224</int> <string key="NSContents">Build Version</string> <object class="NSFont" key="NSSupport"> @@ -336,15 +364,15 @@ <reference key="NSColor" ref="99130919"/> </object> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </object> <string key="NSFrameSize">{502, 281}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> </object> <object class="NSWindowTemplate" id="247179294"> <int key="NSWindowStyleMask">3</int> @@ -356,7 +384,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="313369514"> <reference key="NSNextResponder"/> @@ -376,7 +404,7 @@ <object class="NSTextView" id="847093707"> <reference key="NSNextResponder" ref="163536199"/> <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{416, 14}</string> + <string key="NSFrameSize">{427, 350}</string> <reference key="NSSuperview" ref="163536199"/> <object class="NSTextContainer" key="NSTextContainer" id="867783966"> <object class="NSLayoutManager" key="NSLayoutManager"> @@ -390,15 +418,15 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="867783966"/> </object> - <int key="NSLMFlags">6</int> + <int key="NSLMFlags">38</int> <nil key="NSDelegate"/> </object> <reference key="NSTextView" ref="847093707"/> - <double key="NSWidth">416</double> + <double key="NSWidth">427</double> <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">2305</int> + <int key="NSFlags">67111169</int> <int key="NSTextCheckingTypes">0</int> <nil key="NSMarkedAttributes"/> <reference key="NSBackgroundColor" ref="707775022"/> @@ -409,7 +437,7 @@ <string>NSBackgroundColor</string> <string>NSColor</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="42502212"/> <reference ref="438966767"/> @@ -424,7 +452,7 @@ <string>NSCursor</string> <string>NSUnderline</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="730743561"/> <reference ref="132121593"/> @@ -432,14 +460,15 @@ </object> </object> <nil key="NSDefaultParagraphStyle"/> + <nil key="NSTextFinder"/> + <int key="NSPreferredTextFinderStyle">0</int> </object> <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{941, 1e+07}</string> - <string key="NSMinize">{416, 0}</string> + <string key="NSMaxSize">{941, 10000000}</string> <nil key="NSDelegate"/> </object> </object> - <string key="NSFrame">{{1, 1}, {416, 350}}</string> + <string key="NSFrame">{{1, 1}, {427, 350}}</string> <reference key="NSSuperview" ref="666028865"/> <reference key="NSNextKeyView" ref="847093707"/> <reference key="NSDocView" ref="847093707"/> @@ -450,8 +479,9 @@ <object class="NSScroller" id="375665090"> <reference key="NSNextResponder" ref="666028865"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{417, 1}, {11, 350}}</string> + <string key="NSFrame">{{414, 1}, {14, 350}}</string> <reference key="NSSuperview" ref="666028865"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="666028865"/> <string key="NSAction">_doScroller:</string> @@ -462,6 +492,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> <reference key="NSSuperview" ref="666028865"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="666028865"/> <string key="NSAction">_doScroller:</string> @@ -472,10 +503,13 @@ <string key="NSFrame">{{20, 60}, {429, 352}}</string> <reference key="NSSuperview" ref="313369514"/> <reference key="NSNextKeyView" ref="163536199"/> - <int key="NSsFlags">18</int> + <int key="NSsFlags">133138</int> <reference key="NSVScroller" ref="375665090"/> <reference key="NSHScroller" ref="569771990"/> <reference key="NSContentView" ref="163536199"/> + <double key="NSMinMagnification">0.25</double> + <double key="NSMaxMagnification">4</double> + <double key="NSMagnification">1</double> </object> <object class="NSButton" id="270873633"> <reference key="NSNextResponder" ref="313369514"/> @@ -484,12 +518,12 @@ <reference key="NSSuperview" ref="313369514"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="190996995"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">OK</string> <reference key="NSSupport" ref="938980022"/> <reference key="NSControlView" ref="270873633"/> - <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">1</int> <reference key="NSAlternateImage" ref="938980022"/> <string key="NSAlternateContents"/> @@ -497,6 +531,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </object> <string key="NSFrameSize">{469, 432}</string> @@ -504,7 +539,8 @@ </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -560,14 +596,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="1013136181"/> - <reference key="destination" ref="1001"/> - </object> - <int key="connectionID">55</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">appLicensePanel</string> <reference key="source" ref="1001"/> <reference key="destination" ref="247179294"/> @@ -582,6 +610,14 @@ </object> <int key="connectionID">57</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="1013136181"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">55</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -783,75 +819,54 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>-1.IBPluginDependency</string> + <string>-2.IBPluginDependency</string> <string>-3.IBPluginDependency</string> <string>10.IBPluginDependency</string> - <string>10.ImportedFromIB2</string> <string>11.IBPluginDependency</string> <string>11.IBShouldRemoveOnLegacySave</string> <string>12.IBPluginDependency</string> <string>12.IBShouldRemoveOnLegacySave</string> <string>13.IBPluginDependency</string> - <string>13.ImportedFromIB2</string> <string>14.IBPluginDependency</string> <string>15.IBPluginDependency</string> - <string>15.ImportedFromIB2</string> <string>16.IBPluginDependency</string> - <string>16.ImportedFromIB2</string> <string>19.IBPluginDependency</string> - <string>19.ImportedFromIB2</string> <string>20.IBPluginDependency</string> - <string>20.ImportedFromIB2</string> <string>23.IBPluginDependency</string> <string>23.IBShouldRemoveOnLegacySave</string> <string>24.IBPluginDependency</string> <string>24.IBShouldRemoveOnLegacySave</string> <string>25.IBPluginDependency</string> - <string>25.ImportedFromIB2</string> <string>26.IBPluginDependency</string> <string>29.IBPluginDependency</string> <string>35.IBPluginDependency</string> <string>36.IBPluginDependency</string> <string>43.IBPluginDependency</string> <string>44.IBPluginDependency</string> - <string>6.IBEditorWindowLastContentRect</string> <string>6.IBPluginDependency</string> <string>6.IBWindowTemplateEditedContentRect</string> - <string>6.ImportedFromIB2</string> - <string>6.windowTemplate.hasMinSize</string> - <string>6.windowTemplate.minSize</string> - <string>7.IBEditorWindowLastContentRect</string> <string>7.IBPluginDependency</string> <string>7.IBWindowTemplateEditedContentRect</string> - <string>7.ImportedFromIB2</string> - <string>7.windowTemplate.hasMinSize</string> - <string>7.windowTemplate.minSize</string> <string>8.IBPluginDependency</string> - <string>8.ImportedFromIB2</string> <string>9.IBPluginDependency</string> - <string>9.ImportedFromIB2</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -862,38 +877,25 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{424, 433}, {502, 281}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{424, 433}, {502, 281}}</string> - <boolean value="YES"/> - <boolean value="YES"/> - <string>{213, 107}</string> - <string>{{438, 164}, {469, 432}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{438, 164}, {469, 432}}</string> - <boolean value="YES"/> - <boolean value="YES"/> - <string>{213, 107}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> </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> + <reference key="dict.values" ref="0"/> </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> + <reference key="dict.values" ref="0"/> </object> <nil key="sourceID"/> <int key="maxID">57</int> @@ -902,83 +904,6 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Frameworks/PSMTabBar/PSMTabDragAssistant.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">Source/SPMenuAdditions.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">Frameworks/PSMTabBar/PSMTabBarCell.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">Frameworks/PSMTabBar/PSMTabBarControl.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">Frameworks/PSMTabBar/PSMTabBarController.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">Source/SPContentFilterManager.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">Source/SPImageView.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">Source/SPMainThreadTrampoline.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">Source/SPNotLoaded.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">Source/SPObjectAdditions.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">Source/SPQueryFavoriteManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSTextView</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1001,7 +926,7 @@ <string>selectCurrentWord:</string> <string>selectEnclosingBrackets:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> @@ -1042,7 +967,7 @@ <string>selectCurrentWord:</string> <string>selectEnclosingBrackets:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBActionInfo"> <string key="name">doDecomposedStringWithCanonicalMapping:</string> @@ -1112,14 +1037,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPTextViewAdditions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPWindowAdditions.h</string> + <string key="minorKey">./Classes/NSTextView.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1132,7 +1050,7 @@ <string>closeApplicationLicenseSheet:</string> <string>openApplicationLicenseSheet:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> @@ -1145,7 +1063,7 @@ <string>closeApplicationLicenseSheet:</string> <string>openApplicationLicenseSheet:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBActionInfo"> <string key="name">closeApplicationLicenseSheet:</string> @@ -1167,7 +1085,7 @@ <string>appLicenseTextView</string> <string>appNameVersionTextField</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSTextField</string> <string>NSTextView</string> @@ -1186,7 +1104,7 @@ <string>appLicenseTextView</string> <string>appNameVersionTextField</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBToOneOutletInfo"> <string key="name">appBuildVersionTextField</string> @@ -1212,633 +1130,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPAboutController.h</string> - </object> - </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">NSActionCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="680400058"> - <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="153192860"> - <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="802320731"> - <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">NSButton</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButtonCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSCell</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="784693809"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.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">NSImageCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSImageView</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSImageView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="18429059"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.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="680400058"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="153192860"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="802320731"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="784693809"/> - </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="18429059"/> - </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"> - <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="355164667"> - <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">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">Foundation.framework/Headers/NSURLConnection.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/NSURLDownload.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">Growl.framework/Headers/GrowlApplicationBridge.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">Print.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">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">ShortcutRecorder.framework/Headers/SRRecorderCell.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">ShortcutRecorder.framework/Headers/SRRecorderControl.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">ShortcutRecorder.framework/Headers/SRValidator.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">Sparkle.framework/Headers/SUAppcast.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">Sparkle.framework/Headers/SUUpdater.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">NSPanel</string> - <string key="superclassName">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPanel.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">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">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">NSText</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSText.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextField</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextFieldCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextView</string> - <string key="superclassName">NSText</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextView.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/Headers/NSClipView.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/Headers/NSMenuItem.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/Headers/NSRulerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="355164667"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindowController</string> - <string key="superclassName">NSResponder</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showWindow:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <string key="NS.key.0">showWindow:</string> - <object class="IBActionInfo" key="NS.object.0"> - <string key="name">showWindow:</string> - <string key="candidateClassName">id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> + <string key="minorKey">./Classes/SPAboutController.h</string> </object> </object> </object> @@ -1847,14 +1139,13 @@ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <integer value="1050" key="NS.object.0"/> + <real value="1060" key="NS.object.0"/> </object> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> <integer value="3000" key="NS.object.0"/> </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <string key="NS.key.0">appIcon</string> diff --git a/Interfaces/English.lproj/ImportAccessory.xib b/Interfaces/English.lproj/ImportAccessory.xib index 29623e5f..02332074 100644 --- a/Interfaces/English.lproj/ImportAccessory.xib +++ b/Interfaces/English.lproj/ImportAccessory.xib @@ -1,19 +1,38 @@ <?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">10K549</string> - <string key="IBDocument.InterfaceBuilderVersion">851</string> - <string key="IBDocument.AppKitVersion">1038.36</string> - <string key="IBDocument.HIToolboxVersion">461.00</string> + <int key="IBDocument.SystemTarget">1060</int> + <string key="IBDocument.SystemVersion">12D78</string> + <string key="IBDocument.InterfaceBuilderVersion">3084</string> + <string key="IBDocument.AppKitVersion">1187.37</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">851</string> + <string key="NS.object.0">3084</string> </object> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="86"/> - <integer value="128"/> + <string>NSBox</string> + <string>NSButton</string> + <string>NSButtonCell</string> + <string>NSComboBox</string> + <string>NSComboBoxCell</string> + <string>NSCustomObject</string> + <string>NSCustomView</string> + <string>NSMenu</string> + <string>NSMenuItem</string> + <string>NSPopUpButton</string> + <string>NSPopUpButtonCell</string> + <string>NSScrollView</string> + <string>NSScroller</string> + <string>NSTabView</string> + <string>NSTabViewItem</string> + <string>NSTextField</string> + <string>NSTextFieldCell</string> + <string>NSTextView</string> + <string>NSUserDefaultsController</string> + <string>NSView</string> + <string>NSWindowTemplate</string> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -44,6 +63,8 @@ <int key="NSvFlags">10</int> <string key="NSFrame">{{-7, -9}, {464, 96}}</string> <reference key="NSSuperview" ref="768243701"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="838432414"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="773828405"> @@ -58,9 +79,11 @@ <int key="NSvFlags">264</int> <string key="NSFrame">{{28, 47}, {411, 18}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="980919427"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="382295631"> - <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags">-2080374784</int> <int key="NSCellFlags2">131072</int> <string key="NSContents">First line contains field names</string> <object class="NSFont" key="NSSupport" id="26"> @@ -69,7 +92,7 @@ <int key="NSfFlags">3100</int> </object> <reference key="NSControlView" ref="321311538"/> - <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags">1211912448</int> <int key="NSButtonFlags2">2</int> <object class="NSButtonImageSource" key="NSAlternateImage"> <string key="NSImageName">NSSwitch</string> @@ -79,15 +102,18 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSComboBox" id="455670945"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{175, -5}, {54, 22}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="381931944"/> <bool key="NSEnabled">YES</bool> <object class="NSComboBoxCell" key="NSCell" id="224560182"> - <int key="NSCellFlags">343014977</int> + <int key="NSCellFlags">342884417</int> <int key="NSCellFlags2">132352</int> <string key="NSContents">"</string> <reference key="NSSupport" ref="26"/> @@ -126,15 +152,16 @@ <reference key="NSSuperview"/> <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSControlAllowsExpansionToolTips">YES</bool> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn"> - <integer value="0" key="NSIdentifier"/> <double key="NSWidth">10</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> + <int key="NSCellFlags">75497472</int> <int key="NSCellFlags2">0</int> <object class="NSMutableString" key="NSContents"> <characters key="NS.bytes"/> @@ -151,7 +178,7 @@ <reference key="NSTextColor" ref="51181249"/> </object> <object class="NSTextFieldCell" key="NSDataCell"> - <int key="NSCellFlags">338820672</int> + <int key="NSCellFlags">338690112</int> <int key="NSCellFlags2">1024</int> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="865083096"/> @@ -195,17 +222,21 @@ <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> <int key="NSTableViewDraggingDestinationStyle">0</int> + <int key="NSTableViewGroupRowStyle">1</int> </object> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="88279563"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{8, 0}, {162, 14}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="455670945"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="206342718"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">71435264</int> <string key="NSContents">Fields enclosed by:</string> <reference key="NSSupport" ref="26"/> @@ -218,15 +249,18 @@ </object> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSComboBox" id="595983007"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">265</int> <string key="NSFrame">{{386, 20}, {54, 22}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="88279563"/> <bool key="NSEnabled">YES</bool> <object class="NSComboBoxCell" key="NSCell" id="762842881"> - <int key="NSCellFlags">343014977</int> + <int key="NSCellFlags">342884417</int> <int key="NSCellFlags2">132352</int> <string key="NSContents">\ or "</string> <reference key="NSSupport" ref="26"/> @@ -250,15 +284,16 @@ <reference key="NSSuperview"/> <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSControlAllowsExpansionToolTips">YES</bool> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn"> - <integer value="0" key="NSIdentifier"/> <double key="NSWidth">10</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> + <int key="NSCellFlags">75497472</int> <int key="NSCellFlags2">0</int> <object class="NSMutableString" key="NSContents"> <characters key="NS.bytes"/> @@ -271,7 +306,7 @@ <reference key="NSTextColor" ref="51181249"/> </object> <object class="NSTextFieldCell" key="NSDataCell"> - <int key="NSCellFlags">1412562496</int> + <int key="NSCellFlags">1412431936</int> <int key="NSCellFlags2">1024</int> <string key="NSContents">\ OR "</string> <reference key="NSSupport" ref="26"/> @@ -300,17 +335,21 @@ <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> <int key="NSTableViewDraggingDestinationStyle">0</int> + <int key="NSTableViewGroupRowStyle">1</int> </object> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="201675078"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">265</int> <string key="NSFrame">{{238, 25}, {143, 14}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="595983007"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="82042584"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">71435264</int> <string key="NSContents">Fields escaped by:</string> <reference key="NSSupport" ref="26"/> @@ -318,15 +357,18 @@ <reference key="NSBackgroundColor" ref="1043422119"/> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSComboBox" id="704974988"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">265</int> <string key="NSFrame">{{386, -5}, {54, 22}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="508807740"/> <bool key="NSEnabled">YES</bool> <object class="NSComboBoxCell" key="NSCell" id="658483425"> - <int key="NSCellFlags">343014977</int> + <int key="NSCellFlags">342884417</int> <int key="NSCellFlags2">132352</int> <string key="NSContents">\n</string> <reference key="NSSupport" ref="26"/> @@ -350,15 +392,16 @@ <reference key="NSSuperview"/> <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSControlAllowsExpansionToolTips">YES</bool> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn"> - <integer value="0" key="NSIdentifier"/> <double key="NSWidth">10</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> + <int key="NSCellFlags">75497472</int> <int key="NSCellFlags2">0</int> <object class="NSMutableString" key="NSContents"> <characters key="NS.bytes"/> @@ -371,7 +414,7 @@ <reference key="NSTextColor" ref="51181249"/> </object> <object class="NSTextFieldCell" key="NSDataCell"> - <int key="NSCellFlags">338820672</int> + <int key="NSCellFlags">338690112</int> <int key="NSCellFlags2">1024</int> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="201507233"/> @@ -399,17 +442,21 @@ <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> <int key="NSTableViewDraggingDestinationStyle">0</int> + <int key="NSTableViewGroupRowStyle">1</int> </object> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="381931944"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">265</int> <string key="NSFrame">{{238, 0}, {143, 14}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="704974988"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="391954730"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">71435264</int> <string key="NSContents">Lines terminated by:</string> <reference key="NSSupport" ref="26"/> @@ -417,15 +464,18 @@ <reference key="NSBackgroundColor" ref="1043422119"/> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSComboBox" id="557825428"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{175, 20}, {54, 22}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="201675078"/> <bool key="NSEnabled">YES</bool> <object class="NSComboBoxCell" key="NSCell" id="674293841"> - <int key="NSCellFlags">343014977</int> + <int key="NSCellFlags">342884417</int> <int key="NSCellFlags2">132352</int> <string key="NSContents">,</string> <reference key="NSSupport" ref="26"/> @@ -450,15 +500,16 @@ <reference key="NSSuperview"/> <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSControlAllowsExpansionToolTips">YES</bool> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn"> - <integer value="0" key="NSIdentifier"/> <double key="NSWidth">10</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> + <int key="NSCellFlags">75497472</int> <int key="NSCellFlags2">0</int> <object class="NSMutableString" key="NSContents"> <characters key="NS.bytes"/> @@ -471,7 +522,7 @@ <reference key="NSTextColor" ref="51181249"/> </object> <object class="NSTextFieldCell" key="NSDataCell"> - <int key="NSCellFlags">338820672</int> + <int key="NSCellFlags">338690112</int> <int key="NSCellFlags2">1024</int> <string key="NSContents">\t</string> <reference key="NSSupport" ref="26"/> @@ -500,17 +551,21 @@ <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> <int key="NSTableViewDraggingDestinationStyle">0</int> + <int key="NSTableViewGroupRowStyle">1</int> </object> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="980919427"> <reference key="NSNextResponder" ref="838432414"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{8, 25}, {162, 14}}</string> <reference key="NSSuperview" ref="838432414"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="557825428"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="556711750"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">71435264</int> <string key="NSContents">Fields terminated by:</string> <reference key="NSSupport" ref="26"/> @@ -518,10 +573,13 @@ <reference key="NSBackgroundColor" ref="1043422119"/> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </object> <string key="NSFrame">{{10, 7}, {444, 70}}</string> <reference key="NSSuperview" ref="350183787"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="321311538"/> </object> <string key="NSLabel">CSV</string> <reference key="NSColor" ref="1043422119"/> @@ -541,7 +599,7 @@ <reference key="NSSuperview" ref="553034867"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="412905362"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">71304192</int> <string key="NSContents">On SQL Error:</string> <object class="NSFont" key="NSSupport" id="857116476"> @@ -553,6 +611,7 @@ <reference key="NSBackgroundColor" ref="1043422119"/> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSPopUpButton" id="955051153"> <reference key="NSNextResponder" ref="553034867"/> @@ -561,11 +620,11 @@ <reference key="NSSuperview" ref="553034867"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="760622068"> - <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags">-2076180416</int> <int key="NSCellFlags2">2048</int> <reference key="NSSupport" ref="857116476"/> <reference key="NSControlView" ref="955051153"/> - <int key="NSButtonFlags">109199615</int> + <int key="NSButtonFlags">109199360</int> <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -615,6 +674,7 @@ <bool key="NSAltersState">YES</bool> <int key="NSArrowPosition">2</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </object> <string key="NSFrame">{{10, 7}, {444, 70}}</string> @@ -642,13 +702,15 @@ <int key="NSvFlags">264</int> <string key="NSFrame">{{208, 85}, {206, 26}}</string> <reference key="NSSuperview" ref="768243701"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="142158431"> - <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags">-2076180416</int> <int key="NSCellFlags2">2048</int> <reference key="NSSupport" ref="857116476"/> <reference key="NSControlView" ref="508807740"/> - <int key="NSButtonFlags">109199615</int> + <int key="NSButtonFlags">109199360</int> <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -679,15 +741,18 @@ <bool key="NSAltersState">YES</bool> <int key="NSArrowPosition">2</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="621426894"> <reference key="NSNextResponder" ref="768243701"/> <int key="NSvFlags">264</int> <string key="NSFrame">{{36, 91}, {170, 17}}</string> <reference key="NSSuperview" ref="768243701"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="350183787"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="7839352"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">71304192</int> <string key="NSContents">Encoding:</string> <reference key="NSSupport" ref="857116476"/> @@ -695,19 +760,22 @@ <reference key="NSBackgroundColor" ref="1043422119"/> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSPopUpButton" id="841218020"> <reference key="NSNextResponder" ref="768243701"/> <int key="NSvFlags">264</int> <string key="NSFrame">{{208, 113}, {206, 26}}</string> <reference key="NSSuperview" ref="768243701"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="621426894"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1032099677"> - <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags">-2076180416</int> <int key="NSCellFlags2">2048</int> <reference key="NSSupport" ref="857116476"/> <reference key="NSControlView" ref="841218020"/> - <int key="NSButtonFlags">109199615</int> + <int key="NSButtonFlags">109199360</int> <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -749,15 +817,18 @@ <bool key="NSAltersState">YES</bool> <int key="NSArrowPosition">2</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="640853005"> <reference key="NSNextResponder" ref="768243701"/> <int key="NSvFlags">264</int> <string key="NSFrame">{{36, 119}, {170, 17}}</string> <reference key="NSSuperview" ref="768243701"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="841218020"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="379355660"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">71304192</int> <string key="NSContents">Format:</string> <reference key="NSSupport" ref="857116476"/> @@ -765,10 +836,13 @@ <reference key="NSBackgroundColor" ref="1043422119"/> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </object> <string key="NSFrameSize">{450, 144}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="640853005"/> <object class="NSMutableString" key="NSClassName"> <characters key="NS.bytes">NSView</characters> </object> @@ -785,7 +859,7 @@ <string key="NSWindowTitle">Window</string> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMinSize">{500, 353}</string> <object class="NSView" key="NSWindowView" id="544284300"> <reference key="NSNextResponder"/> @@ -805,7 +879,7 @@ <object class="NSTextView" id="770071618"> <reference key="NSNextResponder" ref="51216656"/> <int key="NSvFlags">2322</int> - <string key="NSFrame">{{0, 54}, {500, 14}}</string> + <string key="NSFrameSize">{500, 178}</string> <reference key="NSSuperview" ref="51216656"/> <object class="NSTextContainer" key="NSTextContainer" id="243631584"> <object class="NSLayoutManager" key="NSLayoutManager"> @@ -819,7 +893,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="243631584"/> </object> - <int key="NSLMFlags">134</int> + <int key="NSLMFlags">166</int> <nil key="NSDelegate"/> </object> <reference key="NSTextView" ref="770071618"/> @@ -827,7 +901,7 @@ <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">2305</int> + <int key="NSFlags">67111169</int> <int key="NSTextCheckingTypes">0</int> <nil key="NSMarkedAttributes"/> <reference key="NSBackgroundColor" ref="51181249"/> @@ -838,7 +912,7 @@ <string>NSBackgroundColor</string> <string>NSColor</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSColor"> <int key="NSColorSpace">6</int> @@ -863,7 +937,7 @@ <string>NSCursor</string> <string>NSUnderline</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSColor"> <int key="NSColorSpace">1</int> @@ -877,10 +951,11 @@ </object> </object> <nil key="NSDefaultParagraphStyle"/> + <nil key="NSTextFinder"/> + <int key="NSPreferredTextFinderStyle">0</int> </object> <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{1002, 1e+07}</string> - <string key="NSMinize">{223, 0}</string> + <string key="NSMaxSize">{1002, 10000000}</string> <nil key="NSDelegate"/> </object> </object> @@ -890,8 +965,25 @@ <reference key="NSDocView" ref="770071618"/> <reference key="NSBGColor" ref="51181249"/> <object class="NSCursor" key="NSCursor"> - <string key="NSHotSpot">{4, -5}</string> - <int key="NSCursorType">1</int> + <string key="NSHotSpot">{4, 5}</string> + <object class="NSImage" key="NSImage"> + <int key="NSImageFlags">79691776</int> + <object class="NSArray" key="NSReps"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="5"/> + <object class="NSURL"> + <nil key="NS.base"/> + <string key="NS.relative">file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff</string> + </object> + </object> + </object> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> + </object> </object> <int key="NScvFlags">4</int> </object> @@ -900,6 +992,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{486, 1}, {15, 109}}</string> <reference key="NSSuperview" ref="622997883"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <reference key="NSTarget" ref="622997883"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.99248123168945312</double> @@ -909,6 +1002,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 110}, {485, 15}}</string> <reference key="NSSuperview" ref="622997883"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="622997883"/> <string key="NSAction">_doScroller:</string> @@ -919,10 +1013,13 @@ <string key="NSFrame">{{-1, 200}, {502, 180}}</string> <reference key="NSSuperview" ref="544284300"/> <reference key="NSNextKeyView" ref="51216656"/> - <int key="NSsFlags">562</int> + <int key="NSsFlags">133682</int> <reference key="NSVScroller" ref="177496810"/> <reference key="NSHScroller" ref="268141998"/> <reference key="NSContentView" ref="51216656"/> + <double key="NSMinMagnification">0.25</double> + <double key="NSMaxMagnification">4</double> + <double key="NSMagnification">1</double> </object> <object class="NSButton" id="762525145"> <reference key="NSNextResponder" ref="544284300"/> @@ -931,18 +1028,19 @@ <reference key="NSSuperview" ref="544284300"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="77256603"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Cancel</string> <reference key="NSSupport" ref="857116476"/> <reference key="NSControlView" ref="762525145"/> - <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSButton" id="660428801"> <reference key="NSNextResponder" ref="544284300"/> @@ -952,18 +1050,19 @@ <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="437878340"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Next</string> <reference key="NSSupport" ref="857116476"/> <reference key="NSControlView" ref="660428801"/> - <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">129</int> <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="NSBox" id="603820420"> <reference key="NSNextResponder" ref="544284300"/> @@ -991,7 +1090,7 @@ <reference key="NSSuperview" ref="544284300"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Box</string> <reference key="NSSupport" ref="26"/> @@ -1014,7 +1113,7 @@ <reference key="NSSuperview" ref="544284300"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="467652780"> - <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags">68157504</int> <int key="NSCellFlags2">138413056</int> <string key="NSContents">Import from Clipboard</string> <reference key="NSSupport" ref="857116476"/> @@ -1022,14 +1121,16 @@ <reference key="NSBackgroundColor" ref="1043422119"/> <reference key="NSTextColor" ref="107914506"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </object> <string key="NSFrameSize">{500, 412}</string> <reference key="NSSuperview"/> </object> - <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> + <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{500, 375}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -1092,38 +1193,6 @@ <int key="connectionID">38</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="321311538"/> - <reference key="destination" ref="557825428"/> - </object> - <int key="connectionID">53</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="557825428"/> - <reference key="destination" ref="595983007"/> - </object> - <int key="connectionID">54</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="595983007"/> - <reference key="destination" ref="455670945"/> - </object> - <int key="connectionID">55</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="455670945"/> - <reference key="destination" ref="704974988"/> - </object> - <int key="connectionID">56</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">closeSheet:</string> <reference key="source" ref="1001"/> @@ -1165,22 +1234,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="508807740"/> - <reference key="destination" ref="321311538"/> - </object> - <int key="connectionID">120</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="841218020"/> - <reference key="destination" ref="508807740"/> - </object> - <int key="connectionID">122</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">importEncodingPopup</string> <reference key="source" ref="1001"/> <reference key="destination" ref="508807740"/> @@ -1212,6 +1265,54 @@ <int key="connectionID">143</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="841218020"/> + <reference key="destination" ref="508807740"/> + </object> + <int key="connectionID">122</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="557825428"/> + <reference key="destination" ref="595983007"/> + </object> + <int key="connectionID">54</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="595983007"/> + <reference key="destination" ref="455670945"/> + </object> + <int key="connectionID">55</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="455670945"/> + <reference key="destination" ref="704974988"/> + </object> + <int key="connectionID">56</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="321311538"/> + <reference key="destination" ref="557825428"/> + </object> + <int key="connectionID">53</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="508807740"/> + <reference key="destination" ref="321311538"/> + </object> + <int key="connectionID">120</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">selectedTag: values.SQLImportErrorHandlingSelection</string> <reference key="source" ref="955051153"/> @@ -1229,7 +1330,7 @@ <string>NSNoSelectionPlaceholder</string> <string>NSNullPlaceholder</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <real value="0.0"/> <real value="0.0"/> @@ -1731,27 +1832,22 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>-1.IBPluginDependency</string> + <string>-2.IBPluginDependency</string> <string>-3.IBPluginDependency</string> - <string>1.IBEditorWindowLastContentRect</string> <string>1.IBPluginDependency</string> - <string>1.IBViewEditorWindowController.showingBoundsRectangles</string> - <string>1.ImportedFromIB2</string> <string>10.IBPluginDependency</string> - <string>10.ImportedFromIB2</string> <string>103.IBPluginDependency</string> <string>104.IBPluginDependency</string> <string>105.IBPluginDependency</string> <string>106.IBPluginDependency</string> <string>11.IBAttributePlaceholdersKey</string> <string>11.IBPluginDependency</string> - <string>11.ImportedFromIB2</string> <string>115.IBPluginDependency</string> <string>116.IBPluginDependency</string> - <string>117.IBEditorWindowLastContentRect</string> <string>117.IBPluginDependency</string> <string>119.IBPluginDependency</string> <string>12.IBPluginDependency</string> - <string>12.ImportedFromIB2</string> <string>124.IBAttributePlaceholdersKey</string> <string>124.IBPluginDependency</string> <string>125.IBPluginDependency</string> @@ -1759,12 +1855,10 @@ <string>127.IBPluginDependency</string> <string>128.IBPluginDependency</string> <string>13.IBPluginDependency</string> - <string>13.ImportedFromIB2</string> <string>131.IBPluginDependency</string> <string>132.IBPluginDependency</string> <string>133.IBPluginDependency</string> <string>134.IBPluginDependency</string> - <string>135.IBEditorWindowLastContentRect</string> <string>135.IBPluginDependency</string> <string>136.IBPluginDependency</string> <string>137.IBPluginDependency</string> @@ -1772,6 +1866,7 @@ <string>15.IBPluginDependency</string> <string>16.IBPluginDependency</string> <string>17.IBPluginDependency</string> + <string>18.IBComboBoxObjectValuesKey.objectValues</string> <string>18.IBPluginDependency</string> <string>19.IBPluginDependency</string> <string>2.IBPluginDependency</string> @@ -1780,36 +1875,26 @@ <string>22.IBPluginDependency</string> <string>23.IBPluginDependency</string> <string>24.IBPluginDependency</string> - <string>25.IBEditorWindowLastContentRect</string> <string>25.IBPluginDependency</string> <string>26.IBPluginDependency</string> <string>27.IBPluginDependency</string> <string>28.IBPluginDependency</string> <string>3.IBPluginDependency</string> <string>5.IBPluginDependency</string> - <string>5.ImportedFromIB2</string> <string>6.IBAttributePlaceholdersKey</string> <string>6.IBPluginDependency</string> - <string>6.ImportedFromIB2</string> <string>7.IBPluginDependency</string> - <string>7.ImportedFromIB2</string> <string>8.IBAttributePlaceholdersKey</string> <string>8.IBPluginDependency</string> - <string>8.ImportedFromIB2</string> - <string>85.IBEditorWindowLastContentRect</string> <string>85.IBPluginDependency</string> <string>85.IBWindowTemplateEditedContentRect</string> <string>85.NSWindowTemplate.visibleAtLaunch</string> - <string>85.windowTemplate.hasMinSize</string> - <string>85.windowTemplate.minSize</string> <string>86.IBPluginDependency</string> <string>88.IBPluginDependency</string> <string>89.IBPluginDependency</string> <string>9.IBAttributePlaceholdersKey</string> <string>9.IBPluginDependency</string> - <string>9.ImportedFromIB2</string> <string>90.IBPluginDependency</string> - <string>90.IBViewBoundsToFrameTransform</string> <string>91.IBPluginDependency</string> <string>92.IBPluginDependency</string> <string>93.IBPluginDependency</string> @@ -1818,15 +1903,13 @@ <string>96.IBPluginDependency</string> <string>97.IBPluginDependency</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{879, 867}, {450, 144}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1840,20 +1923,15 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{383, 415}, {116, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1861,12 +1939,10 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{723, 380}, {206, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1874,6 +1950,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>\ or "</string> + <string>\</string> + <string>"</string> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1882,14 +1964,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{811, 884}, {100, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -1899,9 +1979,7 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -1911,13 +1989,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{502, 399}, {500, 412}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{502, 399}, {500, 412}}</string> <boolean value="NO"/> - <boolean value="YES"/> - <string>{500, 353}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1930,11 +2004,7 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSAffineTransform"> - <bytes key="NSTransformStruct">P4AAAL+AAABDioAAwigAAA</bytes> - </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1947,17 +2017,13 @@ <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> + <reference key="dict.values" ref="0"/> </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> + <reference key="dict.values" ref="0"/> </object> <nil key="sourceID"/> <int key="maxID">145</int> @@ -1966,83 +2032,6 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Frameworks/PSMTabBar/PSMTabDragAssistant.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">Source/SPMenuAdditions.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">Frameworks/PSMTabBar/PSMTabBarCell.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">Frameworks/PSMTabBar/PSMTabBarControl.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">Frameworks/PSMTabBar/PSMTabBarController.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">Source/SPContentFilterManager.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">Source/SPImageView.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">Source/SPMainThreadTrampoline.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">Source/SPNotLoaded.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">Source/SPObjectAdditions.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">Source/SPQueryFavoriteManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSTextView</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2065,7 +2054,7 @@ <string>selectCurrentWord:</string> <string>selectEnclosingBrackets:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> @@ -2106,7 +2095,7 @@ <string>selectCurrentWord:</string> <string>selectEnclosingBrackets:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBActionInfo"> <string key="name">doDecomposedStringWithCanonicalMapping:</string> @@ -2176,14 +2165,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPTextViewAdditions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPWindowAdditions.h</string> + <string key="minorKey">./Classes/NSTextView.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -2196,14 +2178,12 @@ <string>cancelProgressBar:</string> <string>changeFormat:</string> <string>closeSheet:</string> - <string>panelSelectionDidChange:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -2213,9 +2193,8 @@ <string>cancelProgressBar:</string> <string>changeFormat:</string> <string>closeSheet:</string> - <string>panelSelectionDidChange:</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBActionInfo"> <string key="name">cancelProgressBar:</string> @@ -2229,10 +2208,6 @@ <string key="name">closeSheet:</string> <string key="candidateClassName">id</string> </object> - <object class="IBActionInfo"> - <string key="name">panelSelectionDidChange:</string> - <string key="candidateClassName">id</string> - </object> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -2275,7 +2250,7 @@ <string>tableSourceInstance</string> <string>tablesListInstance</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> @@ -2354,7 +2329,7 @@ <string>tableSourceInstance</string> <string>tablesListInstance</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBToOneOutletInfo"> <string key="name">addCreateTableSwitch</string> @@ -2500,901 +2475,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPDataImport.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">SPDataImport</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>reloadTables:</string> - <string>selectTables:</string> - <string>switchInput:</string> - <string>switchTab:</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> - </object> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>reloadTables:</string> - <string>selectTables:</string> - <string>switchInput:</string> - <string>switchTab:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">reloadTables:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">selectTables:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">switchInput:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">switchTab:</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>exportCSVView</string> - <string>exportDumpTableView</string> - <string>exportDumpView</string> - <string>exportFieldNamesSwitch</string> - <string>exportFieldsEnclosedField</string> - <string>exportFieldsEscapedField</string> - <string>exportFieldsTerminatedField</string> - <string>exportLinesTerminatedField</string> - <string>exportMultipleCSVTableView</string> - <string>exportMultipleCSVView</string> - <string>exportMultipleFieldNamesSwitch</string> - <string>exportMultipleFieldsEnclosedField</string> - <string>exportMultipleFieldsEscapedField</string> - <string>exportMultipleFieldsTerminatedField</string> - <string>exportMultipleLinesTerminatedField</string> - <string>exportMultipleXMLTableView</string> - <string>exportMultipleXMLView</string> - <string>exportTabBar</string> - <string>exportTableList</string> - <string>exportToolbar</string> - <string>exportWindow</string> - <string>tableWindow</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> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <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="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>exportCSVView</string> - <string>exportDumpTableView</string> - <string>exportDumpView</string> - <string>exportFieldNamesSwitch</string> - <string>exportFieldsEnclosedField</string> - <string>exportFieldsEscapedField</string> - <string>exportFieldsTerminatedField</string> - <string>exportLinesTerminatedField</string> - <string>exportMultipleCSVTableView</string> - <string>exportMultipleCSVView</string> - <string>exportMultipleFieldNamesSwitch</string> - <string>exportMultipleFieldsEnclosedField</string> - <string>exportMultipleFieldsEscapedField</string> - <string>exportMultipleFieldsTerminatedField</string> - <string>exportMultipleLinesTerminatedField</string> - <string>exportMultipleXMLTableView</string> - <string>exportMultipleXMLView</string> - <string>exportTabBar</string> - <string>exportTableList</string> - <string>exportToolbar</string> - <string>exportWindow</string> - <string>tableWindow</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">exportCSVView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportDumpTableView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportDumpView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportFieldNamesSwitch</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportFieldsEnclosedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportFieldsEscapedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportFieldsTerminatedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportLinesTerminatedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleCSVTableView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleCSVView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleFieldNamesSwitch</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleFieldsEnclosedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleFieldsEscapedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleFieldsTerminatedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleLinesTerminatedField</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleXMLTableView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportMultipleXMLView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportTabBar</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportTableList</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportToolbar</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">exportWindow</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tableWindow</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">NSActionCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="511768669"> - <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="543957504"> - <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="798986425"> - <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">NSBox</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSBox.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButton</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButtonCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSCell</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSComboBox</string> - <string key="superclassName">NSTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBox.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSComboBoxCell</string> - <string key="superclassName">NSTextFieldCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBoxCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="824124927"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSController</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSController.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">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="854954604"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="973834334"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItemCell</string> - <string key="superclassName">NSButtonCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.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="511768669"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="543957504"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="798986425"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="824124927"/> - </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="854954604"/> - </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"> - <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="474798430"> - <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">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">Foundation.framework/Headers/NSURLConnection.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/NSURLDownload.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">Growl.framework/Headers/GrowlApplicationBridge.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">Print.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">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">ShortcutRecorder.framework/Headers/SRRecorderCell.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">ShortcutRecorder.framework/Headers/SRRecorderControl.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">ShortcutRecorder.framework/Headers/SRValidator.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">Sparkle.framework/Headers/SUAppcast.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">Sparkle.framework/Headers/SUUpdater.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">NSPopUpButton</string> - <string key="superclassName">NSButton</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPopUpButtonCell</string> - <string key="superclassName">NSMenuItemCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.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">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">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">NSTabView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTabView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTabViewItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTabViewItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSText</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSText.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextField</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextFieldCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextView</string> - <string key="superclassName">NSText</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSUserDefaultsController</string> - <string key="superclassName">NSController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.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/Headers/NSClipView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <reference key="sourceIdentifier" ref="973834334"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="474798430"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> + <string key="minorKey">./Classes/SPDataImport.h</string> </object> </object> </object> @@ -3403,14 +2484,13 @@ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <integer value="1050" key="NS.object.0"/> + <real value="1060" key="NS.object.0"/> </object> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> <integer value="3000" key="NS.object.0"/> </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3419,10 +2499,10 @@ <string>NSMenuCheckmark</string> <string>NSMenuMixedState</string> </object> - <object class="NSMutableArray" key="dict.values"> + <object class="NSArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>{9, 8}</string> - <string>{7, 2}</string> + <string>{11, 11}</string> + <string>{10, 3}</string> </object> </object> </data> diff --git a/Source/DMLocalizedNibBundle.m b/Source/DMLocalizedNibBundle.m index 80274a29..2c25cea4 100644 --- a/Source/DMLocalizedNibBundle.m +++ b/Source/DMLocalizedNibBundle.m @@ -15,7 +15,7 @@ + (BOOL)deliciousLocalizingLoadNibFile:(NSString *)fileName externalNameTable:(NSDictionary *)context withZone:(NSZone *)zone; @end -@interface NSBundle () +@interface NSBundle (DMLocalizedNibBundle_Private_API) + (void)_localizeStringsInObject:(id)object table:(NSString *)table; + (NSString *)_localizedStringForString:(NSString *)string table:(NSString *)table; // localize particular attributes in objects @@ -74,10 +74,12 @@ static NSMutableArray *deliciousBindingKeys = nil; } } - +@end #pragma mark Private API +@implementation NSBundle (DMLocalizedNibBundle_Private_API) + + (void)_localizeStringsInObject:(id)object table:(NSString *)table; { if ([object isKindOfClass:[NSArray class]]) { diff --git a/Source/NoodleLineNumberView.m b/Source/NoodleLineNumberView.m index 007e5f0b..8307367f 100644 --- a/Source/NoodleLineNumberView.m +++ b/Source/NoodleLineNumberView.m @@ -79,11 +79,8 @@ typedef NSRange (*RangeOfLineIMP)(id object, SEL selector, NSRange range); [self font], NSFontAttributeName, [self textColor], NSForegroundColorAttributeName, nil] retain]; -#ifndef SP_CODA - NSSize s = [[NSString stringWithString:@"8"] sizeWithAttributes:textAttributes]; -#else + NSSize s = [@"8" sizeWithAttributes:textAttributes]; -#endif maxWidthOfGlyph = s.width; maxHeightOfGlyph = s.height; [self updateGutterThicknessConstants]; @@ -135,11 +132,7 @@ typedef NSRange (*RangeOfLineIMP)(id object, SEL selector, NSRange range); font, NSFontAttributeName, [self textColor], NSForegroundColorAttributeName, nil] retain]; -#ifndef SP_CODA - NSSize s = [[NSString stringWithString:@"8"] sizeWithAttributes:textAttributes]; -#else NSSize s = [@"8" sizeWithAttributes:textAttributes]; -#endif maxWidthOfGlyph = s.width; maxHeightOfGlyph = s.height; [self updateGutterThicknessConstants]; @@ -165,11 +158,7 @@ typedef NSRange (*RangeOfLineIMP)(id object, SEL selector, NSRange range); [self font], NSFontAttributeName, textColor, NSForegroundColorAttributeName, nil] retain]; -#ifndef SP_CODA - NSSize s = [[NSString stringWithString:@"8"] sizeWithAttributes:textAttributes]; -#else NSSize s = [@"8" sizeWithAttributes:textAttributes]; -#endif maxWidthOfGlyph = s.width; maxHeightOfGlyph = s.height; [self updateGutterThicknessConstants]; diff --git a/Source/QLPreviewPanel.h b/Source/QLPreviewPanel.h index 1c255f3f..04e4330d 100644 --- a/Source/QLPreviewPanel.h +++ b/Source/QLPreviewPanel.h @@ -37,7 +37,7 @@ + (id)sharedPreviewPanel; + (id)_previewPanel; + (BOOL)isSharedPreviewPanelLoaded; -- (id)initWithContentRect:(struct _NSRect)fp8 styleMask:(NSUInteger)fp24 backing:(NSUInteger)fp28 defer:(BOOL)fp32; +- (id)initWithContentRect:(NSRect)fp8 styleMask:(NSUInteger)fp24 backing:(NSUInteger)fp28 defer:(BOOL)fp32; - (id)initWithCoder:(id)fp8; - (void)dealloc; - (BOOL)isOpaque; @@ -45,9 +45,9 @@ - (BOOL)canBecomeMainWindow; - (BOOL)shouldIgnorePanelFrameChanges; - (BOOL)isOpen; -- (void)setFrame:(struct _NSRect)fp8 display:(BOOL)fp24 animate:(BOOL)fp28; -- (id)_subEffectsForWindow:(id)fp8 itemFrame:(struct _NSRect)fp12 transitionWindow:(id *)fp28; -- (id)_scaleEffectForItemFrame:(struct _NSRect)fp8 transitionWindow:(id *)fp24; +- (void)setFrame:(NSRect)fp8 display:(BOOL)fp24 animate:(BOOL)fp28; +- (id)_subEffectsForWindow:(id)fp8 itemFrame:(NSRect)fp12 transitionWindow:(id *)fp28; +- (id)_scaleEffectForItemFrame:(NSRect)fp8 transitionWindow:(id *)fp24; - (void)_invertCurrentEffect; - (struct _NSRect)_currentItemFrame; - (void)setAutosizesAndCenters:(BOOL)fp8; diff --git a/Source/SPBundleCommandTextView.m b/Source/SPBundleCommandTextView.m index 111ca2dc..566b244f 100644 --- a/Source/SPBundleCommandTextView.m +++ b/Source/SPBundleCommandTextView.m @@ -146,11 +146,11 @@ NSString *newString; // check for line ending if([textViewString characterAtIndex:NSMaxRange(firstLineRange)-1] == '\r') - newString = [[NSString stringWithString:@"\t"] stringByAppendingString: + newString = [@"\t" stringByAppendingString: [[textViewString substringWithRange:blockRange] stringByReplacingOccurrencesOfString:@"\r" withString:@"\r\t"]]; else - newString = [[NSString stringWithString:@"\t"] stringByAppendingString: + newString = [@"\t" stringByAppendingString: [[textViewString substringWithRange:blockRange] stringByReplacingOccurrencesOfString:@"\n" withString:@"\n\t"]]; @@ -375,7 +375,7 @@ NSInteger tabStopWidth = [prefs integerForKey:SPCustomQueryEditorTabStopWidth]; if(tabStopWidth < 1) tabStopWidth = 1; - float tabWidth = NSSizeToCGSize([[NSString stringWithString:@" "] sizeWithAttributes:[NSDictionary dictionaryWithObject:tvFont forKey:NSFontAttributeName]]).width; + float tabWidth = NSSizeToCGSize([@" " sizeWithAttributes:[NSDictionary dictionaryWithObject:tvFont forKey:NSFontAttributeName]]).width; tabWidth = (float)tabStopWidth * tabWidth; NSInteger numberOfTabs = 256/tabStopWidth; diff --git a/Source/SPBundleHTMLOutputController.m b/Source/SPBundleHTMLOutputController.m index e9b4ec8c..d938f0e2 100644 --- a/Source/SPBundleHTMLOutputController.m +++ b/Source/SPBundleHTMLOutputController.m @@ -529,7 +529,7 @@ - (void)webView:(WebView *)webView exceptionWasRaised:(WebScriptCallFrame *)frame sourceId:(NSInteger)sid line:(NSInteger)lineno forWebFrame:(WebFrame *)webFrame { - NSString *mes = [NSString stringWithFormat:@"Exception:\nline = %ld\nfunction = %@\ncaller = %@\nexception = %@", lineno, [frame functionName], [frame caller], [frame userInfo], [frame exception]]; + NSString *mes = [NSString stringWithFormat:@"Exception:\nline = %ld\nfunction = %@\ncaller = %@\nuserinfo = %@\nexception = %@", lineno, [frame functionName], [frame caller], [frame userInfo], [frame exception]]; if([self suppressExceptionAlerting]) { NSLog(@"%@", mes); diff --git a/Source/SPCSVExporter.m b/Source/SPCSVExporter.m index 8657d766..a56ae789 100644 --- a/Source/SPCSVExporter.m +++ b/Source/SPCSVExporter.m @@ -58,7 +58,7 @@ * * @return The initialised instance */ -- (id)initWithDelegate:(NSObject *)exportDelegate +- (id)initWithDelegate:(NSObject<SPCSVExporterProtocol> *)exportDelegate { if ((self = [super init])) { SPExportDelegateConformsToProtocol(exportDelegate, @protocol(SPCSVExporterProtocol)); diff --git a/Source/SPChooseMenuItemDialog.m b/Source/SPChooseMenuItemDialog.m index 4bfdcbcb..770c1891 100644 --- a/Source/SPChooseMenuItemDialog.m +++ b/Source/SPChooseMenuItemDialog.m @@ -106,7 +106,7 @@ for (id item in theList) { - NSMenuItem *aMenuItem; + NSMenuItem *aMenuItem = nil; if ([item isKindOfClass:[NSString class]]) { aMenuItem = [[NSMenuItem alloc] initWithTitle:item action:@selector(menuItemHandler:) keyEquivalent:@""]; @@ -124,10 +124,12 @@ [aMenuItem setToolTip:[item objectForKey:@"tooltip"]]; } } - - [aMenuItem setTag:cnt++]; - [theMenu addItem:aMenuItem]; - [aMenuItem release]; + + if (aMenuItem) { + [aMenuItem setTag:cnt++]; + [theMenu addItem:aMenuItem]; + [aMenuItem release]; + } } [dialog setContextMenu:theMenu]; diff --git a/Source/SPColorAdditions.m b/Source/SPColorAdditions.m index e3075c6e..92e9db31 100644 --- a/Source/SPColorAdditions.m +++ b/Source/SPColorAdditions.m @@ -46,10 +46,10 @@ if(aColor) { [aColor getRed:&red green:&green blue:&blue alpha:&alpha]; - redHexValue = [NSString stringWithFormat:@"%02X", (NSInteger)(red * 255.0f)]; - greenHexValue = [NSString stringWithFormat:@"%02X", (NSInteger)(green * 255.0f)]; - blueHexValue = [NSString stringWithFormat:@"%02X", (NSInteger)(blue * 255.0f)]; - alphaHexValue = [NSString stringWithFormat:@"%02X", (NSInteger)(alpha * 255.0f)]; + redHexValue = [NSString stringWithFormat:@"%02lX", (long)(red * 255.0f)]; + greenHexValue = [NSString stringWithFormat:@"%02lX", (long)(green * 255.0f)]; + blueHexValue = [NSString stringWithFormat:@"%02lX", (long)(blue * 255.0f)]; + alphaHexValue = [NSString stringWithFormat:@"%02lX", (long)(alpha * 255.0f)]; if([alphaHexValue isEqualToString:@"FF"]) alphaHexValue = @""; return [NSString stringWithFormat:@"#%@%@%@%@", redHexValue, greenHexValue, blueHexValue, alphaHexValue]; } diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index f68e2036..359e2488 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -1092,14 +1092,14 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, if (contextInfo == SPExportFavorites) { SPFavoritesExporter *exporter = [[[SPFavoritesExporter alloc] init] autorelease]; - [exporter setDelegate:self]; + [exporter setDelegate:(NSObject<SPFavoritesExportProtocol> *)self]; [exporter writeFavorites:[self selectedFavoriteNodes] toFile:[panel filename]]; } else if (contextInfo == SPImportFavorites) { SPFavoritesImporter *importer = [[SPFavoritesImporter alloc] init]; - [importer setDelegate:self]; + [importer setDelegate:(NSObject<SPFavoritesImportProtocol> *)self]; [importer importFavoritesFromFileAtPath:[panel filename]]; } diff --git a/Source/SPConnectionControllerDataSource.m b/Source/SPConnectionControllerDataSource.m index 231737c7..3bee67e5 100644 --- a/Source/SPConnectionControllerDataSource.m +++ b/Source/SPConnectionControllerDataSource.m @@ -86,11 +86,6 @@ return NSArrayObjectAtIndex([node childNodes], childIndex); } -- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item -{ - return [(SPTreeNode *)item isGroup]; -} - - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item { SPTreeNode *node = (SPTreeNode *)item; diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m index 28dd8282..9c9d53ca 100644 --- a/Source/SPConnectionControllerDelegate.m +++ b/Source/SPConnectionControllerDelegate.m @@ -49,7 +49,7 @@ static NSString *SPQuickConnectImage = @"quick-connect-icon.pdf"; static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf"; #endif -@interface SPConnectionController () +@interface SPConnectionController (SPConnectionControllerDelegate_Private_API) // Privately redeclare as read/write to get the synthesized setter @property (readwrite, assign) BOOL isEditingConnection; diff --git a/Source/SPConnectionControllerInitializer.m b/Source/SPConnectionControllerInitializer.m index 4bef6178..7ea615e5 100644 --- a/Source/SPConnectionControllerInitializer.m +++ b/Source/SPConnectionControllerInitializer.m @@ -50,12 +50,21 @@ static NSString *SPConnectionViewNibName = @"ConnectionView"; - (void)_reloadFavoritesViewData; - (void)_selectNode:(SPTreeNode *)node; - (void)_scrollToSelectedNode; -- (void)_restoreOutlineViewStateNode:(SPTreeNode *)node; +- (void)_documentWillClose:(NSNotification *)notification; - (SPTreeNode *)_favoriteNodeForFavoriteID:(NSInteger)favoriteID; +- (void)scrollViewFrameChanged:(NSNotification *)aNotification; + +@end + +@interface SPConnectionController (SPConnectionControllerInitializer_Private_API) + +- (void)_restoreOutlineViewStateNode:(SPTreeNode *)node; + @end + @implementation SPConnectionController (SPConnectionControllerInitializer) /** diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index d2788cd9..686e700b 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -1663,11 +1663,10 @@ // Update font size on the table #ifndef SP_CODA NSFont *tableFont = [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPGlobalResultTableFont]]; - [customQueryView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #else NSFont *tableFont = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]; - [customQueryView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #endif + [customQueryView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; // If there are no table columns to add, return if (!cqColumnDefinition || ![cqColumnDefinition count]) return; @@ -3167,7 +3166,7 @@ // Handle "see [...]" and "in [...]"-style 5.x links. //look-behind won't work here because of the \s+ - [desc replaceOccurrencesOfRegex:@"(See|see|In|in|and)\\s+\\[(?:HELP\\s+)?([^\\]]*?)\\]" withString:[NSString stringWithFormat:@"$1 $2",[SPCustomQuery linkToHelpTopic:@"$2"]]]; + [desc replaceOccurrencesOfRegex:@"(See|see|In|in|and)\\s+\\[(?:HELP\\s+)?([^\\]]*?)\\]" withString:[NSString stringWithFormat:@"$1 %@",[SPCustomQuery linkToHelpTopic:@"$2"]]]; [theHelp appendFormat:@"<pre class='description'>%@</pre>", desc]; } @@ -3184,7 +3183,7 @@ if(![searchString isEqualToString:SP_HELP_TOC_SEARCH_STRING]) [theHelp appendFormat:@"<br><i>%@</i><br>", [NSString stringWithFormat:NSLocalizedString(@"Help topics for “%@”", @"MySQL Help Viewer : Results list : Page title"), searchString]]; else - [theHelp appendFormat:@"<br><b>%@:</b><br>", NSLocalizedString(@"MySQL Help – Categories", @"mysql help categories"), searchString]; + [theHelp appendFormat:@"<br><b>%@:</b><br>", NSLocalizedString(@"MySQL Help – Categories", @"mysql help categories")]; // iterate through all found rows and print them as HTML ul/li list [theHelp appendString:@"<ul>"]; @@ -3535,7 +3534,7 @@ else if ([keyPath isEqualToString:SPGlobalResultTableFont]) { NSFont *tableFont = [NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]]; #ifndef SP_CODA - [customQueryView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; + [customQueryView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #else [customQueryView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #endif @@ -3723,11 +3722,7 @@ { if ((self = [super init])) { -#ifndef SP_CODA - usedQuery = [[NSString stringWithString:@""] retain]; -#else usedQuery = [@"" retain]; -#endif lastExecutedQuery = nil; fieldIDQueryString = nil; sortField = nil; @@ -3923,11 +3918,7 @@ if([control isKindOfClass:[SPCopyTable class]]) { // Check firstly if SPCopyTable can handle command -#ifndef SP_CODA - if([customQueryView control:control textView:aTextView doCommandBySelector:(SEL)command]) -#else if([customQueryView control:control textView:aTextView doCommandBySelector:command]) -#endif return YES; // Trap the escape key diff --git a/Source/SPDataAdditions.m b/Source/SPDataAdditions.m index 351ef4d8..9f973b8e 100644 --- a/Source/SPDataAdditions.m +++ b/Source/SPDataAdditions.m @@ -224,7 +224,7 @@ NSMutableString *retVal = [NSMutableString string]; // get the length of the longest location - NSUInteger longest = [(NSString *)[NSString stringWithFormat:@"%X", totalLength - ( totalLength % bytesPerLine )] length]; + NSUInteger longest = [(NSString *)[NSString stringWithFormat:@"%lX", totalLength - ( totalLength % bytesPerLine )] length]; for ( i = 0; i < totalLength; i += bytesPerLine ) { @@ -235,7 +235,7 @@ NSUInteger buffLength = bytesPerLine; // add hex value of location - [location appendFormat:@"%X", i]; + [location appendFormat:@"%llX", (unsigned long long)i]; // pad it while( longest > [location length] ) { diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m index d00e6023..729a7139 100644 --- a/Source/SPDataImport.m +++ b/Source/SPDataImport.m @@ -36,6 +36,7 @@ #import "SPDatabaseViewController.h" #import "SPTablesList.h" #import "SPTableStructure.h" +#import "SPDatabaseStructure.h" #import "SPTableContent.h" #import "SPCustomQuery.h" #import "SPGrowlController.h" diff --git a/Source/SPDataStorage.m b/Source/SPDataStorage.m index ec1ad493..1b3d1cba 100644 --- a/Source/SPDataStorage.m +++ b/Source/SPDataStorage.m @@ -59,7 +59,7 @@ static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorag { // Throw an exception if the index is out of bounds - if (index >= numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", index, numRows]; + if (index >= numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", (unsigned long long)index, (unsigned long long)numRows]; // Construct the NSMutableArray NSMutableArray *rowArray = [NSMutableArray arrayWithCapacity:numColumns]; @@ -79,7 +79,7 @@ static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorag { // Throw an exception if the row or column index is out of bounds - if (rowIndex >= numRows || columnIndex >= numColumns) [NSException raise:NSRangeException format:@"Requested storage index (row %llu, col %llu) beyond bounds (%llu, %llu)", rowIndex, columnIndex, numRows, numColumns]; + if (rowIndex >= numRows || columnIndex >= numColumns) [NSException raise:NSRangeException format:@"Requested storage index (row %llu, col %llu) beyond bounds (%llu, %llu)", (unsigned long long)rowIndex, (unsigned long long)columnIndex, (unsigned long long)numRows, (unsigned long long)numColumns]; // Return the content return dataStorage[rowIndex][columnIndex]; @@ -166,7 +166,7 @@ static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorag { // Throw an exception if the index is out of bounds - if (index > numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", index, numRows]; + if (index > numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", (unsigned long long)index, (unsigned long long)numRows]; // If "inserting" at the end of the array just add a row if (index == numRows) return SPDataStorageAddRow(self, row); @@ -206,7 +206,7 @@ static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorag NSUInteger cellsProcessed = 0; // Throw an exception if the index is out of bounds - if (index >= numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", index, numRows]; + if (index >= numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", (unsigned long long)index, (unsigned long long)numRows]; id *storageRow = dataStorage[index]; @@ -234,7 +234,7 @@ static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorag { // Throw an exception of either index is out of bounds - if (rowIndex >= numRows || columnIndex >= numColumns) [NSException raise:NSRangeException format:@"Requested storage index (row %llu, col %llu) beyond bounds (%llu, %llu)", rowIndex, columnIndex, numRows, numColumns]; + if (rowIndex >= numRows || columnIndex >= numColumns) [NSException raise:NSRangeException format:@"Requested storage index (row %llu, col %llu) beyond bounds (%llu, %llu)", (unsigned long long)rowIndex, (unsigned long long)columnIndex, (unsigned long long)numRows, (unsigned long long)numColumns]; // Release the old object and retain the new one if (dataStorage[rowIndex][columnIndex]) CFRelease(dataStorage[rowIndex][columnIndex]); @@ -249,7 +249,7 @@ static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorag { // Throw an exception if the index is out of bounds - if (index >= numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", index, numRows]; + if (index >= numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", (unsigned long long)index, (unsigned long long)numRows]; // Free the row NSUInteger j = numColumns; @@ -275,7 +275,7 @@ static inline void SPDataStorageEnsureCapacityForAdditionalRowCount(SPDataStorag { // Throw an exception if the range is out of bounds - if (rangeToRemove.location + rangeToRemove.length > numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", (rangeToRemove.location + rangeToRemove.length), numRows]; + if (rangeToRemove.location + rangeToRemove.length > numRows) [NSException raise:NSRangeException format:@"Requested storage index (%llu) beyond bounds (%llu)", (unsigned long long)(rangeToRemove.location + rangeToRemove.length), (unsigned long long)numRows]; // Free rows in the range NSUInteger i, j = numColumns; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index ab321caa..10325374 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -45,6 +45,7 @@ enum { #import "SPTablesList.h" #import "SPTableStructure.h" +#import "SPDatabaseStructure.h" #ifndef SP_CODA /* headers */ #import "SPFileHandle.h" #import "SPKeychain.h" @@ -99,6 +100,7 @@ enum { #endif #import "SPThreadAdditions.h" #import "RegexKitLite.h" +#import "SPTextView.h" #ifdef SP_CODA /* headers */ #import "SPAlertSheets.h" @@ -4179,7 +4181,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase"; // Cancel autocompletion trigger if([prefs boolForKey:SPCustomQueryAutoComplete]) #endif - [NSObject cancelPreviousPerformRequestsWithTarget:[customQueryInstance valueForKeyPath:@"textView"] + [NSObject cancelPreviousPerformRequestsWithTarget:[customQueryInstance valueForKeyPath:@"textView"] selector:@selector(doAutoCompletion) object:nil]; #ifndef SP_CODA @@ -5413,7 +5415,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase"; [fh writeData:[[[theResult fieldNames] componentsJoinedAsCSV] dataUsingEncoding:NSUTF8StringEncoding]]; else [fh writeData:[[[theResult fieldNames] componentsJoinedByString:@"\t"] dataUsingEncoding:NSUTF8StringEncoding]]; - [fh writeData:[[NSString stringWithString:@"\n"] dataUsingEncoding:NSUTF8StringEncoding]]; + [fh writeData:[@"\n" dataUsingEncoding:NSUTF8StringEncoding]]; NSArray *columnDefinition = [theResult fieldDefinitions]; diff --git a/Source/SPDotExporter.m b/Source/SPDotExporter.m index 13bf13a5..5a655ca3 100644 --- a/Source/SPDotExporter.m +++ b/Source/SPDotExporter.m @@ -54,7 +54,7 @@ * * @return The initialised instance */ -- (id)initWithDelegate:(NSObject *)exportDelegate +- (id)initWithDelegate:(NSObject<SPDotExporterProtocol> *)exportDelegate { if ((self = [super init])) { SPExportDelegateConformsToProtocol(exportDelegate, @protocol(SPDotExporterProtocol)); diff --git a/Source/SPExportFileUtilities.m b/Source/SPExportFileUtilities.m index ea5bee2e..94b3e933 100644 --- a/Source/SPExportFileUtilities.m +++ b/Source/SPExportFileUtilities.m @@ -31,6 +31,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPExportFileUtilities.h" +#import "SPExportInitializer.h" #import "SPExporter.h" #import "SPAlertSheets.h" #import "SPExportFile.h" @@ -50,6 +51,7 @@ SPExportErrorChoice; @interface SPExportController (SPExportFileUtilitiesPrivateAPI) - (void)_reopenExportSheet; +- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; @end diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index ce9e6e7f..0e88d4e0 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -59,7 +59,6 @@ static NSString *SPMySQLDataFreeField = @"Data_free"; static NSString *SPMySQLAutoIncrementField = @"Auto_increment"; static NSString *SPMySQLCreateTimeField = @"Create_time"; static NSString *SPMySQLUpdateTimeField = @"Update_time"; -static NSString *SPMySQLCheckTimeField = @"Check_time"; static NSString *SPMySQLCollationField = @"Collation"; static NSString *SPMySQLCommentField = @"Comment"; diff --git a/Source/SPFavoriteTextFieldCell.m b/Source/SPFavoriteTextFieldCell.m index 313fdc92..91ff1418 100644 --- a/Source/SPFavoriteTextFieldCell.m +++ b/Source/SPFavoriteTextFieldCell.m @@ -112,4 +112,4 @@ } } -@end
\ No newline at end of file +@end diff --git a/Source/SPFavoritesController.m b/Source/SPFavoritesController.m index 0985d680..e883d876 100644 --- a/Source/SPFavoritesController.m +++ b/Source/SPFavoritesController.m @@ -236,7 +236,7 @@ static SPFavoritesController *sharedFavoritesController = nil; // If the favorites data file already exists use it, otherwise create an empty one if ([fileManager fileExistsAtPath:favoritesFile]) { - favoritesData = [[NSDictionary alloc] initWithContentsOfFile:favoritesFile]; + favoritesData = [[NSMutableDictionary alloc] initWithContentsOfFile:favoritesFile]; } else { NSMutableDictionary *newFavorites = [NSMutableDictionary dictionaryWithObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Favorites", @"favorites label"), SPFavoritesGroupNameKey, [NSArray array], SPFavoriteChildrenKey, nil] forKey:SPFavoritesRootKey]; @@ -346,7 +346,7 @@ static SPFavoritesController *sharedFavoritesController = nil; } } else { - node = [[SPFavoriteNode alloc] initWithDictionary:nodeData]; + node = [[SPFavoriteNode alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:nodeData]]; treeNode = [[SPTreeNode alloc] initWithRepresentedObject:node]; diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h index a1cf0cee..4e6aac77 100644 --- a/Source/SPFieldEditorController.h +++ b/Source/SPFieldEditorController.h @@ -187,7 +187,6 @@ - (IBAction)dropImage:(id)sender; - (IBAction)segmentControllerChanged:(id)sender; - (IBAction)quickLookFormatButton:(id)sender; -- (IBAction)dropImage:(id)sender; - (IBAction)bitSheetSelectBit0:(id)sender; - (IBAction)bitSheetBitButtonWasClicked:(id)sender; diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m index 87d2025b..386cdd0a 100644 --- a/Source/SPFieldEditorController.m +++ b/Source/SPFieldEditorController.m @@ -222,7 +222,7 @@ if([fieldType length]) [label appendString:fieldType]; if(maxTextLength > 0) - [label appendFormat:@"(%ld) ", maxTextLength]; + [label appendFormat:@"(%lld) ", maxTextLength]; if(!_allowNULL) [label appendString:@"NOT NULL "]; if([fieldEncoding length]) @@ -293,7 +293,7 @@ [hexTextView setFont:[NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]]]; - [editSheetFieldName setStringValue:[NSString stringWithFormat:@"%@: %@%", NSLocalizedString(@"Field", @"Field"), label]]; + [editSheetFieldName setStringValue:[NSString stringWithFormat:@"%@: %@", NSLocalizedString(@"Field", @"Field"), label]]; // hide all views in editSheet [hexTextView setHidden:YES]; @@ -809,7 +809,7 @@ // since QuickLook only works on files. // Alternate the file name to suppress caching by using counter%2. if (tmpFileName) [tmpFileName release]; - tmpFileName = [[NSString alloc] initWithFormat:@"%@SequelProQuickLook%d.%@", tmpDirPath, counter%2, type]; + tmpFileName = [[NSString alloc] initWithFormat:@"%@SequelProQuickLook%ld.%@", tmpDirPath, counter%2, type]; // if data are binary if ( [sheetEditData isKindOfClass:[NSData class]] && !isText) { @@ -1153,7 +1153,7 @@ bitValue <<= 1; } [bitSheetIntegerTextField setStringValue:[[NSNumber numberWithUnsignedLongLong:intValue] stringValue]]; - [bitSheetHexTextField setStringValue:[NSString stringWithFormat:@"%qX", intValue]]; + [bitSheetHexTextField setStringValue:[NSString stringWithFormat:@"%lX", (unsigned long)intValue]]; [bitSheetOctalTextField setStringValue:[NSString stringWithFormat:@"%jO", intValue]]; // free old data if ( sheetEditData != nil ) { @@ -1283,7 +1283,7 @@ for(i=0; i<maxBit; i++) [[self valueForKeyPath:[NSString stringWithFormat:@"bitSheetBitButton%ld", i]] setState:NSOffState]; - [bitSheetHexTextField setStringValue:[NSString stringWithFormat:@"%qX", intValue]]; + [bitSheetHexTextField setStringValue:[NSString stringWithFormat:@"%lX", (unsigned long)intValue]]; [bitSheetOctalTextField setStringValue:[NSString stringWithFormat:@"%jO", intValue]]; i = 0; @@ -1308,7 +1308,7 @@ [[self valueForKeyPath:[NSString stringWithFormat:@"bitSheetBitButton%ld", i]] setState:NSOffState]; [bitSheetHexTextField setStringValue:[NSString stringWithFormat:@"%qX", intValue]]; - [bitSheetOctalTextField setStringValue:[NSString stringWithFormat:@"%jO", intValue]]; + [bitSheetOctalTextField setStringValue:[NSString stringWithFormat:@"%llO", intValue]]; i = 0; while( intValue && i < maxBit ) diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h index df4e00d2..cdfe77c8 100644 --- a/Source/SPFieldMapperController.h +++ b/Source/SPFieldMapperController.h @@ -195,7 +195,6 @@ - (IBAction)closeInfoSheet:(id)sender; - (IBAction)addNewColumn:(id)sender; - (IBAction)removeNewColumn:(id)sender; -// - (IBAction)editColumn:(id)sender; - (IBAction)setAllTypesTo:(id)sender; // Others diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index b31928d5..2e517852 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -1002,13 +1002,6 @@ static NSString *SPTableViewSqlColumnID = @"sql"; } -// - (IBAction)editColumn:(id)sender -// { -// toBeEditedRowIndexes = [fieldMapperTableView selectedRow]; -// [fieldMapperTableView reloadData]; -// [fieldMapperTableView editColumn:3 row:[fieldMapperTableView selectedRow] withEvent:nil select:YES]; -// } - /* * Set all table target field types to that one of the current selected type */ @@ -1124,14 +1117,14 @@ static NSString *SPTableViewSqlColumnID = @"sql"; for(id item in [fieldMappingImportArray objectAtIndex:0]) { i++; if ([item isNSNull]) { - [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. <%@>", i, [prefs objectForKey:SPNullValue]]]; + [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%li. <%@>", (long)i, [prefs objectForKey:SPNullValue]]]; } else if ([item isSPNotLoaded]) { - [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. <%@>", i, @"DEFAULT"]]; + [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%li. <%@>", (long)i, @"DEFAULT"]]; } else { if([(NSString*)item length] > 20) - [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. %@…", i, [item substringToIndex:20]]]; + [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%li. %@…", (long)i, [item substringToIndex:20]]]; else - [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. %@", i, item]]; + [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%li. %@", (long)i, item]]; } } } @@ -1520,20 +1513,20 @@ static NSString *SPTableViewSqlColumnID = @"sql"; [fieldMappingButtonOptions setArray:[fieldMappingImportArray objectAtIndex:fieldMappingCurrentRow]]; for (i = 0; i < [fieldMappingButtonOptions count]; i++) { if ([[fieldMappingButtonOptions objectAtIndex:i] isNSNull]) - [fieldMappingButtonOptions replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%i. <%@>", i+1, [prefs objectForKey:SPNullValue]]]; + [fieldMappingButtonOptions replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%li. <%@>", i+1, [prefs objectForKey:SPNullValue]]]; else if ([[fieldMappingButtonOptions objectAtIndex:i] isSPNotLoaded]) - [fieldMappingButtonOptions replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%i. <%@>", i+1, @"DEFAULT"]]; + [fieldMappingButtonOptions replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%li. <%@>", i+1, @"DEFAULT"]]; else - [fieldMappingButtonOptions replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%i. %@", i+1, NSArrayObjectAtIndex(fieldMappingButtonOptions, i)]]; + [fieldMappingButtonOptions replaceObjectAtIndex:i withObject:[NSString stringWithFormat:@"%li. %@", i+1, NSArrayObjectAtIndex(fieldMappingButtonOptions, i)]]; } // Add global values if any if((NSInteger)[fieldMappingGlobalValues count]>numberOfImportColumns) for( ; i < [fieldMappingGlobalValues count]; i++) { if ([NSArrayObjectAtIndex(fieldMappingGlobalValues, i) isNSNull]) - [fieldMappingButtonOptions addObject:[NSString stringWithFormat:@"%i. <%@>", i+1, [prefs objectForKey:SPNullValue]]]; + [fieldMappingButtonOptions addObject:[NSString stringWithFormat:@"%li. <%@>", i+1, [prefs objectForKey:SPNullValue]]]; else - [fieldMappingButtonOptions addObject:[NSString stringWithFormat:@"%i. %@", i+1, NSArrayObjectAtIndex(fieldMappingGlobalValues, i)]]; + [fieldMappingButtonOptions addObject:[NSString stringWithFormat:@"%li. %@", i+1, NSArrayObjectAtIndex(fieldMappingGlobalValues, i)]]; } [fieldMapperTableView reloadData]; @@ -1635,10 +1628,6 @@ static NSString *SPTableViewSqlColumnID = @"sql"; else if (!newTableMode && [menuItem action] == @selector(insertNULLValue:)) { return ([[globalValuesTableView selectedRowIndexes] count] == 1) ? YES : NO; } - else if (!newTableMode && [menuItem action] == @selector(editColumn:)) { - NSString *orgTitle = [[menuItem title] substringToIndex:[[menuItem title] rangeOfString:@":"].location]; - [menuItem setTitle:[NSString stringWithFormat:@"%@: %@", orgTitle, [fieldMappingTableColumnNames objectAtIndex:row]]]; - } else if (!newTableMode && [menuItem action] == @selector(removeNewColumn:)) { if([toBeEditedRowIndexes containsIndex:row]) { NSString *orgTitle = [[menuItem title] substringToIndex:[[menuItem title] rangeOfString:@":"].location]; diff --git a/Source/SPHTMLExporter.m b/Source/SPHTMLExporter.m index db7dc6de..63414644 100644 --- a/Source/SPHTMLExporter.m +++ b/Source/SPHTMLExporter.m @@ -44,7 +44,7 @@ * * @return The initialised instance */ -- (id)initWithDelegate:(NSObject *)exportDelegate +- (id)initWithDelegate:(NSObject<SPHTMLExporterProtocol> *)exportDelegate { if ((self = [super init])) { SPExportDelegateConformsToProtocol(exportDelegate, @protocol(SPHTMLExporterProtocol)); diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m index 1ee45d52..08c1cdef 100644 --- a/Source/SPIndexesController.m +++ b/Source/SPIndexesController.m @@ -894,7 +894,7 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize"; // If supplied specify the index's key block size if (indexKeyBlockSize) { - [query appendFormat:@" KEY_BLOCK_SIZE = %d", [indexKeyBlockSize integerValue]]; + [query appendFormat:@" KEY_BLOCK_SIZE = %ld", (long)[indexKeyBlockSize integerValue]]; } // Execute the query diff --git a/Source/SPPDFExporter.m b/Source/SPPDFExporter.m index 61cdc6bd..cb54babb 100644 --- a/Source/SPPDFExporter.m +++ b/Source/SPPDFExporter.m @@ -44,7 +44,7 @@ * * @return The initialised instance */ -- (id)initWithDelegate:(NSObject *)exportDelegate +- (id)initWithDelegate:(NSObject<SPPDFExporterProtocol> *)exportDelegate { if ((self = [super init])) { SPExportDelegateConformsToProtocol(exportDelegate, @protocol(SPPDFExporterProtocol)); diff --git a/Source/SPQueryDocumentsController.m b/Source/SPQueryDocumentsController.m index 3557c75f..5bda1771 100644 --- a/Source/SPQueryDocumentsController.m +++ b/Source/SPQueryDocumentsController.m @@ -31,6 +31,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPQueryDocumentsController.h" +#import "SPCustomQuery.h" @implementation SPQueryController (SPQueryDocumentsController) diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m index fa1df5d0..e578ebdf 100644 --- a/Source/SPSQLExporter.m +++ b/Source/SPSQLExporter.m @@ -70,7 +70,7 @@ * * @return The initialised instance */ -- (id)initWithDelegate:(NSObject *)exportDelegate +- (id)initWithDelegate:(NSObject<SPSQLExporterProtocol> *)exportDelegate { if ((self = [super init])) { SPExportDelegateConformsToProtocol(exportDelegate, @protocol(SPSQLExporterProtocol)); diff --git a/Source/SPServerSupport.m b/Source/SPServerSupport.m index 95120494..1446b978 100644 --- a/Source/SPServerSupport.m +++ b/Source/SPServerSupport.m @@ -229,7 +229,7 @@ - (NSString *)description { unsigned int i; - NSMutableString *description = [NSMutableString stringWithFormat:@"<%@: Server is MySQL version %d.%d.%d. Supports:\n", [self className], serverMajorVersion, serverMinorVersion, serverReleaseVersion]; + NSMutableString *description = [NSMutableString stringWithFormat:@"<%@: Server is MySQL version %ld.%ld.%ld. Supports:\n", [self className], (long)serverMajorVersion, (long)serverMinorVersion, (long)serverReleaseVersion]; Ivar *vars = class_copyIvarList([self class], &i); diff --git a/Source/SPSingleton.m b/Source/SPSingleton.m index 4db5d49b..265ad62e 100644 --- a/Source/SPSingleton.m +++ b/Source/SPSingleton.m @@ -58,6 +58,6 @@ return self; } -- (void)release { } +- (oneway void)release { } @end diff --git a/Source/SPSplitView.m b/Source/SPSplitView.m index 4930e171..f89e0dc9 100644 --- a/Source/SPSplitView.m +++ b/Source/SPSplitView.m @@ -1090,10 +1090,10 @@ } // Check for a first responder to restore, using the "true" first responder for field editors - NSResponder<NSTextDelegate> *firstResponderToRestore = [[self window] firstResponder]; + NSResponder *firstResponderToRestore = [[self window] firstResponder]; if ([firstResponderToRestore respondsToSelector:@selector(isFieldEditor)] && [(NSText *)firstResponderToRestore isFieldEditor]) { - firstResponderToRestore = [(NSText *)firstResponderToRestore delegate]; + firstResponderToRestore = (NSResponder *)[(NSText *)firstResponderToRestore delegate]; } if (![firstResponderToRestore isKindOfClass:[NSView class]] || ![(NSView *)firstResponderToRestore isDescendantOf:wrappedView]) { firstResponderToRestore = nil; diff --git a/Source/SPStringAdditions.m b/Source/SPStringAdditions.m index 029330d0..dfc71fb3 100644 --- a/Source/SPStringAdditions.m +++ b/Source/SPStringAdditions.m @@ -186,7 +186,7 @@ theChar += 13; } - [holder appendFormat:@"%C", (char)theChar]; + [holder appendFormat:@"%C", theChar]; } else if (theChar <= 90 && theChar >= 65) { diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 7f9c172e..f093f875 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -531,11 +531,10 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper NSString *nullValue = [prefs objectForKey:SPNullValue]; #ifndef SP_CODA /* get font from prefs */ NSFont *tableFont = [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPGlobalResultTableFont]]; - [tableContentView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #else NSFont *tableFont = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]; - [tableContentView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; #endif + [tableContentView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; // Add the new columns to the table and filterTable for ( i = 0 ; i < (NSInteger)[dataColumns count] ; i++ ) { @@ -4213,7 +4212,7 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper // Table font preference changed else if ([keyPath isEqualToString:SPGlobalResultTableFont]) { NSFont *tableFont = [NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]]; - [tableContentView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; + [tableContentView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; [tableContentView setFont:tableFont]; [tableContentView reloadData]; } diff --git a/Source/SPTableContentDelegate.m b/Source/SPTableContentDelegate.m index 018932cb..d2e7f2d5 100644 --- a/Source/SPTableContentDelegate.m +++ b/Source/SPTableContentDelegate.m @@ -758,12 +758,8 @@ */ - (BOOL)control:(NSControl<NSControlTextEditingDelegate> *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command { -#ifndef SP_CODA // Check firstly if SPCopyTable can handle command - if ([control control:control textView:textView doCommandBySelector:(SEL)command]) -#else if ([control control:control textView:textView doCommandBySelector:command]) -#endif return YES; // Trap the escape key diff --git a/Source/SPTableContentFilter.m b/Source/SPTableContentFilter.m index b8e1d72e..6d8c212a 100644 --- a/Source/SPTableContentFilter.m +++ b/Source/SPTableContentFilter.m @@ -87,8 +87,8 @@ for (NSInteger anIndex = 0; anIndex < numberOfCols; anIndex++) { - NSString *filterCell; - NSDictionary *filterCellData = [NSDictionary dictionaryWithDictionary:[filterTableData objectForKey:[NSString stringWithFormat:@"%d", anIndex]]]; + NSString *filterCell = nil; + NSDictionary *filterCellData = [NSDictionary dictionaryWithDictionary:[filterTableData objectForKey:[NSString stringWithFormat:@"%ld", (long)anIndex]]]; // Take filterTableData if (!currentValue) { diff --git a/Source/SPTableData.m b/Source/SPTableData.m index 594d1df4..03ce039e 100644 --- a/Source/SPTableData.m +++ b/Source/SPTableData.m @@ -1127,7 +1127,7 @@ SPRowCountQueryUsageLevels rowCountLevel = SPRowCountFetchAlways; NSInteger rowCountCheapBoundary = 5242880; #ifndef SP_CODA - rowCountLevel = [[[NSUserDefaults standardUserDefaults] objectForKey:SPTableRowCountQueryLevel] integerValue]; + rowCountLevel = (SPRowCountQueryUsageLevels)[[[NSUserDefaults standardUserDefaults] objectForKey:SPTableRowCountQueryLevel] integerValue]; rowCountCheapBoundary = [[[NSUserDefaults standardUserDefaults] objectForKey:SPTableRowCountCheapSizeBoundary] integerValue]; #endif @@ -1429,4 +1429,4 @@ #endif -@end
\ No newline at end of file +@end diff --git a/Source/SPTableFieldValidation.m b/Source/SPTableFieldValidation.m index 3a465338..b18fba19 100644 --- a/Source/SPTableFieldValidation.m +++ b/Source/SPTableFieldValidation.m @@ -102,7 +102,7 @@ if (![fieldTypes containsObject:type]) return YES; - return ((([fieldTypes indexOfObject:type] > 17) && ([fieldTypes indexOfObject:type] < 24) || (([fieldTypes indexOfObject:type] > 29) && ([fieldTypes indexOfObject:type] < 32)))); + return (((([fieldTypes indexOfObject:type] > 17) && ([fieldTypes indexOfObject:type] < 24)) || (([fieldTypes indexOfObject:type] > 29) && ([fieldTypes indexOfObject:type] < 32)))); } /** diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m index e79152bd..9d6b1fec 100644 --- a/Source/SPTableStructure.m +++ b/Source/SPTableStructure.m @@ -32,6 +32,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPTableStructure.h" +#import "SPDatabaseStructure.h" #import "SPDatabaseDocument.h" #import "SPDatabaseViewController.h" #import "SPTableInfo.h" diff --git a/Source/SPTableStructureDelegate.m b/Source/SPTableStructureDelegate.m index ec6e984f..c8d03aff 100644 --- a/Source/SPTableStructureDelegate.m +++ b/Source/SPTableStructureDelegate.m @@ -42,6 +42,12 @@ #import <SPMySQL/SPMySQL.h> +@interface SPTableStructure (PrivateAPI) + +- (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo; + +@end + @implementation SPTableStructure (SPTableStructureDelegate) #pragma mark - diff --git a/Source/SPTableStructureLoading.m b/Source/SPTableStructureLoading.m index 720f2692..bc90bc43 100644 --- a/Source/SPTableStructureLoading.m +++ b/Source/SPTableStructureLoading.m @@ -32,6 +32,7 @@ #import "SPTableData.h" #import "SPAlertSheets.h" #import "SPDatabaseData.h" +#import "SPDatabaseStructure.h" #import "SPTableFieldValidation.h" #import "SPDatabaseViewController.h" #import "SPIndexesController.h" @@ -376,4 +377,4 @@ [tableSourceView reloadData]; } -@end
\ No newline at end of file +@end diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m index 22374e23..6a4b1b79 100644 --- a/Source/SPTableTriggers.m +++ b/Source/SPTableTriggers.m @@ -579,7 +579,7 @@ static const NSString *SPTriggerSQLMode = @"TriggerSQLMode"; } NSArray *triggers = ([[tableDocumentInstance serverSupport] supportsTriggers]) ? [tableDataInstance triggers] : nil; - NSCharacterSet *nulSet = [NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"%C", '\0']]; + NSCharacterSet *nulSet = [NSCharacterSet characterSetWithCharactersInString:[NSString stringWithFormat:@"%C", (unsigned short)'\0']]; for (NSDictionary *trigger in triggers) { diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m index ed228248..db3890ff 100644 --- a/Source/SPTablesList.m +++ b/Source/SPTablesList.m @@ -34,6 +34,7 @@ #import "SPTablesList.h" #import "SPDatabaseDocument.h" #import "SPTableStructure.h" +#import "SPDatabaseStructure.h" #import "SPDatabaseViewController.h" #ifndef SP_CODA /* headers */ diff --git a/Source/SPTextView.m b/Source/SPTextView.m index fe013503..3a6b2204 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -320,11 +320,8 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS { NSMutableArray *possibleCompletions = [[NSMutableArray alloc] initWithCapacity:32]; -#ifndef SP_CODA - if(currentWord == nil) currentWord = [NSString stringWithString:@""]; -#else if(currentWord == nil) currentWord = @""; -#endif + // If caret is not inside backticks add keywords and all words coming from the view. if(!dbBrowseMode) { @@ -2918,11 +2915,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS #endif if(tabStopWidth < 1) tabStopWidth = 1; -#ifndef SP_CODA - float tabWidth = NSSizeToCGSize([[NSString stringWithString:@" "] sizeWithAttributes:[NSDictionary dictionaryWithObject:tvFont forKey:NSFontAttributeName]]).width; -#else float tabWidth = NSSizeToCGSize([@" " sizeWithAttributes:[NSDictionary dictionaryWithObject:tvFont forKey:NSFontAttributeName]]).width; -#endif tabWidth = (float)tabStopWidth * tabWidth; NSInteger numberOfTabs = 256/tabStopWidth; diff --git a/Source/SPWindowController.m b/Source/SPWindowController.m index bef7cbc1..aa208286 100644 --- a/Source/SPWindowController.m +++ b/Source/SPWindowController.m @@ -31,6 +31,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPWindowController.h" +#import "SPWindowControllerDelegate.h" #import "SPDatabaseDocument.h" #import "SPDatabaseViewController.h" #import "SPAppController.h" diff --git a/Source/SPWindowControllerDelegate.h b/Source/SPWindowControllerDelegate.h index 09b4a7bf..29029db2 100644 --- a/Source/SPWindowControllerDelegate.h +++ b/Source/SPWindowControllerDelegate.h @@ -34,4 +34,8 @@ @interface SPWindowController (SPWindowControllerDelegate) +- (void)tabDragStarted:(id)sender; +- (void)tabDragStopped:(id)sender; + + @end diff --git a/Source/SPXMLExporter.m b/Source/SPXMLExporter.m index 7f976449..f159f129 100644 --- a/Source/SPXMLExporter.m +++ b/Source/SPXMLExporter.m @@ -54,7 +54,7 @@ * * @return The initialised instance */ -- (id)initWithDelegate:(NSObject *)exportDelegate +- (id)initWithDelegate:(NSObject<SPXMLExporterProtocol> *)exportDelegate { if ((self = [super init])) { SPExportDelegateConformsToProtocol(exportDelegate, @protocol(SPXMLExporterProtocol)); diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index cffe3087..cd940ffc 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -2724,7 +2724,7 @@ 2A37F4A9FDCFA73011CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0460; }; buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "sequel-pro" */; compatibilityVersion = "Xcode 3.2"; @@ -3823,6 +3823,10 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; @@ -3835,16 +3839,13 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = NO; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_PEDANTIC = NO; - GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_STRICT_SELECTOR_MATCH = NO; @@ -4134,6 +4135,10 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH_ACTUAL)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; @@ -4149,16 +4154,13 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = NO; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_PEDANTIC = NO; - GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_STRICT_SELECTOR_MATCH = NO; @@ -4189,6 +4191,10 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_LINK_OBJC_RUNTIME = NO; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -4202,16 +4208,13 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; - GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = NO; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; GCC_WARN_MISSING_PARENTHESES = YES; - GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_PEDANTIC = NO; - GCC_WARN_PROTOTYPE_CONVERSION = NO; GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_STRICT_SELECTOR_MATCH = NO; |