diff options
| author | stuconnolly <stuart02@gmail.com> | 2010-03-31 16:43:52 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2010-03-31 16:43:52 +0000 |
| commit | 8d435e0e10c45bbd502730d6580fce4ffc7de77e (patch) | |
| tree | e916016a6e5ded07ddb7dc76ef3bdbcbea2fa6c4 | |
| parent | 097d8ea042e9545bce160fa3001d53fc74611537 (diff) | |
| download | sequelpro-8d435e0e10c45bbd502730d6580fce4ffc7de77e.tar.gz sequelpro-8d435e0e10c45bbd502730d6580fce4ffc7de77e.tar.bz2 sequelpro-8d435e0e10c45bbd502730d6580fce4ffc7de77e.zip | |
Manually set the connection favorites button bar delegate to ensure the split view delegate methods are called.
| -rw-r--r-- | Interfaces/English.lproj/Preferences.xib | 25 | ||||
| -rw-r--r-- | Source/SPPreferenceController.h | 4 | ||||
| -rw-r--r-- | Source/SPPreferenceController.m | 3 | ||||
| -rw-r--r-- | Source/SPQueryFavoriteManager.m | 2 |
4 files changed, 29 insertions, 5 deletions
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 6ff611c0..905b32ab 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -1605,6 +1605,8 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> <reference key="NSMixedImage" ref="720177216"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="858997662"/> </object> <object class="NSMenuItem" id="760230945"> <reference key="NSMenu" ref="978204089"/> @@ -1613,6 +1615,8 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> <reference key="NSMixedImage" ref="720177216"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="858997662"/> </object> <object class="NSMenuItem" id="334938006"> <reference key="NSMenu" ref="978204089"/> @@ -1621,6 +1625,8 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> <reference key="NSMixedImage" ref="720177216"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="858997662"/> </object> <object class="NSMenuItem" id="375388028"> <reference key="NSMenu" ref="978204089"/> @@ -1631,6 +1637,8 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> <reference key="NSMixedImage" ref="720177216"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="858997662"/> </object> <object class="NSMenuItem" id="140840656"> <reference key="NSMenu" ref="978204089"/> @@ -1639,13 +1647,14 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> <reference key="NSMixedImage" ref="720177216"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="858997662"/> </object> </object> </object> </object> </object> </object> - <int key="NSSelectedIndex">2</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -6484,6 +6493,14 @@ AQAAAAA</bytes> </object> <int key="connectionID">1611</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">splitViewButtonBar</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1068562664"/> + </object> + <int key="connectionID">1612</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -10049,7 +10066,7 @@ AQAAAAA</bytes> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{637, 464}, {500, 381}}</string> + <string>{{648, 147}, {500, 381}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10351,7 +10368,7 @@ AQAAAAA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">1611</int> + <int key="maxID">1612</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -10518,6 +10535,7 @@ AQAAAAA</bytes> <string>notificationsView</string> <string>preferencesWindow</string> <string>socketPasswordField</string> + <string>splitViewButtonBar</string> <string>sshPasswordField</string> <string>sshSQLPasswordField</string> <string>standardPasswordField</string> @@ -10546,6 +10564,7 @@ AQAAAAA</bytes> <string>NSView</string> <string>NSWindow</string> <string>NSSecureTextField</string> + <string>BWAnchoredButtonBar</string> <string>NSSecureTextField</string> <string>NSSecureTextField</string> <string>NSSecureTextField</string> diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h index 029993d9..9a6b3101 100644 --- a/Source/SPPreferenceController.h +++ b/Source/SPPreferenceController.h @@ -27,7 +27,7 @@ #import "SPConstants.h" -@class SPKeychain; +@class BWAnchoredButtonBar, SPKeychain; @interface SPPreferenceController : NSWindowController { @@ -62,6 +62,8 @@ IBOutlet NSTextField *editorFontName; IBOutlet NSTextField *globalResultTableFontName; + + IBOutlet BWAnchoredButtonBar *splitViewButtonBar; SPKeychain *keychain; NSDictionary *currentFavorite; diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index aae63224..bdb3ff5e 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -91,6 +91,9 @@ // Hide the tabs on the favorites tab view - left visible in IB for easy use [favoritesTabView setTabViewType:NSNoTabsNoBorder]; + + // Set the button bar delegate + [splitViewButtonBar setSplitViewDelegate:self]; [self updateDefaultFavoritePopup]; diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m index 9d30e597..2202bfd8 100644 --- a/Source/SPQueryFavoriteManager.m +++ b/Source/SPQueryFavoriteManager.m @@ -129,7 +129,7 @@ // Set Remove button state [removeButton setEnabled:([favoritesTableView numberOfSelectedRows] > 0)]; - // Set the button delegate + // Set the button bar delegate [splitViewButtonBar setSplitViewDelegate:self]; } |