diff options
-rw-r--r-- | Interfaces/English.lproj/Preferences.xib | 486 | ||||
-rw-r--r-- | Resources/Images/blue-tick.tiff | bin | 0 -> 16400 bytes | |||
-rw-r--r-- | Source/SPConnectionController.h | 13 | ||||
-rw-r--r-- | Source/SPConnectionController.m | 85 | ||||
-rw-r--r-- | Source/SPPreferenceController.h | 1 | ||||
-rw-r--r-- | Source/SPPreferenceController.m | 147 | ||||
-rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 6 |
7 files changed, 533 insertions, 205 deletions
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 783e3cb4..cac10d23 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.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">10D573</string> - <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.SystemVersion">10F569</string> + <string key="IBDocument.InterfaceBuilderVersion">788</string> <string key="IBDocument.AppKitVersion">1038.29</string> - <string key="IBDocument.HIToolboxVersion">460.00</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -15,15 +15,14 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>762</string> + <string>788</string> <string>1.2.5</string> </object> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="802"/> - <integer value="512"/> - <integer value="56"/> + <integer value="1547"/> + <integer value="17"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -79,7 +78,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{201, 141}, {254, 26}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="562129977"> <int key="NSCellFlags">-2076049856</int> @@ -441,7 +439,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{202, 234}, {330, 18}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="964808674"> <int key="NSCellFlags">67239424</int> @@ -469,7 +466,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{11, 262}, {187, 17}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="996600667"> <int key="NSCellFlags">68288064</int> @@ -502,7 +498,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{201, 256}, {254, 26}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="406329678"> <int key="NSCellFlags">-2076049856</int> @@ -535,7 +530,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 105}, {182, 17}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="513222356"> <int key="NSCellFlags">68288064</int> @@ -552,7 +546,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 147}, {182, 17}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="163779676"> <int key="NSCellFlags">68288064</int> @@ -569,7 +562,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{202, 104}, {330, 18}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="530413242"> <int key="NSCellFlags">67239424</int> @@ -592,7 +584,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{202, 82}, {330, 18}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="218042555"> <int key="NSCellFlags">67239424</int> @@ -615,7 +606,6 @@ <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 176}, {326, 5}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -626,7 +616,7 @@ <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor"> + <object class="NSColor" key="NSColor" id="1714513"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MQA</bytes> </object> @@ -646,7 +636,6 @@ <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 128}, {326, 5}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -669,7 +658,6 @@ <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 73}, {326, 5}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -692,7 +680,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 43}, {181, 17}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="899935643"> <int key="NSCellFlags">68288064</int> @@ -709,7 +696,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{203, 40}, {38, 22}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="875775803"> <int key="NSCellFlags">-1804468671</int> @@ -786,7 +772,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{247, 43}, {286, 17}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="710086132"> <int key="NSCellFlags">68288064</int> @@ -803,7 +788,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{201, 189}, {254, 26}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="404009397"> <int key="NSCellFlags">-2076049856</int> @@ -927,7 +911,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 195}, {182, 17}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="840580273"> <int key="NSCellFlags">68288064</int> @@ -944,7 +927,6 @@ <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 224}, {326, 5}}</string> <reference key="NSSuperview" ref="594324362"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -965,11 +947,10 @@ </object> <string key="NSFrameSize">{550, 300}</string> <reference key="NSSuperview"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="395894064"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1513,11 +1494,10 @@ </object> </object> <string key="NSFrameSize">{550, 336}</string> - <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="593732956"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1541,7 +1521,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{-1, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="1068562664"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="907732055"> <int key="NSCellFlags">67239424</int> @@ -1566,7 +1545,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="1068562664"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="858997662"> <int key="NSCellFlags">71433792</int> @@ -1712,7 +1690,6 @@ </object> <string key="NSFrameSize">{217, 23}</string> <reference key="NSSuperview" ref="984943037"/> - <reference key="NSWindow"/> <bool key="BWABBIsResizable">YES</bool> <bool key="BWABBIsAtBottom">YES</bool> <bool key="BWABBHandleIsRightAligned">NO</bool> @@ -1733,7 +1710,6 @@ <int key="NSvFlags">4370</int> <string key="NSFrameSize">{218, 358}</string> <reference key="NSSuperview" ref="253139122"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -1744,7 +1720,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn" id="22246087"> <string key="NSIdentifier">name</string> - <double key="NSWidth">215</double> + <double key="NSWidth">192</double> <double key="NSMinWidth">40</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -1756,7 +1732,7 @@ <int key="NSColorSpace">3</int> <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> </object> - <object class="NSColor" key="NSTextColor"> + <object class="NSColor" key="NSTextColor" id="263643234"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">headerTextColor</string> @@ -1781,6 +1757,35 @@ <bool key="NSIsResizeable">YES</bool> <reference key="NSTableView" ref="279932544"/> </object> + <object class="NSTableColumn" id="764023792"> + <string key="NSIdentifier">default</string> + <double key="NSWidth">20</double> + <double key="NSMinWidth">20</double> + <double key="NSMaxWidth">20</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">headerColor</string> + <reference key="NSColor" ref="1714513"/> + </object> + <reference key="NSTextColor" ref="263643234"/> + </object> + <object class="NSImageCell" key="NSDataCell" id="53403050"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">33685504</int> + <reference key="NSSupport" ref="26"/> + <int key="NSAlign">0</int> + <int key="NSScale">0</int> + <int key="NSStyle">0</int> + <bool key="NSAnimates">NO</bool> + </object> + <reference key="NSTableView" ref="279932544"/> + </object> </object> <double key="NSIntercellSpacingWidth">3</double> <double key="NSIntercellSpacingHeight">2</double> @@ -1816,8 +1821,6 @@ </object> <string key="NSFrame">{{1, 1}, {218, 358}}</string> <reference key="NSSuperview" ref="533802223"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="279932544"/> <reference key="NSDocView" ref="279932544"/> <reference key="NSBGColor" ref="887465699"/> <int key="NScvFlags">4</int> @@ -1827,7 +1830,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{183, 1}, {11, 317}}</string> <reference key="NSSuperview" ref="533802223"/> - <reference key="NSWindow"/> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="533802223"/> <string key="NSAction">_doScroller:</string> @@ -1838,7 +1840,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {311, 15}}</string> <reference key="NSSuperview" ref="533802223"/> - <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="533802223"/> <string key="NSAction">_doScroller:</string> @@ -1847,8 +1848,6 @@ </object> <string key="NSFrame">{{-2, 22}, {220, 360}}</string> <reference key="NSSuperview" ref="984943037"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="253139122"/> <int key="NSsFlags">530</int> <reference key="NSVScroller" ref="940130901"/> <reference key="NSHScroller" ref="2545381"/> @@ -1858,7 +1857,6 @@ </object> <string key="NSFrameSize">{217, 381}</string> <reference key="NSSuperview" ref="141072039"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="343315962"> @@ -1871,7 +1869,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{-7, 34}, {352, 282}}</string> <reference key="NSSuperview" ref="343315962"/> - <reference key="NSWindow"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="912523923"> @@ -2223,7 +2220,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 59}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="882064965"> <int key="NSCellFlags">-1804468671</int> @@ -2241,7 +2237,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 33}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="996160392"> <int key="NSCellFlags">-1804468671</int> @@ -2259,7 +2254,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 85}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="782045166"> <int key="NSCellFlags">-1804468671</int> @@ -2277,7 +2271,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 7}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="160881703"> <int key="NSCellFlags">-1804468671</int> @@ -2296,7 +2289,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 61}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="544940669"> <int key="NSCellFlags">68288064</int> @@ -2313,7 +2305,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 35}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="26059905"> <int key="NSCellFlags">68288064</int> @@ -2330,7 +2321,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 87}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="642636551"> <int key="NSCellFlags">68288064</int> @@ -2347,7 +2337,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 9}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="646676137"> <int key="NSCellFlags">68288064</int> @@ -2364,7 +2353,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 153}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="98025404"> <int key="NSCellFlags">-1804468671</int> @@ -2383,7 +2371,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 180}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSecureTextFieldCell" key="NSCell" id="682598366"> <int key="NSCellFlags">343014976</int> @@ -2405,7 +2392,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 207}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="983072894"> <int key="NSCellFlags">-1804468671</int> @@ -2423,7 +2409,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 126}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1015235520"> <int key="NSCellFlags">-1804468671</int> @@ -2442,7 +2427,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{119, 234}, {165, 19}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="153943465"> <int key="NSCellFlags">-1804468671</int> @@ -2460,7 +2444,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 236}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="528636141"> <int key="NSCellFlags">68288064</int> @@ -2477,7 +2460,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 209}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1047551041"> <int key="NSCellFlags">68288064</int> @@ -2494,7 +2476,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 155}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="860519796"> <int key="NSCellFlags">68288064</int> @@ -2511,7 +2492,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 182}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="33269254"> <int key="NSCellFlags">68288064</int> @@ -2528,7 +2508,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 128}, {109, 14}}</string> <reference key="NSSuperview" ref="404987940"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="596887118"> <int key="NSCellFlags">68288064</int> @@ -2543,7 +2522,6 @@ </object> <string key="NSFrame">{{10, 7}, {317, 262}}</string> <reference key="NSSuperview" ref="961025550"/> - <reference key="NSWindow"/> </object> <string key="NSLabel">SSH</string> <reference key="NSColor" ref="700609571"/> @@ -2564,7 +2542,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{112, 342}, {200, 19}}</string> <reference key="NSSuperview" ref="343315962"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="570809913"> <int key="NSCellFlags">-1804468671</int> @@ -2582,7 +2559,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{9, 344}, {98, 14}}</string> <reference key="NSSuperview" ref="343315962"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="299715951"> <int key="NSCellFlags">68288064</int> @@ -2599,7 +2575,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{109, 313}, {206, 22}}</string> <reference key="NSSuperview" ref="343315962"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="658054386"> <int key="NSCellFlags">-2076049856</int> @@ -2666,7 +2641,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{9, 318}, {98, 14}}</string> <reference key="NSSuperview" ref="343315962"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="761091734"> <int key="NSCellFlags">68288064</int> @@ -2681,24 +2655,20 @@ </object> <string key="NSFrame">{{218, 0}, {332, 381}}</string> <reference key="NSSuperview" ref="141072039"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrameSize">{550, 381}</string> <reference key="NSSuperview" ref="593732956"/> - <reference key="NSWindow"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> </object> </object> <string key="NSFrameSize">{550, 381}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="1041614321"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2880,11 +2850,10 @@ </object> </object> <string key="NSFrameSize">{550, 229}</string> - <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="369742224"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2893,7 +2862,6 @@ <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 155}, {326, 5}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -2916,7 +2884,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{203, 101}, {329, 18}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="699261423"> <int key="NSCellFlags">67239424</int> @@ -2938,7 +2905,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{202, 164}, {330, 18}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="638010774"> <int key="NSCellFlags">67239424</int> @@ -2960,7 +2926,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{198, 32}, {178, 32}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="905416501"> <int key="NSCellFlags">67239424</int> @@ -2981,7 +2946,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 69}, {181, 17}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="32693158"> <int key="NSCellFlags">67239424</int> @@ -2998,7 +2962,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{201, 69}, {332, 17}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1046240552"> <int key="NSCellFlags">67239424</int> @@ -3056,7 +3019,6 @@ AQAAAAA</bytes> <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 92}, {326, 5}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -3079,7 +3041,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 131}, {181, 17}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="250240617"> <int key="NSCellFlags">67239424</int> @@ -3096,7 +3057,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{201, 125}, {172, 26}}</string> <reference key="NSSuperview" ref="369742224"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="526160091"> <int key="NSCellFlags">-2076049856</int> @@ -3163,12 +3123,10 @@ AQAAAAA</bytes> </object> </object> <string key="NSFrameSize">{550, 200}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="769132533"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3177,7 +3135,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{11, 76}, {188, 17}}</string> <reference key="NSSuperview" ref="769132533"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1057393276"> <int key="NSCellFlags">67239488</int> @@ -3194,7 +3151,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{202, 38}, {330, 18}}</string> <reference key="NSSuperview" ref="769132533"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="151662644"> <int key="NSCellFlags">-2080244224</int> @@ -3217,7 +3173,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{204, 73}, {50, 22}}</string> <reference key="NSSuperview" ref="769132533"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="170658213"> <int key="NSCellFlags">-1804468671</int> @@ -3280,7 +3235,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{259, 76}, {274, 17}}</string> <reference key="NSSuperview" ref="769132533"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="619604330"> <int key="NSCellFlags">67239488</int> @@ -3297,7 +3251,6 @@ AQAAAAA</bytes> <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 62}, {326, 5}}</string> <reference key="NSSuperview" ref="769132533"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -3317,12 +3270,10 @@ AQAAAAA</bytes> </object> </object> <string key="NSFrameSize">{550, 113}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="1033452264"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4300,7 +4251,6 @@ AQAAAAA</bytes> </object> </object> <string key="NSFrameSize">{550, 415}</string> - <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="151174232"> @@ -4349,6 +4299,14 @@ AQAAAAA</bytes> <reference key="NSOnImage" ref="1039721224"/> <reference key="NSMixedImage" ref="720177216"/> </object> + <object class="NSMenuItem" id="580038192"> + <reference key="NSMenu" ref="982657201"/> + <string key="NSTitle">Duplicate</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1039721224"/> + <reference key="NSMixedImage" ref="720177216"/> + </object> <object class="NSMenuItem" id="102426580"> <reference key="NSMenu" ref="982657201"/> <bool key="NSIsDisabled">YES</bool> @@ -4359,9 +4317,9 @@ AQAAAAA</bytes> <reference key="NSOnImage" ref="1039721224"/> <reference key="NSMixedImage" ref="720177216"/> </object> - <object class="NSMenuItem" id="580038192"> + <object class="NSMenuItem" id="512106570"> <reference key="NSMenu" ref="982657201"/> - <string key="NSTitle">Duplicate</string> + <string key="NSTitle">Make Default</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1039721224"/> @@ -6682,6 +6640,14 @@ AQAAAAA</bytes> </object> <int key="connectionID">1635</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">makeSelectedFavoriteDefault:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="512106570"/> + </object> + <int key="connectionID">1641</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -7137,6 +7103,7 @@ AQAAAAA</bytes> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="22246087"/> + <reference ref="764023792"/> </object> <reference key="parent" ref="533802223"/> </object> @@ -9271,6 +9238,7 @@ AQAAAAA</bytes> <reference ref="30395779"/> <reference ref="580038192"/> <reference ref="102426580"/> + <reference ref="512106570"/> </object> <reference key="parent" ref="0"/> <string key="objectName">Context Menu</string> @@ -9436,6 +9404,25 @@ AQAAAAA</bytes> <reference key="object" ref="185366293"/> <reference key="parent" ref="369742224"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">1636</int> + <reference key="object" ref="764023792"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="53403050"/> + </object> + <reference key="parent" ref="279932544"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1639</int> + <reference key="object" ref="53403050"/> + <reference key="parent" ref="764023792"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1640</int> + <reference key="object" ref="512106570"/> + <reference key="parent" ref="982657201"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -9699,6 +9686,9 @@ AQAAAAA</bytes> <string>1616.IBPluginDependency</string> <string>1618.IBPluginDependency</string> <string>1620.IBPluginDependency</string> + <string>1636.IBPluginDependency</string> + <string>1639.IBPluginDependency</string> + <string>1640.IBPluginDependency</string> <string>17.IBEditorWindowLastContentRect</string> <string>17.IBPluginDependency</string> <string>17.IBUserGuides</string> @@ -10182,7 +10172,7 @@ AQAAAAA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{908, 461}, {116, 53}}</string> + <string>{{508, 537}, {142, 73}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10227,6 +10217,9 @@ AQAAAAA</bytes> <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>{{221, 105}, {550, 300}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> @@ -10276,7 +10269,7 @@ AQAAAAA</bytes> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{379, 167}, {550, 381}}</string> + <string>{{320, 417}, {550, 381}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10578,7 +10571,7 @@ AQAAAAA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">1635</int> + <int key="maxID">1641</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -10674,6 +10667,13 @@ AQAAAAA</bytes> <string key="NS.key.0">toggleCollapse:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">toggleCollapse:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">toggleCollapse:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPTablesList.h</string> @@ -10712,6 +10712,7 @@ AQAAAAA</bytes> <string>displayTablePreferences:</string> <string>duplicateFavorite:</string> <string>favoriteTypeDidChange:</string> + <string>makeSelectedFavoriteDefault:</string> <string>removeFavorite:</string> <string>reverseFavoritesSortOrder:</string> <string>setDefaultColors:</string> @@ -10740,6 +10741,111 @@ AQAAAAA</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>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>makeSelectedFavoriteDefault:</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> + <object class="IBActionInfo"> + <string key="name">addFavorite:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">changeFont:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">displayAutoUpdatePreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">displayEditorPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">displayFavoritePreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">displayGeneralPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">displayNetworkPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">displayNotificationPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">displayTablePreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">duplicateFavorite:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">favoriteTypeDidChange:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">makeSelectedFavoriteDefault:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">removeFavorite:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">reverseFavoritesSortOrder:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">setDefaultColors:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showCustomQueryFontPanel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showGlobalResultTableFontPanel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">sortFavorites:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">updateDefaultFavorite:</string> + <string key="candidateClassName">id</string> + </object> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -10803,6 +10909,145 @@ AQAAAAA</bytes> <string>NSView</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>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>splitViewButtonBar</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> + <object class="IBToOneOutletInfo"> + <string key="name">autoUpdateView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">defaultFavoritePopup</string> + <string key="candidateClassName">NSPopUpButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">editorFontName</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">editorView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoriteHostTextField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoriteHostTextFieldSSH</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoriteNameTextField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoriteUserTextField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoriteUserTextFieldSSH</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoriteUserTextFieldSocket</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoritesController</string> + <string key="candidateClassName">NSArrayController</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoritesTabView</string> + <string key="candidateClassName">NSTabView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoritesTableView</string> + <string key="candidateClassName">NSTableView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">favoritesView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">generalView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">globalResultTableFontName</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">networkView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">notificationsView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">preferencesWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">socketPasswordField</string> + <string key="candidateClassName">NSSecureTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">splitViewButtonBar</string> + <string key="candidateClassName">BWAnchoredButtonBar</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordField</string> + <string key="candidateClassName">NSSecureTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshSQLPasswordField</string> + <string key="candidateClassName">NSSecureTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">standardPasswordField</string> + <string key="candidateClassName">NSSecureTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">tableCell</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">tablesView</string> + <string key="candidateClassName">NSView</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPPreferenceController.h</string> @@ -10825,10 +11070,24 @@ AQAAAAA</bytes> <string key="NS.key.0">checkForUpdates:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">checkForUpdates:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">checkForUpdates:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">delegate</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">delegate</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">delegate</string> + <string key="candidateClassName">id</string> + </object> + </object> <reference key="sourceIdentifier" ref="211715013"/> </object> </object> @@ -10997,6 +11256,14 @@ 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">NSMenu</string> <string key="superclassName">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="693087342"> @@ -11581,6 +11848,13 @@ AQAAAAA</bytes> <string key="NS.key.0">showWindow:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">showWindow:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">showWindow:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> @@ -11593,10 +11867,24 @@ AQAAAAA</bytes> <string key="NS.key.0">checkForUpdates:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">checkForUpdates:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">checkForUpdates:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">delegate</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">delegate</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">delegate</string> + <string key="candidateClassName">id</string> + </object> + </object> <reference key="sourceIdentifier" ref="112051878"/> </object> </object> diff --git a/Resources/Images/blue-tick.tiff b/Resources/Images/blue-tick.tiff Binary files differnew file mode 100644 index 00000000..c1264c64 --- /dev/null +++ b/Resources/Images/blue-tick.tiff diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index aa45b74d..6d1f23ed 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -46,6 +46,12 @@ @end +@interface SPFlippedView : NSView + +- (BOOL)isFlipped; + +@end + @interface SPConnectionController : NSObject { id delegate; @@ -111,7 +117,6 @@ BOOL reverseFavoritesSort; SPFavoritesSortItem previousSortItem, currentSortItem; - } @property (readwrite, assign) id delegate; @@ -164,9 +169,3 @@ - (void)splitViewDidResizeSubviews:(NSNotification *)aNotification; @end - -@interface SPFlippedView: NSView - -- (BOOL)isFlipped; - -@end diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index ad2bdf62..ee3bb724 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -58,6 +58,8 @@ @synthesize connectionSSHKeychainItemName; @synthesize connectionSSHKeychainItemAccount; +#pragma mark - + /** * Initialise the connection controller, linking it to the * parent document and setting up the parent window. @@ -682,6 +684,9 @@ } +/** + * + */ - (void)reverseSortFavorites:(id)sender { reverseFavoritesSort = (![sender state]); @@ -694,42 +699,6 @@ [sender setState:reverseFavoritesSort]; } -- (void)_sortFavorites -{ - NSString *sortKey = @""; - - switch (currentSortItem) - { - case SPFavoritesSortNameItem: - sortKey = @"name"; - break; - case SPFavoritesSortHostItem: - sortKey = @"host"; - break; - case SPFavoritesSortTypeItem: - sortKey = @"type"; - break; - default: - sortKey = @"name"; - break; - } - - NSSortDescriptor *sortDescriptor = nil; - - if (currentSortItem == SPFavoritesSortTypeItem) { - sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:(!reverseFavoritesSort)] autorelease]; - } - else { - sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:(!reverseFavoritesSort) selector:@selector(caseInsensitiveCompare:)] autorelease]; - } - NSDictionary *first = [[favorites objectAtIndex:0] retain]; - [favorites removeObjectAtIndex:0]; - [favorites sortUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]]; - [favorites insertObject:first atIndex:0]; - [favoritesTable reloadData]; - [first release]; - -} /** * Updates the local favorites array from the user defaults */ @@ -1084,6 +1053,7 @@ #pragma mark - #pragma mark Menu Validation + -(BOOL)validateMenuItem:(NSMenuItem *)menuItem { SEL action = [menuItem action]; @@ -1103,6 +1073,49 @@ return YES; } + +#pragma mark - +#pragma mark Private API + +- (void)_sortFavorites +{ + NSString *sortKey = @""; + + switch (currentSortItem) + { + case SPFavoritesSortNameItem: + sortKey = @"name"; + break; + case SPFavoritesSortHostItem: + sortKey = @"host"; + break; + case SPFavoritesSortTypeItem: + sortKey = @"type"; + break; + default: + sortKey = @"name"; + break; + } + + NSSortDescriptor *sortDescriptor = nil; + + if (currentSortItem == SPFavoritesSortTypeItem) { + sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:(!reverseFavoritesSort)] autorelease]; + } + else { + sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:sortKey ascending:(!reverseFavoritesSort) selector:@selector(caseInsensitiveCompare:)] autorelease]; + } + + NSDictionary *first = [[favorites objectAtIndex:0] retain]; + + [favorites removeObjectAtIndex:0]; + [favorites sortUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]]; + [favorites insertObject:first atIndex:0]; + [favoritesTable reloadData]; + + [first release]; +} + @end #pragma mark - diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h index 6d72fc1d..c2b4b18a 100644 --- a/Source/SPPreferenceController.h +++ b/Source/SPPreferenceController.h @@ -100,6 +100,7 @@ - (IBAction)setDefaultColors:(id)sender; - (IBAction)sortFavorites:(id)sender; - (IBAction)reverseFavoritesSortOrder:(id)sender; +- (IBAction)makeSelectedFavoriteDefault:(id)sender; // Toolbar item IBAction methods - (IBAction)displayGeneralPreferences:(id)sender; diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index 518952f5..66dc2597 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -484,6 +484,19 @@ [sender setState:reverseFavoritesSort]; } +/** + * Makes the selected favorite the default. + */ +- (IBAction)makeSelectedFavoriteDefault:(id)sender +{ + // Minus 2 from index to account for the "Last Used" and separator items + [prefs setInteger:[favoritesTableView selectedRow] forKey:SPDefaultFavorite]; + + [favoritesTableView reloadData]; + + [self updateDefaultFavoritePopup]; +} + #pragma mark - #pragma mark Toolbar item IBAction methods @@ -597,9 +610,14 @@ // ------------------------------------------------------------------------------- // tableView:objectValueForTableColumn:row: // ------------------------------------------------------------------------------- -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex { - return [[[favoritesController arrangedObjects] objectAtIndex:rowIndex] objectForKey:[aTableColumn identifier]]; + if ([[tableColumn identifier] isEqualToString:@"default"] && (rowIndex == [prefs integerForKey:SPDefaultFavorite])) { + return [NSImage imageNamed:@"blue-tick"]; + } + else { + return [[[favoritesController arrangedObjects] objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]]; + } } #pragma mark - @@ -695,9 +713,11 @@ { if ([cell isKindOfClass:[SPFavoriteTextFieldCell class]]) { [cell setFavoriteName:[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"name"]]; + if ([[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"type"] integerValue] == SPSocketConnection) { [cell setFavoriteHost:@"localhost"]; - } else { + } + else { [cell setFavoriteHost:[[[favoritesController arrangedObjects] objectAtIndex:index] objectForKey:@"host"]]; } } @@ -1046,37 +1066,37 @@ if ([contextInfo isEqualToString:@"removeFavorite"]) { if (returnCode == NSAlertDefaultReturn) { - // Get selected favorite's details - NSString *name = [favoritesController valueForKeyPath:@"selection.name"]; - NSString *user = [favoritesController valueForKeyPath:@"selection.user"]; - NSString *host = [favoritesController valueForKeyPath:@"selection.host"]; - NSString *database = [favoritesController valueForKeyPath:@"selection.database"]; - NSString *sshUser = [favoritesController valueForKeyPath:@"selection.sshUser"]; - NSString *sshHost = [favoritesController valueForKeyPath:@"selection.sshHost"]; - NSString *favoriteid = [favoritesController valueForKeyPath:@"selection.id"]; - NSInteger type = [[favoritesController valueForKeyPath:@"selection.type"] integerValue]; - - // Remove passwords from the Keychain - [keychain deletePasswordForName:[keychain nameForFavoriteName:name id:favoriteid] - account:[keychain accountForUser:user host:((type == SPSocketConnection)?@"localhost":host) database:database]]; - [keychain deletePasswordForName:[keychain nameForSSHForFavoriteName:name id:favoriteid] - account:[keychain accountForSSHUser:sshUser sshHost:sshHost]]; - - // Reset last used favorite - if ([favoritesTableView selectedRow] == [prefs integerForKey:SPLastFavoriteIndex]) { - [prefs setInteger:0 forKey:SPLastFavoriteIndex]; - } - - // Reset default favorite - if ([favoritesTableView selectedRow] == [prefs integerForKey:SPDefaultFavorite]) { - [prefs setInteger:[prefs integerForKey:SPLastFavoriteIndex] forKey:SPDefaultFavorite]; - } + // Get selected favorite's details + NSString *name = [favoritesController valueForKeyPath:@"selection.name"]; + NSString *user = [favoritesController valueForKeyPath:@"selection.user"]; + NSString *host = [favoritesController valueForKeyPath:@"selection.host"]; + NSString *database = [favoritesController valueForKeyPath:@"selection.database"]; + NSString *sshUser = [favoritesController valueForKeyPath:@"selection.sshUser"]; + NSString *sshHost = [favoritesController valueForKeyPath:@"selection.sshHost"]; + NSString *favoriteid = [favoritesController valueForKeyPath:@"selection.id"]; + NSInteger type = [[favoritesController valueForKeyPath:@"selection.type"] integerValue]; + + // Remove passwords from the Keychain + [keychain deletePasswordForName:[keychain nameForFavoriteName:name id:favoriteid] + account:[keychain accountForUser:user host:((type == SPSocketConnection)?@"localhost":host) database:database]]; + [keychain deletePasswordForName:[keychain nameForSSHForFavoriteName:name id:favoriteid] + account:[keychain accountForSSHUser:sshUser sshHost:sshHost]]; + + // Reset last used favorite + if ([favoritesTableView selectedRow] == [prefs integerForKey:SPLastFavoriteIndex]) { + [prefs setInteger:0 forKey:SPLastFavoriteIndex]; + } + + // Reset default favorite + if ([favoritesTableView selectedRow] == [prefs integerForKey:SPDefaultFavorite]) { + [prefs setInteger:[prefs integerForKey:SPLastFavoriteIndex] forKey:SPDefaultFavorite]; + } - [favoritesController removeObjectAtArrangedObjectIndex:[favoritesTableView selectedRow]]; - - [favoritesTableView reloadData]; - - [self updateDefaultFavoritePopup]; + [favoritesController removeObjectAtArrangedObjectIndex:[favoritesTableView selectedRow]]; + + [favoritesTableView reloadData]; + + [self updateDefaultFavoritePopup]; } } } @@ -1105,7 +1125,7 @@ // // Build the default favorite popup button // ------------------------------------------------------------------------------- -- (void)updateDefaultFavoritePopup; +- (void)updateDefaultFavoritePopup { [defaultFavoritePopup removeAllItems]; @@ -1113,27 +1133,29 @@ [defaultFavoritePopup addItemWithTitle:@"Last Used"]; [[defaultFavoritePopup menu] addItem:[NSMenuItem separatorItem]]; - NSInteger i; - for(i=0; i<[[[favoritesController arrangedObjects] valueForKeyPath:@"name"] count]; i++ ){ - NSMenuItem *favoritePrefMenuItem = [[NSMenuItem alloc] initWithTitle:[[[favoritesController arrangedObjects] valueForKeyPath:@"name"] objectAtIndex:i] - action:NULL - keyEquivalent:@"" ]; - [[defaultFavoritePopup menu] addItem:favoritePrefMenuItem]; - [favoritePrefMenuItem release]; + // Add all favorites to the menu + for (NSString *favorite in [[favoritesController arrangedObjects] valueForKeyPath:@"name"]) + { + NSMenuItem *favoriteMenuItem = [[NSMenuItem alloc] initWithTitle:favorite action:NULL keyEquivalent:@""]; + + [[defaultFavoritePopup menu] addItem:favoriteMenuItem]; + + [favoriteMenuItem release]; } // Add item to switch to edit favorites pane [[defaultFavoritePopup menu] addItem:[NSMenuItem separatorItem]]; - [defaultFavoritePopup addItemWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item")]; - [[[defaultFavoritePopup menu] itemWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item")] setAction:@selector(displayFavoritePreferences:)]; - [[[defaultFavoritePopup menu] itemWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item")] setTarget:self]; + + NSMenuItem *editMenuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item") action:@selector(displayFavoritePreferences:) keyEquivalent:@""]; + + [editMenuItem setTarget:self]; + + [[defaultFavoritePopup menu] addItem:editMenuItem]; + + [editMenuItem release]; // Select the default favorite from prefs - if (![prefs boolForKey:SPSelectLastFavoriteUsed]) { - [defaultFavoritePopup selectItemAtIndex:[prefs integerForKey:SPDefaultFavorite] + 2]; - } else { - [defaultFavoritePopup selectItemAtIndex:0]; - } + [defaultFavoritePopup selectItemAtIndex:(![prefs boolForKey:SPSelectLastFavoriteUsed]) ? ([prefs integerForKey:SPDefaultFavorite] + 2) : 0]; } // ------------------------------------------------------------------------------- @@ -1221,6 +1243,10 @@ return ([favoritesTableView numberOfSelectedRows] > 0); } + if (action == @selector(makeSelectedFavoriteDefault:)) { + return ([favoritesTableView numberOfSelectedRows] == 1); + } + if ((action == @selector(sortFavorites:)) || (action == @selector(reverseFavoritesSortOrder:))) { // Loop all the items in the sort by menu only checking the currently selected one @@ -1254,11 +1280,8 @@ [super dealloc]; } -@end - #pragma mark - - -@implementation SPPreferenceController (PrivateAPI) +#pragma mark Private API // ------------------------------------------------------------------------------- // _setupToolbar @@ -1347,7 +1370,7 @@ * Sorts the connection favorites based on the selected criteria. */ - (void)_sortFavorites -{ +{ NSString *sortKey = @""; switch (currentSortItem) @@ -1378,16 +1401,16 @@ [favoritesController setSortDescriptors:[NSArray arrayWithObject:sortDescriptor]]; [favoritesTableView reloadData]; + + [self updateDefaultFavoritePopup]; } -// ------------------------------------------------------------------------------- -// _resizeWindowForContentView: -// -// Resizes the window to the size of the supplied view. -// ------------------------------------------------------------------------------- +/** + * Resizes the window to the size of the supplied view. + */ - (void)_resizeWindowForContentView:(NSView *)view { - // remove all current views + // Remove all current views NSEnumerator *en = [[[preferencesWindow contentView] subviews] objectEnumerator]; NSView *subview; @@ -1396,10 +1419,10 @@ [subview removeFromSuperview]; } - // resize window + // Resize window [preferencesWindow resizeForContentView:view titleBarVisible:YES]; - // add view + // Add view [[preferencesWindow contentView] addSubview:view]; [view setFrameOrigin:NSMakePoint(0, 0)]; } diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index d29903bf..823ed7d2 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -87,6 +87,7 @@ 17CC97F310B4ABE90034CD7A /* SPAboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17CC97F210B4ABE90034CD7A /* SPAboutController.m */; }; 17CC97F710B4AC6C0034CD7A /* AboutPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17CC97F510B4AC6C0034CD7A /* AboutPanel.xib */; }; 17CC993B10B4C9C80034CD7A /* License.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 17CC993A10B4C9C80034CD7A /* License.rtf */; }; + 17D3649811DFE61B00CC9413 /* blue-tick.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17D3649711DFE61B00CC9413 /* blue-tick.tiff */; }; 17DCC5C7115C202700F89A00 /* MCPStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 17DCC5C5115C202700F89A00 /* MCPStringAdditions.h */; }; 17DD52B7115071D0007D8950 /* sequel-pro-print-template.html in Resources */ = {isa = PBXBuildFile; fileRef = 17DD52B6115071D0007D8950 /* sequel-pro-print-template.html */; }; 17DD52B911507217007D8950 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 17DD52B811507217007D8950 /* Credits.rtf */; }; @@ -547,6 +548,7 @@ 17CC97F210B4ABE90034CD7A /* SPAboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPAboutController.m; sourceTree = "<group>"; }; 17CC97F610B4AC6C0034CD7A /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Interfaces/English.lproj/AboutPanel.xib; sourceTree = "<group>"; }; 17CC993A10B4C9C80034CD7A /* License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = License.rtf; sourceTree = "<group>"; }; + 17D3649711DFE61B00CC9413 /* blue-tick.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "blue-tick.tiff"; sourceTree = "<group>"; }; 17DA04EA0FC1A7DA00D66140 /* Unit Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Unit Tests-Info.plist"; sourceTree = "<group>"; }; 17DCC5C5115C202700F89A00 /* MCPStringAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCPStringAdditions.h; sourceTree = "<group>"; }; 17DD52B6115071D0007D8950 /* sequel-pro-print-template.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "sequel-pro-print-template.html"; sourceTree = "<group>"; }; @@ -1594,6 +1596,8 @@ 17E6418B0EF01FF7001BC333 /* Images */ = { isa = PBXGroup; children = ( + 17BFC80D10D3FF5200A3B112 /* Icons */, + 17D3649711DFE61B00CC9413 /* blue-tick.tiff */, BCCDED62115940CB00285E65 /* sync_arrows_01.tiff */, BCCDED63115940CB00285E65 /* sync_arrows_02.tiff */, BCCDED64115940CB00285E65 /* sync_arrows_03.tiff */, @@ -1601,7 +1605,6 @@ BCCDED66115940CB00285E65 /* sync_arrows_05.tiff */, BCCDED67115940CB00285E65 /* sync_arrows_06.tiff */, BCEF78C5115215CA0023F8C2 /* network-small.tif */, - 17BFC80D10D3FF5200A3B112 /* Icons */, BC1E55C3100DC92200AAE9F0 /* table-view-small-square.tiff */, 177E792B0FCB54EC00E9E122 /* database-small.png */, 177E792C0FCB54EC00E9E122 /* dummy-small.png */, @@ -2302,6 +2305,7 @@ BCCDED6D115940CB00285E65 /* sync_arrows_06.tiff in Resources */, 58A8A72711A0149100B95749 /* MainWindow.xib in Resources */, 17A7773811C52E61001E27B4 /* IndexesView.xib in Resources */, + 17D3649811DFE61B00CC9413 /* blue-tick.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; |