diff options
| -rw-r--r-- | Interfaces/English.lproj/MainMenu.xib | 293 | ||||
| -rw-r--r-- | Interfaces/English.lproj/Preferences.xib | 754 | ||||
| -rw-r--r-- | Source/SPPreferenceController.m | 69 |
3 files changed, 490 insertions, 626 deletions
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 1cc2960d..21153309 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -2,10 +2,10 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> + <string key="IBDocument.SystemVersion">10D573</string> <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">460.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.object.0">740</string> @@ -1200,73 +1200,6 @@ <reference key="NSOnImage" ref="625762401"/> <reference key="NSMixedImage" ref="315854375"/> </object> - <object class="NSMenuItem" id="761247690"> - <reference key="NSMenu" ref="466354362"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="121425259"> - <reference key="NSMenu" ref="466354362"/> - <string key="NSTitle">Favorites</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="65194311"> - <string key="NSTitle">Favorites</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="467685932"> - <reference key="NSMenu" ref="65194311"/> - <string key="NSTitle">Sort By Name</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="326070376"> - <reference key="NSMenu" ref="65194311"/> - <string key="NSTitle">Sort By Host</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="836793492"> - <reference key="NSMenu" ref="65194311"/> - <string key="NSTitle">Sort By Type</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="826127767"> - <reference key="NSMenu" ref="65194311"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - <object class="NSMenuItem" id="587544115"> - <reference key="NSMenu" ref="65194311"/> - <string key="NSTitle">Reverse Sort Order</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="625762401"/> - <reference key="NSMixedImage" ref="315854375"/> - </object> - </object> - </object> - </object> <object class="NSMenuItem" id="486174990"> <reference key="NSMenu" ref="466354362"/> <bool key="NSIsDisabled">YES</bool> @@ -3018,38 +2951,6 @@ </object> <int key="connectionID">1051</int> </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">sortFavorites:</string> - <reference key="source" ref="63651044"/> - <reference key="destination" ref="467685932"/> - </object> - <int key="connectionID">1066</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">sortFavorites:</string> - <reference key="source" ref="63651044"/> - <reference key="destination" ref="326070376"/> - </object> - <int key="connectionID">1067</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">reverseFavoritesSortOrder:</string> - <reference key="source" ref="63651044"/> - <reference key="destination" ref="587544115"/> - </object> - <int key="connectionID">1068</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">sortFavorites:</string> - <reference key="source" ref="63651044"/> - <reference key="destination" ref="836793492"/> - </object> - <int key="connectionID">1070</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -4367,14 +4268,12 @@ <reference ref="998300902"/> <reference ref="358795349"/> <reference ref="173454563"/> - <reference ref="761247690"/> <reference ref="924530602"/> <reference ref="551338335"/> <reference ref="510805568"/> <reference ref="438779812"/> <reference ref="388367969"/> <reference ref="417888240"/> - <reference ref="121425259"/> <reference ref="486174990"/> </object> <reference key="parent" ref="401969940"/> @@ -4425,11 +4324,6 @@ <reference key="parent" ref="466354362"/> </object> <object class="IBObjectRecord"> - <int key="objectID">805</int> - <reference key="object" ref="761247690"/> - <reference key="parent" ref="466354362"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">791</int> <reference key="object" ref="924530602"/> <reference key="parent" ref="466354362"/> @@ -4460,57 +4354,10 @@ <reference key="parent" ref="466354362"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1058</int> - <reference key="object" ref="121425259"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="65194311"/> - </object> - <reference key="parent" ref="466354362"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1059</int> - <reference key="object" ref="65194311"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="467685932"/> - <reference ref="326070376"/> - <reference ref="826127767"/> - <reference ref="587544115"/> - <reference ref="836793492"/> - </object> - <reference key="parent" ref="121425259"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">1061</int> <reference key="object" ref="486174990"/> <reference key="parent" ref="466354362"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">1062</int> - <reference key="object" ref="467685932"/> - <reference key="parent" ref="65194311"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1063</int> - <reference key="object" ref="326070376"/> - <reference key="parent" ref="65194311"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1064</int> - <reference key="object" ref="826127767"/> - <reference key="parent" ref="65194311"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1065</int> - <reference key="object" ref="587544115"/> - <reference key="parent" ref="65194311"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1069</int> - <reference key="object" ref="836793492"/> - <reference key="parent" ref="65194311"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -4539,19 +4386,11 @@ <string>1047.IBPluginDependency</string> <string>1048.IBPluginDependency</string> <string>1050.IBPluginDependency</string> - <string>1058.IBPluginDependency</string> - <string>1059.IBEditorWindowLastContentRect</string> - <string>1059.IBPluginDependency</string> <string>106.IBEditorWindowLastContentRect</string> <string>106.IBPluginDependency</string> <string>106.ImportedFromIB2</string> <string>106.editorWindowContentRectSynchronizationRect</string> <string>1061.IBPluginDependency</string> - <string>1062.IBPluginDependency</string> - <string>1063.IBPluginDependency</string> - <string>1064.IBPluginDependency</string> - <string>1065.IBPluginDependency</string> - <string>1069.IBPluginDependency</string> <string>111.IBPluginDependency</string> <string>111.ImportedFromIB2</string> <string>129.IBPluginDependency</string> @@ -4804,7 +4643,6 @@ <string>791.IBPluginDependency</string> <string>794.IBPluginDependency</string> <string>797.IBPluginDependency</string> - <string>805.IBPluginDependency</string> <string>806.IBPluginDependency</string> <string>807.IBPluginDependency</string> <string>81.IBEditorWindowLastContentRect</string> @@ -4916,20 +4754,12 @@ <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>{{765, 481}, {180, 93}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{824, 199}, {204, 153}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{561, 605}, {181, 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> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -5008,7 +4838,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{449, 1007}, {197, 53}}</string> - <string>{{322, 824}, {511, 20}}</string> + <string>{{38, 903}, {511, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{506, 836}, {511, 20}}</string> @@ -5061,7 +4891,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{514, 501}, {251, 323}}</string> + <string>{{230, 610}, {251, 293}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{698, 703}, {184, 133}}</string> @@ -5183,7 +5013,6 @@ <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>{{428, 491}, {235, 333}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -5700,118 +5529,6 @@ <reference key="sourceIdentifier" ref="296977353"/> </object> <object class="IBPartialClassDescription"> - <string key="className">SPPreferenceController</string> - <string key="superclassName">NSWindowController</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>addFavorite:</string> - <string>changeFont:</string> - <string>displayAutoUpdatePreferences:</string> - <string>displayEditorPreferences:</string> - <string>displayFavoritePreferences:</string> - <string>displayGeneralPreferences:</string> - <string>displayNetworkPreferences:</string> - <string>displayNotificationPreferences:</string> - <string>displayTablePreferences:</string> - <string>duplicateFavorite:</string> - <string>favoriteTypeDidChange:</string> - <string>removeFavorite:</string> - <string>reverseFavoritesSortOrder:</string> - <string>setDefaultColors:</string> - <string>showCustomQueryFontPanel:</string> - <string>showGlobalResultTableFontPanel:</string> - <string>sortFavorites:</string> - <string>updateDefaultFavorite:</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> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>autoUpdateView</string> - <string>defaultFavoritePopup</string> - <string>editorFontName</string> - <string>editorView</string> - <string>favoriteHostTextField</string> - <string>favoriteHostTextFieldSSH</string> - <string>favoriteNameTextField</string> - <string>favoriteUserTextField</string> - <string>favoriteUserTextFieldSSH</string> - <string>favoriteUserTextFieldSocket</string> - <string>favoritesController</string> - <string>favoritesTabView</string> - <string>favoritesTableView</string> - <string>favoritesView</string> - <string>generalView</string> - <string>globalResultTableFontName</string> - <string>networkView</string> - <string>notificationsView</string> - <string>preferencesWindow</string> - <string>socketPasswordField</string> - <string>sshPasswordField</string> - <string>sshSQLPasswordField</string> - <string>standardPasswordField</string> - <string>tableCell</string> - <string>tablesView</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSView</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSView</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSArrayController</string> - <string>NSTabView</string> - <string>NSTableView</string> - <string>NSView</string> - <string>NSView</string> - <string>NSTextField</string> - <string>NSView</string> - <string>NSView</string> - <string>NSWindow</string> - <string>NSSecureTextField</string> - <string>NSSecureTextField</string> - <string>NSSecureTextField</string> - <string>NSSecureTextField</string> - <string>id</string> - <string>NSView</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPPreferenceController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">SPProcessListController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index b08bd332..6ff611c0 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -2,21 +2,30 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> + <string key="IBDocument.SystemVersion">10D573</string> <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">460.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">740</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.brandonwalkin.BWToolkit</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>740</string> + <string>1.2.2</string> + </object> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1547"/> - <integer value="406"/> + <integer value="402"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> @@ -1476,77 +1485,180 @@ <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="393737860"> + <object class="BWAnchoredButtonBar" id="1068562664"> <reference key="NSNextResponder" ref="984943037"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{62, -1}, {33, 25}}</string> - <reference key="NSSuperview" ref="984943037"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="318654291"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="393737860"/> - <int key="NSButtonFlags">-2042347265</int> - <int key="NSButtonFlags2">268435491</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_duplicate</string> + <int key="NSvFlags">290</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="364724557"> + <reference key="NSNextResponder" ref="1068562664"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{-1, -1}, {32, 25}}</string> + <reference key="NSSuperview" ref="1068562664"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="907732055"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSControlView" ref="364724557"/> + <int key="NSButtonFlags">-2041822977</int> + <int key="NSButtonFlags2">402653219</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_add</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent">a</string> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">d</string> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="995543573"> - <reference key="NSNextResponder" ref="984943037"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{0, -1}, {32, 25}}</string> - <reference key="NSSuperview" ref="984943037"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="445051430"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="995543573"/> - <int key="NSButtonFlags">-2042347265</int> - <int key="NSButtonFlags2">402653219</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_add</string> + <object class="BWAnchoredPopUpButton" id="669526663"> + <reference key="NSNextResponder" ref="1068562664"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{30, -1}, {32, 24}}</string> + <reference key="NSSuperview" ref="1068562664"/> + <bool key="NSEnabled">YES</bool> + <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="858997662"> + <int key="NSCellFlags">71433792</int> + <int key="NSCellFlags2">134219776</int> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSControlView" ref="669526663"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">134217891</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="943449800"> + <reference key="NSMenu" ref="792931395"/> + <bool key="NSIsHidden">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <object class="NSCustomResource" key="NSImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSActionTemplate</string> + </object> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="858997662"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="792931395"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="943449800"/> + <object class="NSMenuItem" id="393964112"> + <reference key="NSMenu" ref="792931395"/> + <string key="NSTitle">Remove</string> + <string type="base64-UTF8" key="NSKeyEquiv">CA</string> + <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="3479828"> + <reference key="NSMenu" ref="792931395"/> + <string key="NSTitle">Duplicate</string> + <string key="NSKeyEquiv">d</string> + <int key="NSKeyEquivModMask">1048576</int> + <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="594335870"> + <reference key="NSMenu" ref="792931395"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <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="14003497"> + <reference key="NSMenu" ref="792931395"/> + <string key="NSTitle">Sort By</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="978204089"> + <string key="NSTitle">Sort By</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="143086279"> + <reference key="NSMenu" ref="978204089"/> + <string key="NSTitle">Name</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + </object> + <object class="NSMenuItem" id="760230945"> + <reference key="NSMenu" ref="978204089"/> + <string key="NSTitle">Host</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + </object> + <object class="NSMenuItem" id="334938006"> + <reference key="NSMenu" ref="978204089"/> + <string key="NSTitle">Type</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + </object> + <object class="NSMenuItem" id="375388028"> + <reference key="NSMenu" ref="978204089"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + </object> + <object class="NSMenuItem" id="140840656"> + <reference key="NSMenu" ref="978204089"/> + <string key="NSTitle">Reverse Sort Order</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + </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> + <bool key="NSAltersState">YES</bool> + </object> </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">a</string> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> </object> - </object> - <object class="NSButton" id="432531937"> - <reference key="NSNextResponder" ref="984943037"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{31, -1}, {32, 25}}</string> + <string key="NSFrameSize">{197, 23}</string> <reference key="NSSuperview" ref="984943037"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="388903914"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="432531937"/> - <int key="NSButtonFlags">-2042347265</int> - <int key="NSButtonFlags2">35</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_remove</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> + <bool key="BWABBIsResizable">YES</bool> + <bool key="BWABBIsAtBottom">YES</bool> + <bool key="BWABBHandleIsRightAligned">NO</bool> + <int key="BWABBSelectedIndex">0</int> </object> <object class="NSScrollView" id="533802223"> <reference key="NSNextResponder" ref="984943037"/> @@ -1680,38 +1792,6 @@ <reference key="NSContentView" ref="253139122"/> <bytes key="NSScrollAmts">QSAAAEEgAABCPAAAQjwAAA</bytes> </object> - <object class="NSImageView" id="637055561"> - <reference key="NSNextResponder" ref="984943037"/> - <int key="NSvFlags">290</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>Apple PDF pasteboard type</string> - <string>Apple PICT pasteboard type</string> - <string>Apple PNG pasteboard type</string> - <string>NSFilenamesPboardType</string> - <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> - <string>NeXT TIFF v4.0 pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{95, 0}, {102, 23}}</string> - <reference key="NSSuperview" ref="984943037"/> - <bool key="NSEnabled">YES</bool> - <object class="NSImageCell" key="NSCell" id="578184809"> - <int key="NSCellFlags">130560</int> - <int key="NSCellFlags2">33554432</int> - <object class="NSCustomResource" key="NSContents"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_bar_spacer</string> - </object> - <int key="NSAlign">0</int> - <int key="NSScale">1</int> - <int key="NSStyle">0</int> - <bool key="NSAnimates">NO</bool> - </object> - <bool key="NSEditable">YES</bool> - </object> </object> <string key="NSFrameSize">{197, 381}</string> <reference key="NSSuperview" ref="141072039"/> @@ -4109,7 +4189,7 @@ AQAAAAA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="30395779"> <reference key="NSMenu" ref="982657201"/> - <string key="NSTitle">Remove Favorite</string> + <string key="NSTitle">Remove</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> @@ -4127,7 +4207,7 @@ AQAAAAA</bytes> </object> <object class="NSMenuItem" id="580038192"> <reference key="NSMenu" ref="982657201"/> - <string key="NSTitle">Duplicate Favorite</string> + <string key="NSTitle">Duplicate</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> @@ -4212,22 +4292,6 @@ AQAAAAA</bytes> <int key="connectionID">416</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: canAdd</string> - <reference key="source" ref="995543573"/> - <reference key="destination" ref="937123943"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="995543573"/> - <reference key="NSDestination" ref="937123943"/> - <string key="NSLabel">enabled: canAdd</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">canAdd</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">419</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">takeIntValueFrom:</string> <reference key="source" ref="479121914"/> @@ -4609,30 +4673,6 @@ AQAAAAA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">addFavorite:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="995543573"/> - </object> - <int key="connectionID">717</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">duplicateFavorite:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="393737860"/> - </object> - <int key="connectionID">718</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">removeFavorite:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="432531937"/> - </object> - <int key="connectionID">719</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">updateDefaultFavorite:</string> <reference key="source" ref="1001"/> <reference key="destination" ref="331339372"/> @@ -4640,38 +4680,6 @@ AQAAAAA</bytes> <int key="connectionID">720</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: canRemove</string> - <reference key="source" ref="432531937"/> - <reference key="destination" ref="937123943"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="432531937"/> - <reference key="NSDestination" ref="937123943"/> - <string key="NSLabel">enabled: canRemove</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">canRemove</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">771</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: canRemove</string> - <reference key="source" ref="393737860"/> - <reference key="destination" ref="937123943"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="393737860"/> - <reference key="NSDestination" ref="937123943"/> - <string key="NSLabel">enabled: canRemove</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">canRemove</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">772</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="415835787"/> @@ -6420,6 +6428,62 @@ AQAAAAA</bytes> </object> <int key="connectionID">1555</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">addFavorite:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="364724557"/> + </object> + <int key="connectionID">1605</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">removeFavorite:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="393964112"/> + </object> + <int key="connectionID">1606</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">duplicateFavorite:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="3479828"/> + </object> + <int key="connectionID">1607</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">sortFavorites:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="143086279"/> + </object> + <int key="connectionID">1608</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">sortFavorites:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="760230945"/> + </object> + <int key="connectionID">1609</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">sortFavorites:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="334938006"/> + </object> + <int key="connectionID">1610</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">reverseFavoritesSortOrder:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="140840656"/> + </object> + <int key="connectionID">1611</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -6833,11 +6897,8 @@ AQAAAAA</bytes> <reference key="object" ref="984943037"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="995543573"/> - <reference ref="432531937"/> - <reference ref="393737860"/> - <reference ref="637055561"/> <reference ref="533802223"/> + <reference ref="1068562664"/> </object> <reference key="parent" ref="141072039"/> </object> @@ -6855,62 +6916,6 @@ AQAAAAA</bytes> <reference key="parent" ref="141072039"/> </object> <object class="IBObjectRecord"> - <int key="objectID">392</int> - <reference key="object" ref="995543573"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="445051430"/> - </object> - <reference key="parent" ref="984943037"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">399</int> - <reference key="object" ref="445051430"/> - <reference key="parent" ref="995543573"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">393</int> - <reference key="object" ref="432531937"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="388903914"/> - </object> - <reference key="parent" ref="984943037"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">398</int> - <reference key="object" ref="388903914"/> - <reference key="parent" ref="432531937"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">394</int> - <reference key="object" ref="393737860"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="318654291"/> - </object> - <reference key="parent" ref="984943037"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">397</int> - <reference key="object" ref="318654291"/> - <reference key="parent" ref="393737860"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">395</int> - <reference key="object" ref="637055561"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="578184809"/> - </object> - <reference key="parent" ref="984943037"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">396</int> - <reference key="object" ref="578184809"/> - <reference key="parent" ref="637055561"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">406</int> <reference key="object" ref="533802223"/> <object class="NSMutableArray" key="children"> @@ -9090,6 +9095,128 @@ AQAAAAA</bytes> <reference key="object" ref="102426580"/> <reference key="parent" ref="982657201"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">1583</int> + <reference key="object" ref="1068562664"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="669526663"/> + <reference ref="364724557"/> + </object> + <reference key="parent" ref="984943037"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1584</int> + <reference key="object" ref="669526663"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="858997662"/> + </object> + <reference key="parent" ref="1068562664"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1586</int> + <reference key="object" ref="364724557"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="907732055"/> + </object> + <reference key="parent" ref="1068562664"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1587</int> + <reference key="object" ref="907732055"/> + <reference key="parent" ref="364724557"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1589</int> + <reference key="object" ref="858997662"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="792931395"/> + </object> + <reference key="parent" ref="669526663"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1590</int> + <reference key="object" ref="792931395"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="943449800"/> + <reference ref="3479828"/> + <reference ref="594335870"/> + <reference ref="14003497"/> + <reference ref="393964112"/> + </object> + <reference key="parent" ref="858997662"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1591</int> + <reference key="object" ref="943449800"/> + <reference key="parent" ref="792931395"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1592</int> + <reference key="object" ref="3479828"/> + <reference key="parent" ref="792931395"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1594</int> + <reference key="object" ref="594335870"/> + <reference key="parent" ref="792931395"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1597</int> + <reference key="object" ref="393964112"/> + <reference key="parent" ref="792931395"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1598</int> + <reference key="object" ref="14003497"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="978204089"/> + </object> + <reference key="parent" ref="792931395"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1599</int> + <reference key="object" ref="978204089"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="143086279"/> + <reference ref="760230945"/> + <reference ref="334938006"/> + <reference ref="375388028"/> + <reference ref="140840656"/> + </object> + <reference key="parent" ref="14003497"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1600</int> + <reference key="object" ref="143086279"/> + <reference key="parent" ref="978204089"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1601</int> + <reference key="object" ref="760230945"/> + <reference key="parent" ref="978204089"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1602</int> + <reference key="object" ref="334938006"/> + <reference key="parent" ref="978204089"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1603</int> + <reference key="object" ref="375388028"/> + <reference key="parent" ref="978204089"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1604</int> + <reference key="object" ref="140840656"/> + <reference key="parent" ref="978204089"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -9328,6 +9455,27 @@ AQAAAAA</bytes> <string>1548.IBPluginDependency</string> <string>1549.IBPluginDependency</string> <string>1551.IBPluginDependency</string> + <string>1583.IBPluginDependency</string> + <string>1584.IBAttributePlaceholdersKey</string> + <string>1584.IBPluginDependency</string> + <string>1586.IBAttributePlaceholdersKey</string> + <string>1586.IBPluginDependency</string> + <string>1587.IBPluginDependency</string> + <string>1589.IBPluginDependency</string> + <string>1590.IBEditorWindowLastContentRect</string> + <string>1590.IBPluginDependency</string> + <string>1591.IBPluginDependency</string> + <string>1592.IBPluginDependency</string> + <string>1594.IBPluginDependency</string> + <string>1597.IBPluginDependency</string> + <string>1598.IBPluginDependency</string> + <string>1599.IBEditorWindowLastContentRect</string> + <string>1599.IBPluginDependency</string> + <string>1600.IBPluginDependency</string> + <string>1601.IBPluginDependency</string> + <string>1602.IBPluginDependency</string> + <string>1603.IBPluginDependency</string> + <string>1604.IBPluginDependency</string> <string>17.IBEditorWindowLastContentRect</string> <string>17.IBPluginDependency</string> <string>17.IBUserGuides</string> @@ -9368,17 +9516,6 @@ AQAAAAA</bytes> <string>38.ImportedFromIB2</string> <string>39.IBPluginDependency</string> <string>39.ImportedFromIB2</string> - <string>392.IBAttributePlaceholdersKey</string> - <string>392.IBPluginDependency</string> - <string>393.IBAttributePlaceholdersKey</string> - <string>393.IBPluginDependency</string> - <string>394.IBAttributePlaceholdersKey</string> - <string>394.IBPluginDependency</string> - <string>395.IBPluginDependency</string> - <string>396.IBPluginDependency</string> - <string>397.IBPluginDependency</string> - <string>398.IBPluginDependency</string> - <string>399.IBPluginDependency</string> <string>40.IBPluginDependency</string> <string>40.ImportedFromIB2</string> <string>400.IBEditorWindowLastContentRect</string> @@ -9823,7 +9960,42 @@ AQAAAAA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{908, 461}, {175, 53}}</string> + <string>{{908, 461}, {116, 53}}</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.brandonwalkin.BWToolkit</string> + <object class="NSMutableDictionary"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="669526663"/> + <string key="toolTip">(⌥⎋)</string> + </object> + </object> + <string>com.brandonwalkin.BWToolkit</string> + <object class="NSMutableDictionary"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="364724557"/> + <string key="toolTip">Add Favorite (⌥⌘A)</string> + </object> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>{{656, 406}, {124, 81}}</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.brandonwalkin.BWToolkit</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>{{780, 333}, {180, 93}}</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> @@ -9875,41 +10047,9 @@ AQAAAAA</bytes> <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"> - <string key="name">ToolTip</string> - <reference key="object" ref="995543573"/> - <string key="toolTip">Add favorite (⌘⌥A)</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="432531937"/> - <string key="toolTip">Delete selected favorite(s)</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="393737860"/> - <string key="toolTip">Duplicate selected favorite (⌘D)</string> - </object> - </object> - <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> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{627, 350}, {500, 381}}</string> + <string>{{637, 464}, {500, 381}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10211,7 +10351,7 @@ AQAAAAA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">1555</int> + <int key="maxID">1611</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -10325,10 +10465,11 @@ AQAAAAA</bytes> <string>duplicateFavorite:</string> <string>favoriteTypeDidChange:</string> <string>removeFavorite:</string> - <string>saveFavorite:</string> + <string>reverseFavoritesSortOrder:</string> <string>setDefaultColors:</string> <string>showCustomQueryFontPanel:</string> <string>showGlobalResultTableFontPanel:</string> + <string>sortFavorites:</string> <string>updateDefaultFavorite:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -10350,6 +10491,7 @@ AQAAAAA</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -10443,6 +10585,30 @@ AQAAAAA</bytes> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> + <string key="className">BWAnchoredButtonBar</string> + <string key="superclassName">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredButtonBar.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">BWAnchoredPopUpButton</string> + <string key="superclassName">NSPopUpButton</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredPopUpButton.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">BWAnchoredPopUpButtonCell</string> + <string key="superclassName">NSPopUpButtonCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">BWToolkitFramework.framework/Headers/BWAnchoredPopUpButtonCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSActionCell</string> <string key="superclassName">NSCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -10581,22 +10747,6 @@ AQAAAAA</bytes> </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="693087342"> diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index 760a48b8..aae63224 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -43,9 +43,9 @@ @implementation SPPreferenceController -// ------------------------------------------------------------------------------- -// init -// ------------------------------------------------------------------------------- +/** + * init. + */ - (id)init { if (self = [super initWithWindowNibName:@"Preferences"]) { @@ -66,9 +66,9 @@ return self; } -// ------------------------------------------------------------------------------- -// windowDidLoad -// ------------------------------------------------------------------------------- +/** + * Sets up various interface controls once the window is loaded. + */ - (void)windowDidLoad { [self _setupToolbar]; @@ -102,12 +102,10 @@ #pragma mark - #pragma mark Preferences upgrade routine -// ------------------------------------------------------------------------------- -// applyRevisionChanges -// Checks the revision number, applies any preference upgrades, and updates to -// latest revision. -// Currently uses both lastUsedVersion and LastUsedVersion for <0.9.5 compatibility. -// ------------------------------------------------------------------------------- +/** + * Checks the revision number, applies any preference upgrades, and updates to latest revision. + * Currently uses both lastUsedVersion and LastUsedVersion for <0.9.5 compatibility. + */ - (void)applyRevisionChanges { NSInteger i; @@ -310,9 +308,9 @@ #pragma mark - #pragma mark IBAction methods -// ------------------------------------------------------------------------------- -// addFavorite: -// ------------------------------------------------------------------------------- +/** + * Adds a new connection favorite. + */ - (IBAction)addFavorite:(id)sender { NSNumber *favoriteid = [NSNumber numberWithInteger:[[NSString stringWithFormat:@"%f", [[NSDate date] timeIntervalSince1970]] hash]]; @@ -322,10 +320,11 @@ forKeys:[NSArray arrayWithObjects:@"name", @"type", @"host", @"socket", @"user", @"port", @"database", @"sshHost", @"sshUser", @"sshPort", @"id", nil]]; [favoritesController addObject:favorite]; - [favoritesController setSelectionIndex:[[favoritesController arrangedObjects] count]-1]; + [favoritesController setSelectedObjects:[NSArray arrayWithObject:favorite]]; [favoritesTableView reloadData]; [favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]]; + [self updateDefaultFavoritePopup]; favoriteNameFieldWasTouched = NO; @@ -333,9 +332,9 @@ [[self window] makeFirstResponder:favoriteHostTextField]; } -// ------------------------------------------------------------------------------- -// removeFavorite: -// ------------------------------------------------------------------------------- +/** + * Removes the selected connection favorite. + */ - (IBAction)removeFavorite:(id)sender { if ([favoritesTableView numberOfSelectedRows] == 1) { @@ -369,13 +368,14 @@ [favoritesController removeObjectAtArrangedObjectIndex:[favoritesTableView selectedRow]]; [favoritesTableView reloadData]; + [self updateDefaultFavoritePopup]; } } -// ------------------------------------------------------------------------------- -// duplicateFavorite: -// ------------------------------------------------------------------------------- +/** + * Duplicates the selected connection favorite. + */ - (IBAction)duplicateFavorite:(id)sender { if ([favoritesTableView numberOfSelectedRows] == 1) { @@ -410,29 +410,26 @@ password = nil, sshPassword = nil; [favoritesController addObject:favorite]; - [favoritesController setSelectionIndex:[[favoritesController arrangedObjects] count]-1]; + [favoritesController setSelectedObjects:[NSArray arrayWithObject:favorite]]; [favoritesTableView reloadData]; [favoritesTableView scrollRowToVisible:[favoritesTableView selectedRow]]; + [self updateDefaultFavoritePopup]; [[self window] makeFirstResponder:favoriteNameTextField]; } } -// ------------------------------------------------------------------------------- -// updateDefaultFavorite: -// ------------------------------------------------------------------------------- +/** + * Updates the default favorite. + */ - (IBAction)updateDefaultFavorite:(id)sender { - if ([defaultFavoritePopup indexOfSelectedItem] == 0) { - [prefs setBool:YES forKey:SPSelectLastFavoriteUsed]; - } else { - [prefs setBool:NO forKey:SPSelectLastFavoriteUsed]; + [prefs setBool:([defaultFavoritePopup indexOfSelectedItem] == 0) forKey:SPSelectLastFavoriteUsed]; - // Minus 2 from index to account for the "Last Used" and separator items - [prefs setInteger:[defaultFavoritePopup indexOfSelectedItem]-2 forKey:SPDefaultFavorite]; - } + // Minus 2 from index to account for the "Last Used" and separator items + [prefs setInteger:([defaultFavoritePopup indexOfSelectedItem] - 2) forKey:SPDefaultFavorite]; } /** @@ -1177,9 +1174,9 @@ #pragma mark - -// ------------------------------------------------------------------------------- -// dealloc -// ------------------------------------------------------------------------------- +/** + * Dealloc. + */ - (void)dealloc { if (keychain) [keychain release], keychain = nil; |