From 2dbae24c7735ead0524bd9847af6ea99d8654ec6 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 14 May 2011 17:26:18 +0000 Subject: Bring outline view branch up to date with trunk (r3279:r3306). --- Interfaces/English.lproj/Preferences.xib | 265 ++++++++++++++++++++++++++----- 1 file changed, 222 insertions(+), 43 deletions(-) (limited to 'Interfaces/English.lproj/Preferences.xib') diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 5180d95e..ba0f7e68 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -2,10 +2,10 @@ 1050 - 10J567 - 823 + 10J869 + 851 1038.35 - 462.00 + 461.00 YES @@ -15,13 +15,15 @@ YES - 823 + 851 1.2.5 YES - + + + YES @@ -67,6 +69,44 @@ YES + + + YES + name + fav + host + user + database + socket + port + useSSH + sshHost + sshUser + sshPort + + selectedFavoritePassword + + DisplayTableViewVerticalGridlines + type + TableRowCountQueryLevel + sshKeyLocationEnabled + sshKeyLocation + useSSL + sslKeyFileLocation + sslKeyFileLocationEnabled + sslCertificateFileLocation + sslCertificateFileLocationEnabled + sslCACertFileLocation + sslCACertFileLocationEnabled + CustomQuerySoftIndentWidth + + YES + YES + + YES + YES + YES + 4107 2 @@ -499,7 +539,7 @@ {264, 296} - + 268 YES @@ -910,7 +950,7 @@ YES - 71433792 + -2076049856 2048 @@ -920,24 +960,13 @@ 400 75 - - YES - - - 1048576 - 2147483647 - - - _popUpItemAction: - - + YES OtherViews YES - YES -1 1 @@ -1357,7 +1386,6 @@ {580, 280} - NSView @@ -2089,7 +2117,7 @@ NSView - + 268 YES @@ -2231,18 +2259,18 @@ AQAAAAA YES YES - dateFormat_10_0 + dateStyle formatterBehavior - lenient + timeStyle YES - %a, %B %e, %Y %H:%M:%S - - + + + - %a, %B %e, %Y %H:%M:%S + EEEE, d MMMM yyyy HH:mm:ss NO @@ -2359,10 +2387,11 @@ AQAAAAA {580, 180} + NSView - + 268 YES @@ -2506,10 +2535,11 @@ AQAAAAA {580, 93} + NSView - + 268 YES @@ -3514,6 +3544,7 @@ AQAAAAA {580, 360} + NSView @@ -3616,6 +3647,46 @@ AQAAAAA {579, 51} NSView + + + + YES + + + Remove + + 2147483647 + + + + + + Duplicate + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + Make Default + + 2147483647 + + + + + @@ -3940,6 +4011,35 @@ AQAAAAA 680 + + + contentArray: values.favorites + + + + + + contentArray: values.favorites + contentArray + values.favorites + + YES + + YES + NSDeletesObjectsOnRemove + NSHandlesContentAsCompoundValue + + + YES + + + + + 2 + + + 782 + value: values.CustomQueryMaxHistoryItems @@ -4580,6 +4680,14 @@ AQAAAAA 1545 + + + delegate + + + + 1555 + value: values.SUSendProfileInfo @@ -4770,6 +4878,14 @@ AQAAAAA 2076 + + + updateDefaultFavorite: + + + + 2077 + defaultFavoritePopup @@ -5174,14 +5290,6 @@ AQAAAAA 2214 - - - updateDefaultFavorite: - - - - 2217 - @@ -5541,6 +5649,12 @@ AQAAAAA + + 254 + + + Favorites + 331 @@ -6764,6 +6878,34 @@ AQAAAAA + + 1547 + + + YES + + + + + + + Context Menu + + + 1548 + + + + + 1549 + + + + + 1551 + + + 1615 @@ -6788,6 +6930,11 @@ AQAAAAA + + 1640 + + + 1669 @@ -7372,6 +7519,7 @@ AQAAAAA 100.IBPluginDependency 100.ImportedFromIB2 101.IBPluginDependency + 102.IBDateFormatterBehaviorMetadataKey 102.IBPluginDependency 102.ImportedFromIB2 1034.IBPluginDependency @@ -7492,11 +7640,17 @@ AQAAAAA 1542.IBPluginDependency 1543.IBPluginDependency 1546.IBPluginDependency + 1547.IBEditorWindowLastContentRect + 1547.IBPluginDependency + 1548.IBPluginDependency + 1549.IBPluginDependency + 1551.IBPluginDependency 1615.IBPluginDependency 1615.ImportedFromIB2 1616.IBPluginDependency 1618.IBPluginDependency 1620.IBPluginDependency + 1640.IBPluginDependency 1669.IBAttributePlaceholdersKey 1669.IBPluginDependency 1670.IBPluginDependency @@ -7616,6 +7770,7 @@ AQAAAAA 24.IBPluginDependency 24.ImportedFromIB2 25.IBPluginDependency + 254.IBPluginDependency 26.IBEditorWindowLastContentRect 26.IBPluginDependency 26.ImportedFromIB2 @@ -7787,6 +7942,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -7907,11 +8063,17 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{508, 537}, {142, 73}} + 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 + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -7951,7 +8113,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{93, 644}, {580, 280}} + {{549, 529}, {580, 280}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8075,6 +8237,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{646, 14}, {276, 433}} com.apple.InterfaceBuilder.CocoaPlugin @@ -8180,7 +8343,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{283, 900}, {254, 6}} + {{646, 556}, {254, 6}} com.apple.InterfaceBuilder.CocoaPlugin {{381, 612}, {175, 53}} com.apple.InterfaceBuilder.CocoaPlugin @@ -8200,7 +8363,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{243, 481}, {580, 180}} + {{270, 481}, {580, 180}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8210,7 +8373,7 @@ AQAAAAA 0 - {{314, 726}, {580, 93}} + {{525, 913}, {580, 93}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8278,7 +8441,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{406, 257}, {580, 360}} + {{270, 496}, {580, 360}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8331,7 +8494,7 @@ AQAAAAA - 2217 + 2226 @@ -9047,6 +9210,14 @@ AQAAAAA BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h + + NSArrayController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSArrayController.h + + NSBox NSView @@ -9513,6 +9684,14 @@ AQAAAAA WebKit.framework/Headers/WebUIDelegate.h + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + NSPopUpButton NSButton -- cgit v1.2.3