From a329d031aac349c0ad2b0768cc24ce69dc09a577 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sat, 24 Apr 2010 01:36:34 +0000 Subject: Merge in a number of fixes from trunk (r2065, r2066, r2067, r2068, r2069, r2074, r2075, r2076, r2078, r2079, r2081, r2083, r2084, r2085, r2089, r2090, r2100, r2110, r2117, r2118, r2119, r2120, r2128, r2132, r2133, r2134, r2137, r2138, r2139, r2140, r2142, r2150, r2152, r2153, r2154, r2155, r2158, and r2160) --- Interfaces/English.lproj/DBView.xib | 1125 +++++------------------------- Interfaces/English.lproj/MainMenu.xib | 868 ++--------------------- Interfaces/English.lproj/Preferences.xib | 27 +- 3 files changed, 246 insertions(+), 1774 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 16099b30..4e735959 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,7 +2,7 @@ 1050 - 10D573 + 10D2094 740 1038.29 460.00 @@ -18,19 +18,18 @@ YES 740 740 - 1.2.2 + 1.2.5 YES - - + YES com.brandonwalkin.BWToolkit - com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin YES @@ -60,10 +59,10 @@ Sequel Pro NSWindow View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {780, 480} - + 256 YES @@ -238,7 +237,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -283,7 +282,6 @@ {{1, 1}, {218, 38}} - 6 @@ -315,7 +313,6 @@ {{-1, -13}, {220.212, 40}} - 2 @@ -413,7 +410,6 @@ {214, 354} - 4 @@ -441,7 +437,6 @@ {214, 354} - 528 @@ -577,7 +572,6 @@ {214, 145} - 6 @@ -605,7 +599,6 @@ {214, 145} - 512 @@ -786,8 +779,31 @@ _popUpItemAction: + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + Show Create Table Syntax... + + 2147483647 + + + _popUpItemAction: + + + 7 YES 1 YES @@ -1694,6 +1710,7 @@ NO NO NO + NO 0.0 0.0 @@ -3894,29 +3911,6 @@ 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - {542, 14} @@ -3983,7 +3977,6 @@ {{1, 1}, {542, 69}} - @@ -4013,7 +4006,6 @@ {{96, 0}, {555, 71}} - 18 @@ -4121,7 +4113,6 @@ {{1, 1}, {542, 196}} - @@ -4151,7 +4142,6 @@ {{96, 0}, {555, 198}} - 18 @@ -5552,11 +5542,10 @@ {944, 550} - {{0, 0}, {1920, 1178}} {780, 502} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -6631,7 +6620,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -6911,7 +6900,7 @@ {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -6923,7 +6912,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -7079,7 +7068,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 7 @@ -7089,7 +7078,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Reset Auto Increment NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {255, 95} @@ -7252,7 +7241,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {255, 117} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -7262,7 +7251,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Relation NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -7863,7 +7852,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} {{0, 0}, {1440, 878}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -7873,7 +7862,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {329, 348} @@ -8280,7 +8269,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {329, 370} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 3 @@ -8292,7 +8281,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 50} @@ -8412,7 +8401,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {213, 72} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -8424,7 +8413,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -8559,7 +8548,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 15 @@ -8571,7 +8560,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {350, 200} @@ -8794,7 +8783,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {350, 222} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -8806,7 +8795,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -8976,7 +8965,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 31 @@ -8986,7 +8975,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {351, 120} @@ -9380,7 +9369,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {351, 136} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} MYSQL_HELP_WINDOW @@ -9514,7 +9503,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Secure Text Input Sheet NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 @@ -9618,7 +9607,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {338, 138} {{0, 0}, {1280, 778}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -11490,7 +11479,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 disabledControlTextColor 3 - MC4zMzMzMzMzNDMzAA + MC4zMzMzMzMzMzMzAA @@ -11884,6 +11873,24 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + + YES + YES + + + 2147483647 + + + + + + Show Create Table Syntax... + + 2147483647 + + + @@ -16298,6 +16305,54 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6921 + + + separatorTableMenuItem2 + + + + 6923 + + + + showCreateSyntaxMenuItem + + + + 6925 + + + + showCreateTableSyntax: + + + + 6926 + + + + separatorTableContextMenuItem2 + + + + 6928 + + + + showCreateSyntaxContextMenuItem + + + + 6930 + + + + showCreateTableSyntax: + + + + 6931 + @@ -20979,6 +21034,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + @@ -21064,6 +21121,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + Table List Menu @@ -22927,6 +22986,26 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 6922 + + + + + 6924 + + + + + 6927 + + + + + 6929 + + + @@ -24313,6 +24392,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6915.IBPluginDependency 6916.IBPluginDependency 6917.IBPluginDependency + 6922.IBPluginDependency + 6924.IBPluginDependency + 6927.IBPluginDependency + 6929.IBPluginDependency 711.IBPluginDependency 711.ImportedFromIB2 713.IBPluginDependency @@ -25719,7 +25802,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{300, 100}, {157, 98}} + {{96, 104}, {208, 125}} com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -25781,7 +25864,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{623, 397}, {171, 93}} + {{623, 367}, {241, 123}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -25827,7 +25910,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{735, 570}, {233, 53}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{898, 501}, {228, 113}} + {{774, 501}, {228, 113}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26316,6 +26399,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26458,7 +26545,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 6921 + 6931 @@ -28037,7 +28124,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 renameTableContextMenuItem renameTableMenuItem separatorTableContextMenuItem + separatorTableContextMenuItem2 separatorTableMenuItem + separatorTableMenuItem2 + showCreateSyntaxContextMenuItem + showCreateSyntaxMenuItem spHistoryControllerInstance tabView tableContentInstance @@ -28081,6 +28172,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSMenuItem NSMenuItem NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem SPHistoryController id id @@ -28186,57 +28281,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 BWToolkitFramework.framework/Headers/BWSplitView.h - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - NSApplication @@ -28245,861 +28289,40 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - NSArrayController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSArrayController.h - - - - NSBox - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSBox.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSComboBox - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSComboBox.h - - - - NSComboBoxCell - NSTextFieldCell - - IBFrameworkSource - AppKit.framework/Headers/NSComboBoxCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSDictionary - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSDictionary.h - - - - NSDictionary - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSDictionary - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSDocument - NSObject - - YES - - YES - printDocument: - revertDocumentToSaved: - runPageLayout: - saveDocument: - saveDocumentAs: - saveDocumentTo: - - - YES - id - id - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocument.h - - - - NSDocument - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentScripting.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSImageCell - NSCell + NSObject IBFrameworkSource - AppKit.framework/Headers/NSImageCell.h + Growl.framework/Headers/GrowlApplicationBridge.h - NSImageView - NSControl + NSObject IBFrameworkSource - AppKit.framework/Headers/NSImageView.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h + Sparkle.framework/Headers/SUAppcast.h - NSMenuItemCell - NSButtonCell + NSObject IBFrameworkSource - AppKit.framework/Headers/NSMenuItemCell.h + Sparkle.framework/Headers/SUUpdater.h - NSMutableDictionary - NSDictionary - - - - NSMutableDictionary - - - - NSNumberFormatter - NSFormatter + NSView IBFrameworkSource - Foundation.framework/Headers/NSNumberFormatter.h + BWToolkitFramework.framework/Headers/NSView+BWAdditions.h - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Growl.framework/Headers/GrowlApplicationBridge.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebDownload.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebEditingDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebFrameLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebJavaPlugIn.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPlugin.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPluginContainer.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPolicyDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebResourceLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebScriptObject.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebUIDelegate.h - - - - NSObjectController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSObjectController.h - - - - NSOutlineView - NSTableView - - - - NSPanel - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSPanel.h - - - - NSPopUpButton - NSButton - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButton.h - - - - NSPopUpButtonCell - NSMenuItemCell - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButtonCell.h - - - - NSProgressIndicator - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSProgressIndicator.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSScroller - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSScroller.h - - - - NSSearchField - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSSearchField.h - - - - NSSearchFieldCell - NSTextFieldCell - - IBFrameworkSource - AppKit.framework/Headers/NSSearchFieldCell.h - - - - NSSecureTextField - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSSecureTextField.h - - - - NSSecureTextFieldCell - NSTextFieldCell - - - - NSSegmentedCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSSegmentedCell.h - - - - NSSegmentedControl - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSSegmentedControl.h - - - - NSSplitView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSSplitView.h - - - - NSStepper - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSStepper.h - - - - NSTabView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTabView.h - - - - NSTabViewItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTabViewItem.h - - - - NSTableColumn - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableColumn.h - - - - NSTableHeaderView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTableHeaderView.h - - - - NSTableView - NSControl - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSTextView - NSText - - IBFrameworkSource - AppKit.framework/Headers/NSTextView.h - - - - NSTreeController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSTreeController.h - - - - NSUserDefaultsController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSUserDefaultsController.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSView - - IBFrameworkSource - BWToolkitFramework.framework/Headers/NSView+BWAdditions.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - NSWindow + NSWindow IBFrameworkSource BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h - - NSWindowController - NSResponder - - showWindow: - id - - - IBFrameworkSource - AppKit.framework/Headers/NSWindowController.h - - - - WebView - NSView - - YES - - YES - goBack: - goForward: - makeTextLarger: - makeTextSmaller: - makeTextStandardSize: - reload: - reloadFromOrigin: - stopLoading: - takeStringURLFrom: - toggleContinuousSpellChecking: - toggleSmartInsertDelete: - - - YES - id - id - id - id - id - id - id - id - id - id - id - - - - IBFrameworkSource - WebKit.framework/Headers/WebView.h - - 0 diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 21153309..4ef2b1eb 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -2,7 +2,7 @@ 1050 - 10D573 + 10D2094 740 1038.29 460.00 @@ -12,7 +12,7 @@ YES - + YES @@ -1667,7 +1667,7 @@ - Show Create Table Syntax + Show Create Table Syntax... s 1572864 2147483647 @@ -2479,38 +2479,6 @@ 813 - - - export: - - - - 825 - - - - export: - - - - 826 - - - - export: - - - - 827 - - - - export: - - - - 828 - checkForUpdates: @@ -2951,6 +2919,38 @@ 1051 + + + exportTable: + + + + 1071 + + + + exportTable: + + + + 1072 + + + + exportTable: + + + + 1073 + + + + exportTable: + + + + 1074 + @@ -4838,7 +4838,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{449, 1007}, {197, 53}} - {{38, 903}, {511, 20}} + {{38, 836}, {511, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{506, 836}, {511, 20}} @@ -4848,7 +4848,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{667, 147}, {210, 133}} + {{379, 473}, {210, 133}} com.apple.InterfaceBuilder.CocoaPlugin {{399, 465}, {213, 93}} @@ -4858,7 +4858,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{783, 410}, {136, 43}} + {{589, 513}, {133, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4891,7 +4891,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{230, 610}, {251, 293}} + {{230, 543}, {251, 293}} com.apple.InterfaceBuilder.CocoaPlugin {{698, 703}, {184, 133}} @@ -4986,7 +4986,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{517, 403}, {279, 233}} + {{361, 603}, {292, 233}} com.apple.InterfaceBuilder.CocoaPlugin {{829, 663}, {268, 173}} com.apple.InterfaceBuilder.CocoaPlugin @@ -5013,7 +5013,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{428, 491}, {235, 333}} + {{144, 503}, {235, 333}} com.apple.InterfaceBuilder.CocoaPlugin {{180, 535}, {182, 253}} @@ -5021,7 +5021,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{914, 320}, {136, 43}} + {{589, 493}, {133, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5164,7 +5164,7 @@ - 1070 + 1074 @@ -6059,7 +6059,7 @@ id NSTabView id - id + NSWindow id NSButton id @@ -6111,49 +6111,6 @@ BWToolkitFramework.framework/Headers/BWAnchoredButtonBar.h - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - NSApplication @@ -6161,759 +6118,54 @@ BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h - - NSArrayController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSArrayController.h - - - - NSBox - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSBox.h - - - - NSBrowser - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSBrowser.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSDictionary - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSDictionary.h - - - - NSDictionary - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSDictionary - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSDocument - NSObject - - YES - - YES - printDocument: - revertDocumentToSaved: - runPageLayout: - saveDocument: - saveDocumentAs: - saveDocumentTo: - - - YES - id - id - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocument.h - - - - NSDocument - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentScripting.h - - - - NSDocumentController - NSObject - - YES - - YES - clearRecentDocuments: - newDocument: - openDocument: - saveAllDocuments: - - - YES - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentController.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMatrix - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSMatrix.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSMovieView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMovieView.h - - - - NSMutableDictionary - NSDictionary - - - - NSMutableDictionary - - NSObject IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h + Growl.framework/Headers/GrowlApplicationBridge.h - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - NSObject IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h + Sparkle.framework/Headers/SUAppcast.h NSObject - + IBFrameworkSource - AppKit.framework/Headers/NSDragging.h + Sparkle.framework/Headers/SUUpdater.h - NSObject + NSView IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h + BWToolkitFramework.framework/Headers/NSView+BWAdditions.h - NSObject + NSWindow IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h + BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h + SUUpdater + NSObject + + checkForUpdates: + id - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Growl.framework/Headers/GrowlApplicationBridge.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebDownload.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebEditingDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebFrameLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebJavaPlugIn.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPlugin.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPluginContainer.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPolicyDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebResourceLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebScriptObject.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebUIDelegate.h - - - - NSObjectController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSObjectController.h - - - - NSOutlineView - NSTableView - - - - NSPopUpButton - NSButton - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButton.h - - - - NSProgressIndicator - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSProgressIndicator.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSSearchField - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSSearchField.h - - - - NSSecureTextField - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSSecureTextField.h - - - - NSSplitView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSSplitView.h - - - - NSTabView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTabView.h - - - - NSTableView - NSControl - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextView - NSText - - IBFrameworkSource - AppKit.framework/Headers/NSTextView.h - - - - NSTreeController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSTreeController.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSView - - IBFrameworkSource - BWToolkitFramework.framework/Headers/NSView+BWAdditions.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - NSWindow - - IBFrameworkSource - BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h - - - - NSWindowController - NSResponder - - showWindow: - id - - - IBFrameworkSource - AppKit.framework/Headers/NSWindowController.h - - - - SUUpdater - NSObject - - checkForUpdates: - id - - - delegate - id + + delegate + id - - WebView - NSView - - YES - - YES - goBack: - goForward: - makeTextLarger: - makeTextSmaller: - makeTextStandardSize: - reload: - reloadFromOrigin: - stopLoading: - takeStringURLFrom: - toggleContinuousSpellChecking: - toggleSmartInsertDelete: - - - YES - id - id - id - id - id - id - id - id - id - id - id - - - - IBFrameworkSource - WebKit.framework/Headers/WebView.h - - 0 diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 93d00394..9edaca7a 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -21,12 +21,13 @@ YES + YES - com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -56,7 +57,7 @@ Preferences NSWindow - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {500, 0} @@ -65,7 +66,7 @@ {{0, 0}, {1920, 1178}} {500, 22} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -454,7 +455,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -3221,7 +3222,7 @@ AQAAAAA NSView - + 268 YES @@ -3915,8 +3916,8 @@ AQAAAAA YES -1538130368 - -2076048384 - 0.1 + 71435264 + @@ -3945,7 +3946,7 @@ AQAAAAA - + #.0 @@ -3960,7 +3961,7 @@ AQAAAAA NaN - + 3 @@ -4008,7 +4009,7 @@ AQAAAAA 1 - 0.10000000000000001 + 0.5 5 0.10000000000000001 YES @@ -4199,14 +4200,10 @@ AQAAAAA {500, 395} + NSView - - YES - SUSendProfileInfo - SUEnableAutomaticChecks - YES -- cgit v1.2.3 From d7ebbe9b1e17c69a35e7ff05b5fa265e180fcebf Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 3 May 2010 19:16:10 +0000 Subject: - Merge in fixes from trunk for final release - incoporates r2175, r2177, r2184, r2198, r2200, r2203, r2205 and r2206. --- Interfaces/English.lproj/UserManagerView.xib | 112 +++++++++++++++++---------- 1 file changed, 70 insertions(+), 42 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib index 36c8dd39..d28c0761 100644 --- a/Interfaces/English.lproj/UserManagerView.xib +++ b/Interfaces/English.lproj/UserManagerView.xib @@ -2,10 +2,10 @@ 1050 - 10C540 - 740 - 1038.25 - 458.00 + 10D2094 + 762 + 1038.29 + 460.00 YES @@ -15,18 +15,17 @@ YES - 740 - 1.2.2 + 762 + 1.2.5 YES - YES - com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit YES @@ -56,10 +55,10 @@ User Managment NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {752, 506} - + 256 YES @@ -148,7 +147,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -204,7 +203,6 @@ {{0, 17}, {194, 467}} - 4 @@ -238,7 +236,6 @@ {194, 17} - 4 @@ -247,7 +244,6 @@ {{0, 22}, {194, 484}} - 560 @@ -400,6 +396,7 @@ + 4 YES 1 YES @@ -435,7 +432,7 @@ General - + 256 YES @@ -564,7 +561,6 @@ {{10, 33}, {511, 414}} - General @@ -1398,7 +1394,7 @@ Schema Privileges - + 256 YES @@ -1480,7 +1476,6 @@ {{1, 17}, {130, 363}} - 4 @@ -1515,7 +1510,6 @@ {{1, 0}, {130, 17}} - 4 @@ -1524,7 +1518,6 @@ {{17, 17}, {132, 381}} - 562 @@ -1611,7 +1604,6 @@ {{1, 17}, {130, 363}} - 4 @@ -1645,7 +1637,6 @@ {{1, 0}, {130, 17}} - 4 @@ -1654,7 +1645,6 @@ {{157, 17}, {132, 381}} - 562 @@ -1740,7 +1730,6 @@ {{1, 17}, {130, 363}} - 4 @@ -1775,7 +1764,6 @@ {{1, 0}, {130, 17}} - 4 @@ -1784,7 +1772,6 @@ {{362, 17}, {132, 381}} - 562 @@ -1843,6 +1830,7 @@ {{10, 33}, {511, 414}} + Schema Privileges @@ -2119,13 +2107,13 @@ - + 0 YES YES - + @@ -2183,11 +2171,10 @@ {752, 506} - {{0, 0}, {1680, 1028}} {752, 528} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -2508,14 +2495,6 @@ 436 - - - delegate - - - - 447 - value: selection.select_priv @@ -4071,6 +4050,22 @@ 922 + + + delegate + + + + 924 + + + + refresh: + + + + 925 + @@ -5483,11 +5478,11 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{240, 174}, {752, 506}} + {{152, 121}, {752, 506}} com.apple.InterfaceBuilder.CocoaPlugin - {{240, 174}, {752, 506}} + {{152, 121}, {752, 506}} {752, 506} @@ -5601,7 +5596,7 @@ com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{511, 95}, {130, 81}} + {{202, 63}, {130, 81}} com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -5666,7 +5661,7 @@ - 923 + 925 @@ -5713,6 +5708,13 @@ Source/SPContentFilterManager.h + + NSObject + + IBProjectSource + Source/SPMainThreadTrampoline.h + + NSObject @@ -6626,6 +6628,7 @@ 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -6641,5 +6644,30 @@ YES ../../sequel-pro.xcodeproj 3 + + YES + + YES + NSActionTemplate + NSAddTemplate + NSLeftFacingTriangleTemplate + NSMenuCheckmark + NSMenuMixedState + NSRemoveTemplate + NSRightFacingTriangleTemplate + NSSwitch + + + YES + {10, 10} + {8, 8} + {9, 9} + {9, 8} + {7, 2} + {8, 8} + {9, 9} + {15, 15} + + -- cgit v1.2.3