diff options
| -rw-r--r-- | Interfaces/English.lproj/Preferences.xib | 665 | ||||
| -rw-r--r-- | Resources/Images/reset.pdf | bin | 0 -> 1765 bytes | |||
| -rw-r--r-- | Source/SPNetworkPreferencePane.h | 5 | ||||
| -rw-r--r-- | Source/SPNetworkPreferencePane.m | 195 | ||||
| -rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 4 |
5 files changed, 724 insertions, 145 deletions
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index b39ec8a5..6839a930 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -194,7 +194,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="775577076"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MQA</bytes> </object> @@ -2513,39 +2513,218 @@ AQAAAAA</bytes> <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <array class="NSMutableArray" key="NSSubviews"> - <object class="NSTextField" id="720655859"> + <object class="NSButton" id="999997125"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{224, 19}, {222, 19}}</string> + <string key="NSFrame">{{226, 22}, {32, 25}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="834405392"/> + <reference key="NSNextKeyView" ref="592419929"/> + <string key="NSReuseIdentifierKey">_NS:22</string> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="194119860"> + <int key="NSCellFlags">-2080374784</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="320262838"/> + <string key="NSCellIdentifier">_NS:22</string> + <reference key="NSControlView" ref="999997125"/> + <int key="NSButtonFlags">-2033434624</int> + <int key="NSButtonFlags2">162</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">reset</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSTextField" id="592419929"> + <reference key="NSNextResponder" ref="769132533"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{264, 20}, {298, 28}}</string> + <reference key="NSSuperview" ref="769132533"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <string key="NSReuseIdentifierKey">_NS:526</string> + <string key="NSHuggingPriority">{251, 750}</string> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="248153804"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">272629760</int> + <string key="NSContents">Drag the items in the list to reorder their preference and/or disable them.</string> + <reference key="NSSupport" ref="26"/> + <string key="NSCellIdentifier">_NS:526</string> + <reference key="NSControlView" ref="592419929"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSControlAutosetMaxLayoutWidth">YES</bool> + <double key="NSPreferredMaxLayoutWidth">404</double> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> + </object> + <object class="NSScrollView" id="746696287"> + <reference key="NSNextResponder" ref="769132533"/> + <int key="NSvFlags">276</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="NSClipView" id="1020957402"> + <reference key="NSNextResponder" ref="746696287"/> + <int key="NSvFlags">2322</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="NSTableView" id="44018309"> + <reference key="NSNextResponder" ref="1020957402"/> + <int key="NSvFlags">256</int> + <array class="NSMutableArray" key="NSSubviews"/> + <string key="NSFrameSize">{332, 126}</string> + <reference key="NSSuperview" ref="1020957402"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="8582709"/> + <string key="NSReuseIdentifierKey">_NS:13</string> + <bool key="NSEnabled">YES</bool> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSControlAllowsExpansionToolTips">YES</bool> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrameSize">{15, 20}</string> + <string key="NSReuseIdentifierKey">_NS:19</string> + </object> + <array class="NSMutableArray" key="NSTableColumns"> + <object class="NSTableColumn" id="185540149"> + <double key="NSWidth">329</double> + <double key="NSMinWidth">40</double> + <double key="NSMaxWidth">1000</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75497536</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Cipher Suite</string> + <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="775577076"/> + </object> + <reference key="NSTextColor" ref="263643234"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="1015285981"> + <int key="NSCellFlags">337641537</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSControlView" ref="44018309"/> + <reference key="NSBackgroundColor" ref="887465699"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <reference key="NSTableView" ref="44018309"/> + </object> + </array> + <double key="NSIntercellSpacingWidth">3</double> + <double key="NSIntercellSpacingHeight">2</double> + <reference key="NSBackgroundColor" ref="775577076"/> + <reference key="NSGridColor" ref="651588562"/> + <double key="NSRowHeight">17</double> + <int key="NSTvFlags">448790528</int> + <reference key="NSDelegate"/> + <reference key="NSDataSource"/> + <int key="NSColumnAutoresizingStyle">4</int> + <int key="NSDraggingSourceMaskForLocal">-1</int> + <int key="NSDraggingSourceMaskForNonLocal">0</int> + <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSTableViewDraggingDestinationStyle">0</int> + <int key="NSTableViewGroupRowStyle">1</int> + </object> + </array> + <string key="NSFrame">{{1, 1}, {332, 126}}</string> + <reference key="NSSuperview" ref="746696287"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="44018309"/> + <string key="NSReuseIdentifierKey">_NS:11</string> + <reference key="NSDocView" ref="44018309"/> + <reference key="NSBGColor" ref="887465699"/> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="8582709"> + <reference key="NSNextResponder" ref="746696287"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{224, 17}, {15, 102}}</string> + <reference key="NSSuperview" ref="746696287"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="592328431"/> + <string key="NSReuseIdentifierKey">_NS:65</string> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <reference key="NSTarget" ref="746696287"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.99212598425196852</double> + </object> + <object class="NSScroller" id="592328431"> + <reference key="NSNextResponder" ref="746696287"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{1, 119}, {223, 15}}</string> + <reference key="NSSuperview" ref="746696287"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="999997125"/> + <string key="NSReuseIdentifierKey">_NS:61</string> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="746696287"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.99699699699699695</double> + </object> + </array> + <string key="NSFrame">{{226, 56}, {334, 128}}</string> + <reference key="NSSuperview" ref="769132533"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1020957402"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <int key="NSsFlags">133682</int> + <reference key="NSVScroller" ref="8582709"/> + <reference key="NSHScroller" ref="592328431"/> + <reference key="NSContentView" ref="1020957402"/> + <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> + <double key="NSMinMagnification">0.25</double> + <double key="NSMaxMagnification">4</double> + <double key="NSMagnification">1</double> + </object> + <object class="NSTextField" id="364693920"> + <reference key="NSNextResponder" ref="769132533"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{224, 204}, {222, 19}}</string> + <reference key="NSSuperview" ref="769132533"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="712834659"/> <string key="NSReuseIdentifierKey">_NS:526</string> <string key="NSHuggingPriority">{251, 750}</string> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="499795011"> + <object class="NSTextFieldCell" key="NSCell" id="281388102"> <int key="NSCellFlags">67108928</int> <int key="NSCellFlags2">272632320</int> <string key="NSContents">/path/to/ssh/binary</string> <reference key="NSSupport" ref="320262838"/> <string key="NSCellIdentifier">_NS:526</string> - <reference key="NSControlView" ref="720655859"/> + <reference key="NSControlView" ref="364693920"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> </object> - <object class="NSButton" id="834405392"> + <object class="NSButton" id="712834659"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{452, 19}, {109, 19}}</string> + <string key="NSFrame">{{452, 204}, {109, 19}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> + <reference key="NSNextKeyView" ref="76504092"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="182441151"> + <object class="NSButtonCell" key="NSCell" id="302774200"> <int key="NSCellFlags">-2080374784</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Change…</string> @@ -2555,7 +2734,7 @@ AQAAAAA</bytes> <int key="NSfFlags">2586</int> </object> <string key="NSCellIdentifier">_NS:9</string> - <reference key="NSControlView" ref="834405392"/> + <reference key="NSControlView" ref="712834659"/> <int key="NSButtonFlags">-2038153216</int> <int key="NSButtonFlags2">164</int> <string key="NSAlternateContents"/> @@ -2565,20 +2744,40 @@ AQAAAAA</bytes> </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> - <object class="NSTextField" id="785257247"> + <object class="NSTextField" id="738896411"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{16, 19}, {204, 19}}</string> + <string key="NSFrame">{{16, 165}, {204, 19}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="720655859"/> + <reference key="NSNextKeyView" ref="746696287"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="463255296"> + <object class="NSTextFieldCell" key="NSCell" id="300938227"> + <int key="NSCellFlags">67108928</int> + <int key="NSCellFlags2">71304192</int> + <string key="NSContents">SSL Cipher Suites:</string> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSControlView" ref="738896411"/> + <reference key="NSBackgroundColor" ref="700609571"/> + <reference key="NSTextColor" ref="1035618107"/> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> + </object> + <object class="NSTextField" id="280525512"> + <reference key="NSNextResponder" ref="769132533"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{16, 204}, {204, 19}}</string> + <reference key="NSSuperview" ref="769132533"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="364693920"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="835150536"> <int key="NSCellFlags">67108928</int> <int key="NSCellFlags2">71304192</int> <string key="NSContents">SSH Client:</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="785257247"/> + <reference key="NSControlView" ref="280525512"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> @@ -2588,7 +2787,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="746894224"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 90}, {204, 17}}</string> + <string key="NSFrame">{{17, 275}, {204, 17}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="591009529"/> @@ -2608,10 +2807,10 @@ AQAAAAA</bytes> <object class="NSButton" id="64545568"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{224, 53}, {338, 18}}</string> + <string key="NSFrame">{{224, 238}, {338, 18}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="149400894"/> + <reference key="NSNextKeyView" ref="160526122"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="151662644"> <int key="NSCellFlags">-2080374784</int> @@ -2633,7 +2832,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="591009529"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{226, 88}, {50, 22}}</string> + <string key="NSFrame">{{226, 273}, {50, 22}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="794722267"/> @@ -2687,7 +2886,7 @@ AQAAAAA</bytes> <object class="NSTextField" id="794722267"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{281, 91}, {282, 17}}</string> + <string key="NSFrame">{{281, 276}, {282, 17}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="688014148"/> @@ -2704,13 +2903,37 @@ AQAAAAA</bytes> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> </object> - <object class="NSBox" id="149400894"> + <object class="NSBox" id="76504092"> + <reference key="NSNextResponder" ref="769132533"/> + <int key="NSvFlags">12</int> + <string key="NSFrame">{{226, 193}, {334, 5}}</string> + <reference key="NSSuperview" ref="769132533"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="738896411"/> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Box</string> + <reference key="NSSupport" ref="320262838"/> + <reference key="NSBackgroundColor" ref="1001357688"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> + </object> + </object> + <int key="NSBorderType">3</int> + <int key="NSBoxType">2</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> + </object> + <object class="NSBox" id="160526122"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{226, 44}, {334, 5}}</string> + <string key="NSFrame">{{226, 229}, {334, 5}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="785257247"/> + <reference key="NSNextKeyView" ref="280525512"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67108864</int> @@ -2731,7 +2954,7 @@ AQAAAAA</bytes> <object class="NSBox" id="688014148"> <reference key="NSNextResponder" ref="769132533"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{226, 77}, {334, 5}}</string> + <string key="NSFrame">{{226, 262}, {334, 5}}</string> <reference key="NSSuperview" ref="769132533"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="64545568"/> @@ -2753,14 +2976,14 @@ AQAAAAA</bytes> <bool key="NSTransparent">NO</bool> </object> </array> - <string key="NSFrameSize">{580, 127}</string> + <string key="NSFrameSize">{580, 312}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="746894224"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="1033452264"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">268</int> <array class="NSMutableArray" key="NSSubviews"> <object class="NSStepper" id="720862952"> @@ -2768,7 +2991,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{469, 291}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="571822117"/> <bool key="NSEnabled">YES</bool> <object class="NSStepperCell" key="NSCell" id="241334663"> @@ -2789,7 +3011,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{439, 293}, {23, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="720862952"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="546511116"> @@ -2847,7 +3068,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 294}, {162, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="277335147"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1729"> @@ -2872,7 +3092,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{144, 24}, {101, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="304684720"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="983858855"> @@ -2892,7 +3111,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{49, 24}, {93, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="187965597"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="133660147"> @@ -2920,7 +3138,6 @@ AQAAAAA</bytes> <int key="NSvFlags">256</int> <string key="NSFrameSize">{220, 286}</string> <reference key="NSSuperview" ref="25515031"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="7445657"/> <bool key="NSEnabled">YES</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> @@ -3006,7 +3223,6 @@ AQAAAAA</bytes> </array> <string key="NSFrame">{{1, 1}, {220, 286}}</string> <reference key="NSSuperview" ref="288292400"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="953919633"/> <reference key="NSDocView" ref="953919633"/> <reference key="NSBGColor" ref="887465699"/> @@ -3017,7 +3233,6 @@ AQAAAAA</bytes> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {15, 102}}</string> <reference key="NSSuperview" ref="288292400"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="913479800"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <reference key="NSTarget" ref="288292400"/> @@ -3029,7 +3244,6 @@ AQAAAAA</bytes> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {223, 15}}</string> <reference key="NSSuperview" ref="288292400"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="25515031"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> @@ -3040,7 +3254,6 @@ AQAAAAA</bytes> </array> <string key="NSFrame">{{20, 50}, {222, 288}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="662661535"/> <int key="NSsFlags">133122</int> <reference key="NSVScroller" ref="662661535"/> @@ -3056,7 +3269,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{20, 19}, {24, 24}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="919512780"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="373813305"> @@ -3181,7 +3393,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{439, 20}, {23, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="774563613"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="248584789"> @@ -3240,7 +3451,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{269, 22}, {164, 16}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1018119488"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="273262177"> @@ -3260,8 +3470,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{469, 18}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSStepperCell" key="NSCell" id="93125704"> <int key="NSCellFlags">67895328</int> @@ -3281,7 +3489,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{17, 362}, {182, 17}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="751188139"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="10706281"> @@ -3301,7 +3508,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{433, 353}, {133, 32}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="288292400"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="345790946"> @@ -3324,7 +3530,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{204, 360}, {207, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="863604695"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="66452133"> @@ -3345,7 +3550,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 322}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="378838807"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="823431848"> @@ -3370,7 +3574,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 267}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="397485802"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="743257684"> @@ -3395,7 +3598,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 209}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="140155660"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="231642073"> @@ -3420,7 +3622,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 238}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1030846368"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="491730308"> @@ -3445,7 +3646,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 162}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="827082642"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="496801621"> @@ -3470,7 +3670,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 51}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="748242000"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="131748905"> @@ -3495,7 +3694,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 79}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="782193237"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="357514733"> @@ -3520,7 +3718,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{270, 134}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="892250776"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="92164221"> @@ -3545,7 +3742,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{370, 109}, {29, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="107658761"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="409964321"> @@ -3604,7 +3800,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{269, 111}, {96, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="184945490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1060023867"> @@ -3624,7 +3819,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{405, 107}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1009372112"/> <bool key="NSEnabled">YES</bool> <object class="NSStepperCell" key="NSCell" id="171005061"> @@ -3645,7 +3839,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{423, 111}, {140, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="961372492"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="201150384"> @@ -3665,7 +3858,6 @@ AQAAAAA</bytes> <int key="NSvFlags">-2147483380</int> <string key="NSFrame">{{269, 1}, {292, 18}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="161634003"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="420702000"> @@ -3690,7 +3882,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{370, 184}, {29, 19}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="682694750"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="992523117"> @@ -3749,7 +3940,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{269, 186}, {96, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="16021182"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="499174965"> @@ -3769,7 +3959,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{405, 182}, {15, 22}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="659498064"/> <bool key="NSEnabled">YES</bool> <object class="NSStepperCell" key="NSCell" id="266600395"> @@ -3790,7 +3979,6 @@ AQAAAAA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{423, 186}, {140, 14}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="787536920"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="516695546"> @@ -3810,7 +3998,6 @@ AQAAAAA</bytes> <int key="NSvFlags">12</int> <string key="NSFrame">{{204, 349}, {356, 5}}</string> <reference key="NSSuperview" ref="1033452264"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="742042283"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -3831,8 +4018,6 @@ AQAAAAA</bytes> </object> </array> <string key="NSFrameSize">{580, 400}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="676806550"/> <string key="NSClassName">NSView</string> </object> @@ -4073,26 +4258,26 @@ AQAAAAA</bytes> </object> </array> </object> - <object class="NSCustomView" id="746834821"> + <object class="NSCustomView" id="116529304"> <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <array class="NSMutableArray" key="NSSubviews"> - <object class="NSButton" id="469463515"> - <reference key="NSNextResponder" ref="746834821"/> + <object class="NSButton" id="447584867"> + <reference key="NSNextResponder" ref="116529304"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{275, 16}, {135, 32}}</string> - <reference key="NSSuperview" ref="746834821"/> + <reference key="NSSuperview" ref="116529304"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="9671638"/> + <reference key="NSNextKeyView" ref="28916292"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="271450952"> + <object class="NSButtonCell" key="NSCell" id="698868016"> <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Change…</string> <reference key="NSSupport" ref="320262838"/> <string key="NSCellIdentifier">_NS:9</string> - <reference key="NSControlView" ref="469463515"/> + <reference key="NSControlView" ref="447584867"/> <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> @@ -4102,23 +4287,23 @@ AQAAAAA</bytes> </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> - <object class="NSTextField" id="9671638"> - <reference key="NSNextResponder" ref="746834821"/> + <object class="NSTextField" id="28916292"> + <reference key="NSNextResponder" ref="116529304"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{-2, 0}, {408, 14}}</string> - <reference key="NSSuperview" ref="746834821"/> + <reference key="NSSuperview" ref="116529304"/> <reference key="NSWindow"/> <reference key="NSNextKeyView"/> <string key="NSReuseIdentifierKey">_NS:526</string> <string key="NSHuggingPriority">{251, 750}</string> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="769084820"> + <object class="NSTextFieldCell" key="NSCell" id="374684924"> <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">272629760</int> <string key="NSContents">Enter the full absolute path to your SSH binary.</string> <reference key="NSSupport" ref="26"/> <string key="NSCellIdentifier">_NS:526</string> - <reference key="NSControlView" ref="9671638"/> + <reference key="NSControlView" ref="28916292"/> <reference key="NSBackgroundColor" ref="700609571"/> <reference key="NSTextColor" ref="1035618107"/> </object> @@ -4126,23 +4311,23 @@ AQAAAAA</bytes> <bool key="NSControlAutosetMaxLayoutWidth">YES</bool> <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> </object> - <object class="NSTextField" id="312899634"> - <reference key="NSNextResponder" ref="746834821"/> + <object class="NSTextField" id="564182577"> + <reference key="NSNextResponder" ref="116529304"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{0, 22}, {273, 22}}</string> - <reference key="NSSuperview" ref="746834821"/> + <reference key="NSSuperview" ref="116529304"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="469463515"/> + <reference key="NSNextKeyView" ref="447584867"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="814753188"> + <object class="NSTextFieldCell" key="NSCell" id="749914587"> <int key="NSCellFlags">-1804599231</int> <int key="NSCellFlags2">272630784</int> <string key="NSContents"/> <reference key="NSSupport" ref="320262838"/> <string key="NSPlaceholderString">System default</string> <string key="NSCellIdentifier">_NS:9</string> - <reference key="NSControlView" ref="312899634"/> + <reference key="NSControlView" ref="564182577"/> <bool key="NSDrawsBackground">YES</bool> <reference key="NSBackgroundColor" ref="1001357688"/> <reference key="NSTextColor" ref="6928728"/> @@ -4154,28 +4339,28 @@ AQAAAAA</bytes> <string key="NSFrameSize">{404, 44}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="312899634"/> + <reference key="NSNextKeyView" ref="564182577"/> <string key="NSReuseIdentifierKey">_NS:9</string> <nil key="NSClassName"/> </object> - <object class="NSCustomView" id="534518004"> + <object class="NSCustomView" id="293657116"> <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <array class="NSMutableArray" key="NSSubviews"> - <object class="NSButton" id="436350900"> - <reference key="NSNextResponder" ref="534518004"/> + <object class="NSButton" id="305172854"> + <reference key="NSNextResponder" ref="293657116"/> <int key="NSvFlags">266</int> <string key="NSFrame">{{18, 18}, {273, 18}}</string> - <reference key="NSSuperview" ref="534518004"/> + <reference key="NSSuperview" ref="293657116"/> <reference key="NSWindow"/> <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="202312806"> + <object class="NSButtonCell" key="NSCell" id="268590693"> <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Show hidden files</string> <reference key="NSSupport" ref="320262838"/> - <reference key="NSControlView" ref="436350900"/> + <reference key="NSControlView" ref="305172854"/> <int key="NSButtonFlags">1211912448</int> <int key="NSButtonFlags2">2</int> <reference key="NSNormalImage" ref="752798171"/> @@ -4191,7 +4376,7 @@ AQAAAAA</bytes> <string key="NSFrameSize">{309, 54}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="436350900"/> + <reference key="NSNextKeyView" ref="305172854"/> <string key="NSReuseIdentifierKey">_NS:9</string> <nil key="NSClassName"/> </object> @@ -5687,7 +5872,7 @@ AQAAAAA</bytes> <object class="IBOutletConnection" key="connection"> <string key="label">sshClientPickerView</string> <reference key="source" ref="424937675"/> - <reference key="destination" ref="746834821"/> + <reference key="destination" ref="116529304"/> </object> <string key="id">gUn-jl-Tfb</string> </object> @@ -5695,7 +5880,7 @@ AQAAAAA</bytes> <object class="IBOutletConnection" key="connection"> <string key="label">sshClientPath</string> <reference key="source" ref="424937675"/> - <reference key="destination" ref="312899634"/> + <reference key="destination" ref="564182577"/> </object> <string key="id">eUn-5b-NBa</string> </object> @@ -5703,7 +5888,7 @@ AQAAAAA</bytes> <object class="IBActionConnection" key="connection"> <string key="label">pickSSHClient:</string> <reference key="source" ref="424937675"/> - <reference key="destination" ref="834405392"/> + <reference key="destination" ref="712834659"/> </object> <string key="id">zcA-5j-KFq</string> </object> @@ -5711,7 +5896,7 @@ AQAAAAA</bytes> <object class="IBActionConnection" key="connection"> <string key="label">pickSSHClientViaFileBrowser:</string> <reference key="source" ref="424937675"/> - <reference key="destination" ref="469463515"/> + <reference key="destination" ref="447584867"/> </object> <string key="id">w0e-lI-UbS</string> </object> @@ -5719,11 +5904,27 @@ AQAAAAA</bytes> <object class="IBOutletConnection" key="connection"> <string key="label">hiddenFileView</string> <reference key="source" ref="424937675"/> - <reference key="destination" ref="534518004"/> + <reference key="destination" ref="293657116"/> </object> <string key="id">r1S-eS-uJK</string> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sslCipherView</string> + <reference key="source" ref="424937675"/> + <reference key="destination" ref="44018309"/> + </object> + <string key="id">pF5-VG-sY0</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">resetCipherList:</string> + <reference key="source" ref="424937675"/> + <reference key="destination" ref="999997125"/> + </object> + <string key="id">czy-4m-Kuo</string> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: values.CustomQuerySoftIndent</string> <reference key="source" ref="378838807"/> @@ -5886,10 +6087,10 @@ AQAAAAA</bytes> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: values.SSHClientPath</string> - <reference key="source" ref="720655859"/> + <reference key="source" ref="364693920"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="720655859"/> + <reference key="NSSource" ref="364693920"/> <reference key="NSDestination" ref="151174232"/> <string key="NSLabel">value: values.SSHClientPath</string> <string key="NSBinding">value</string> @@ -5904,12 +6105,28 @@ AQAAAAA</bytes> <string key="id">89d-3h-dgq</string> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dataSource</string> + <reference key="source" ref="44018309"/> + <reference key="destination" ref="424937675"/> + </object> + <string key="id">rQW-7Y-Mrg</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="44018309"/> + <reference key="destination" ref="424937675"/> + </object> + <string key="id">ptn-Zs-Gd6</string> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: values.KeySelectionHiddenFilesVisibility</string> - <reference key="source" ref="436350900"/> + <reference key="source" ref="305172854"/> <reference key="destination" ref="151174232"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="436350900"/> + <reference key="NSSource" ref="305172854"/> <reference key="NSDestination" ref="151174232"/> <string key="NSLabel">value: values.KeySelectionHiddenFilesVisibility</string> <string key="NSBinding">value</string> @@ -5927,6 +6144,26 @@ AQAAAAA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: values.SSLCipherList</string> + <reference key="source" ref="999997125"/> + <reference key="destination" ref="151174232"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="999997125"/> + <reference key="NSDestination" ref="151174232"/> + <string key="NSLabel">enabled: values.SSLCipherList</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">values.SSLCipherList</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSIsNotNil</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <string key="id">8HU-V9-I2q</string> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> <string key="label">value: values.SPCustomQueryEditorCompleteWithBackticks</string> <reference key="source" ref="961372492"/> <reference key="destination" ref="151174232"/> @@ -6597,10 +6834,15 @@ AQAAAAA</bytes> <reference ref="794722267"/> <reference ref="591009529"/> <reference ref="64545568"/> - <reference ref="149400894"/> - <reference ref="834405392"/> - <reference ref="720655859"/> - <reference ref="785257247"/> + <reference ref="160526122"/> + <reference ref="712834659"/> + <reference ref="364693920"/> + <reference ref="280525512"/> + <reference ref="76504092"/> + <reference ref="738896411"/> + <reference ref="746696287"/> + <reference ref="592419929"/> + <reference ref="999997125"/> </array> <reference key="parent" ref="0"/> <string key="objectName">Network</string> @@ -8114,119 +8356,204 @@ AQAAAAA</bytes> </object> <object class="IBObjectRecord"> <string key="id">HWX-AV-xGx</string> - <reference key="object" ref="149400894"/> + <reference key="object" ref="160526122"/> <reference key="parent" ref="769132533"/> </object> <object class="IBObjectRecord"> <string key="id">9CM-2a-2JU</string> - <reference key="object" ref="785257247"/> + <reference key="object" ref="280525512"/> <array class="NSMutableArray" key="children"> - <reference ref="463255296"/> + <reference ref="835150536"/> </array> <reference key="parent" ref="769132533"/> </object> <object class="IBObjectRecord"> <string key="id">4Us-KF-Ysj</string> - <reference key="object" ref="463255296"/> - <reference key="parent" ref="785257247"/> + <reference key="object" ref="835150536"/> + <reference key="parent" ref="280525512"/> </object> <object class="IBObjectRecord"> <string key="id">Rsg-4x-YV2</string> - <reference key="object" ref="834405392"/> + <reference key="object" ref="712834659"/> <array class="NSMutableArray" key="children"> - <reference ref="182441151"/> + <reference ref="302774200"/> </array> <reference key="parent" ref="769132533"/> </object> <object class="IBObjectRecord"> <string key="id">MhF-tS-nrE</string> - <reference key="object" ref="182441151"/> - <reference key="parent" ref="834405392"/> + <reference key="object" ref="302774200"/> + <reference key="parent" ref="712834659"/> </object> <object class="IBObjectRecord"> <string key="id">GcY-yy-sZn</string> - <reference key="object" ref="720655859"/> + <reference key="object" ref="364693920"/> <array class="NSMutableArray" key="children"> - <reference ref="499795011"/> + <reference ref="281388102"/> </array> <reference key="parent" ref="769132533"/> </object> <object class="IBObjectRecord"> <string key="id">29D-bG-y15</string> - <reference key="object" ref="499795011"/> - <reference key="parent" ref="720655859"/> + <reference key="object" ref="281388102"/> + <reference key="parent" ref="364693920"/> </object> <object class="IBObjectRecord"> <string key="id">D6L-76-0Ik</string> - <reference key="object" ref="746834821"/> + <reference key="object" ref="116529304"/> <array class="NSMutableArray" key="children"> - <reference ref="312899634"/> - <reference ref="9671638"/> - <reference ref="469463515"/> + <reference ref="564182577"/> + <reference ref="28916292"/> + <reference ref="447584867"/> </array> <reference key="parent" ref="0"/> <string key="objectName">Pick SSH client binary Accessory View</string> </object> <object class="IBObjectRecord"> <string key="id">yQV-9I-7us</string> - <reference key="object" ref="312899634"/> + <reference key="object" ref="564182577"/> <array class="NSMutableArray" key="children"> - <reference ref="814753188"/> + <reference ref="749914587"/> </array> - <reference key="parent" ref="746834821"/> + <reference key="parent" ref="116529304"/> </object> <object class="IBObjectRecord"> <string key="id">eS9-G4-zgt</string> - <reference key="object" ref="814753188"/> - <reference key="parent" ref="312899634"/> + <reference key="object" ref="749914587"/> + <reference key="parent" ref="564182577"/> </object> <object class="IBObjectRecord"> <string key="id">ZHD-xB-ee1</string> - <reference key="object" ref="9671638"/> + <reference key="object" ref="28916292"/> <array class="NSMutableArray" key="children"> - <reference ref="769084820"/> + <reference ref="374684924"/> </array> - <reference key="parent" ref="746834821"/> + <reference key="parent" ref="116529304"/> </object> <object class="IBObjectRecord"> <string key="id">yLf-F5-exv</string> - <reference key="object" ref="769084820"/> - <reference key="parent" ref="9671638"/> + <reference key="object" ref="374684924"/> + <reference key="parent" ref="28916292"/> </object> <object class="IBObjectRecord"> <string key="id">hEB-5Q-jZ8</string> - <reference key="object" ref="469463515"/> + <reference key="object" ref="447584867"/> <array class="NSMutableArray" key="children"> - <reference ref="271450952"/> + <reference ref="698868016"/> </array> - <reference key="parent" ref="746834821"/> + <reference key="parent" ref="116529304"/> </object> <object class="IBObjectRecord"> <string key="id">1nt-aH-gM4</string> - <reference key="object" ref="271450952"/> - <reference key="parent" ref="469463515"/> + <reference key="object" ref="698868016"/> + <reference key="parent" ref="447584867"/> </object> <object class="IBObjectRecord"> <string key="id">GEn-6y-U3F</string> - <reference key="object" ref="534518004"/> + <reference key="object" ref="293657116"/> <array class="NSMutableArray" key="children"> - <reference ref="436350900"/> + <reference ref="305172854"/> </array> <reference key="parent" ref="0"/> <string key="objectName">Show Hidden Files Accessory View</string> </object> <object class="IBObjectRecord"> <string key="id">bAQ-gF-4V2</string> - <reference key="object" ref="436350900"/> + <reference key="object" ref="305172854"/> <array class="NSMutableArray" key="children"> - <reference ref="202312806"/> + <reference ref="268590693"/> </array> - <reference key="parent" ref="534518004"/> + <reference key="parent" ref="293657116"/> </object> <object class="IBObjectRecord"> <string key="id">apR-gz-ej3</string> - <reference key="object" ref="202312806"/> - <reference key="parent" ref="436350900"/> + <reference key="object" ref="268590693"/> + <reference key="parent" ref="305172854"/> + </object> + <object class="IBObjectRecord"> + <string key="id">3Fg-G1-BWj</string> + <reference key="object" ref="76504092"/> + <reference key="parent" ref="769132533"/> + </object> + <object class="IBObjectRecord"> + <string key="id">4Aw-q4-73u</string> + <reference key="object" ref="738896411"/> + <array class="NSMutableArray" key="children"> + <reference ref="300938227"/> + </array> + <reference key="parent" ref="769132533"/> + </object> + <object class="IBObjectRecord"> + <string key="id">PDB-0g-8jg</string> + <reference key="object" ref="300938227"/> + <reference key="parent" ref="738896411"/> + </object> + <object class="IBObjectRecord"> + <string key="id">9lg-Fd-6u7</string> + <reference key="object" ref="746696287"/> + <array class="NSMutableArray" key="children"> + <reference ref="44018309"/> + <reference ref="592328431"/> + <reference ref="8582709"/> + </array> + <reference key="parent" ref="769132533"/> + </object> + <object class="IBObjectRecord"> + <string key="id">RuH-Yq-cdH</string> + <reference key="object" ref="44018309"/> + <array class="NSMutableArray" key="children"> + <reference ref="185540149"/> + </array> + <reference key="parent" ref="746696287"/> + </object> + <object class="IBObjectRecord"> + <string key="id">ZqJ-4c-bqV</string> + <reference key="object" ref="592328431"/> + <reference key="parent" ref="746696287"/> + </object> + <object class="IBObjectRecord"> + <string key="id">fcH-lG-egx</string> + <reference key="object" ref="8582709"/> + <reference key="parent" ref="746696287"/> + </object> + <object class="IBObjectRecord"> + <string key="id">2w5-RF-2LR</string> + <reference key="object" ref="185540149"/> + <array class="NSMutableArray" key="children"> + <reference ref="1015285981"/> + </array> + <reference key="parent" ref="44018309"/> + </object> + <object class="IBObjectRecord"> + <string key="id">NtR-tj-yZm</string> + <reference key="object" ref="1015285981"/> + <reference key="parent" ref="185540149"/> + </object> + <object class="IBObjectRecord"> + <string key="id">TG6-Q3-g30</string> + <reference key="object" ref="592419929"/> + <array class="NSMutableArray" key="children"> + <reference ref="248153804"/> + </array> + <reference key="parent" ref="769132533"/> + </object> + <object class="IBObjectRecord"> + <string key="id">Ukm-oW-lSS</string> + <reference key="object" ref="248153804"/> + <reference key="parent" ref="592419929"/> + </object> + <object class="IBObjectRecord"> + <string key="id">jJw-LF-gtW</string> + <reference key="object" ref="999997125"/> + <array class="NSMutableArray" key="children"> + <reference ref="194119860"/> + </array> + <reference key="parent" ref="769132533"/> + </object> + <object class="IBObjectRecord"> + <string key="id">7JN-Nf-GsD</string> + <reference key="object" ref="194119860"/> + <reference key="parent" ref="999997125"/> </object> </array> </object> @@ -8522,6 +8849,7 @@ AQAAAAA</bytes> <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="29D-bG-y15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="2w5-RF-2LR.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -8535,6 +8863,7 @@ AQAAAAA</bytes> <string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="3Fg-G1-BWj.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="42.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -8545,6 +8874,19 @@ AQAAAAA</bytes> <string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="4Aw-q4-73u.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="738896411"/> + <string type="base64-UTF8" key="toolTip">VGhlIGNpcGhlciBzdWl0ZXMgYXJlIHVzZWQgZm9yIFNTTC9UTFMtc2VjdXJlZCBjb25uZWN0aW9ucyBh +bmQgc3BlY2lmeSB3aGljaCBhbGdvcml0aG1zIFNlcXVlbCBQcm8gd2lsbCB1c2UgdG8gZW5jcnlwdCBh +IGNvbm5lY3Rpb24sIGFzIHdlbGwgYXMgdGhlaXIgcHJlZmVyZW5jZS4gCldhcm5pbmc6IElmIFNlcXVl +bCBQcm8gYW5kIHRoZSBzZXJ2ZXIgZG8gbm90IGhhdmUgYXQgbGVhc3Qgb25lIGNpcGhlciBzdWl0ZSBp +biBjb21tb24sIHlvdSB3aWxsIG5vIGxvbmdlciBiZSBhYmxlIHRvIGNvbm5lY3QhA</string> + </object> + </object> + <string key="4Aw-q4-73u.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="4Us-KF-Ysj.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="50.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="512.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -8615,7 +8957,7 @@ AQAAAAA</bytes> </object> </array> <reference key="641.IBNSViewMetadataGestureRecognizers" ref="0"/> - <string key="641.IBPersistedLastKnownCanvasPosition">{-460, 486.5}</string> + <string key="641.IBPersistedLastKnownCanvasPosition">{-458, 578}</string> <string key="641.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <array class="NSMutableArray" key="641.IBUserGuides"/> <string key="642.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -8663,6 +9005,7 @@ AQAAAAA</bytes> <string key="791.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES" key="792.IBNumberFormatterLocalizesFormatMetadataKey"/> <string key="792.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="7JN-Nf-GsD.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="7W6-DM-PG1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="802.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <array class="NSMutableArray" key="802.IBUserGuides"> @@ -8689,6 +9032,7 @@ AQAAAAA</bytes> <string key="98.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="99.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="9CM-2a-2JU.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="9lg-Fd-6u7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <reference key="D6L-76-0Ik.IBNSViewMetadataGestureRecognizers" ref="0"/> <string key="D6L-76-0Ik.IBPersistedLastKnownCanvasPosition">{-482, -2}</string> <string key="D6L-76-0Ik.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -8700,15 +9044,32 @@ AQAAAAA</bytes> <string key="HWX-AV-xGx.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="JMS-lH-5Te.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="MhF-tS-nrE.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NtR-tj-yZm.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="PDB-0g-8jg.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="Rsg-4x-YV2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="RuH-Yq-cdH.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES" key="TG6-Q3-g30.IBNSControlSetsMaxLayoutWidthAtFirstLayoutMetadataKey"/> + <string key="TG6-Q3-g30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="Ukm-oW-lSS.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES" key="ZHD-xB-ee1.IBNSControlSetsMaxLayoutWidthAtFirstLayoutMetadataKey"/> <string key="ZHD-xB-ee1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="ZqJ-4c-bqV.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="apR-gz-ej3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="bAQ-gF-4V2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES" key="cv6-Te-MPL.IBNSControlSetsMaxLayoutWidthAtFirstLayoutMetadataKey"/> <string key="cv6-Te-MPL.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="eS9-G4-zgt.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="fcH-lG-egx.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="hEB-5Q-jZ8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary" key="jJw-LF-gtW.IBAttributePlaceholdersKey"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="999997125"/> + <string key="toolTip">Reset the cipher list to the default configuration</string> + </object> + </object> + <string key="jJw-LF-gtW.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="q6h-n2-3a8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="vGo-VU-lIt.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="yLf-F5-exv.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -8993,6 +9354,7 @@ AQAAAAA</bytes> <dictionary class="NSMutableDictionary" key="actions"> <string key="pickSSHClient:">id</string> <string key="pickSSHClientViaFileBrowser:">id</string> + <string key="resetCipherList:">id</string> </dictionary> <dictionary class="NSMutableDictionary" key="actionInfosByName"> <object class="IBActionInfo" key="pickSSHClient:"> @@ -9003,11 +9365,16 @@ AQAAAAA</bytes> <string key="name">pickSSHClientViaFileBrowser:</string> <string key="candidateClassName">id</string> </object> + <object class="IBActionInfo" key="resetCipherList:"> + <string key="name">resetCipherList:</string> + <string key="candidateClassName">id</string> + </object> </dictionary> <dictionary class="NSMutableDictionary" key="outlets"> <string key="hiddenFileView">NSView</string> <string key="sshClientPath">NSTextField</string> <string key="sshClientPickerView">NSView</string> + <string key="sslCipherView">NSTableView</string> </dictionary> <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="IBToOneOutletInfo" key="hiddenFileView"> @@ -9022,6 +9389,10 @@ AQAAAAA</bytes> <string key="name">sshClientPickerView</string> <string key="candidateClassName">NSView</string> </object> + <object class="IBToOneOutletInfo" key="sslCipherView"> + <string key="name">sslCipherView</string> + <string key="candidateClassName">NSTableView</string> + </object> </dictionary> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -9033,6 +9404,7 @@ AQAAAAA</bytes> <dictionary class="NSMutableDictionary" key="actions"> <string key="pickSSHClient:">id</string> <string key="pickSSHClientViaFileBrowser:">id</string> + <string key="resetCipherList:">id</string> </dictionary> <dictionary class="NSMutableDictionary" key="actionInfosByName"> <object class="IBActionInfo" key="pickSSHClient:"> @@ -9043,6 +9415,10 @@ AQAAAAA</bytes> <string key="name">pickSSHClientViaFileBrowser:</string> <string key="candidateClassName">id</string> </object> + <object class="IBActionInfo" key="resetCipherList:"> + <string key="name">resetCipherList:</string> + <string key="candidateClassName">id</string> + </object> </dictionary> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -9524,6 +9900,7 @@ AQAAAAA</bytes> <string key="button_bar_spacer">{10, 23}</string> <string key="button_duplicate">{33, 23}</string> <string key="button_remove">{32, 23}</string> + <string key="reset">{16, 16}</string> </dictionary> </data> </archive> diff --git a/Resources/Images/reset.pdf b/Resources/Images/reset.pdf Binary files differnew file mode 100644 index 00000000..2ac66017 --- /dev/null +++ b/Resources/Images/reset.pdf diff --git a/Source/SPNetworkPreferencePane.h b/Source/SPNetworkPreferencePane.h index 37408c32..d980f175 100644 --- a/Source/SPNetworkPreferencePane.h +++ b/Source/SPNetworkPreferencePane.h @@ -37,16 +37,19 @@ * * Network preference pane controller. */ -@interface SPNetworkPreferencePane : SPPreferencePane <SPPreferencePaneProtocol> +@interface SPNetworkPreferencePane : SPPreferencePane <SPPreferencePaneProtocol, NSTableViewDataSource, NSTableViewDelegate> { IBOutlet NSView *sshClientPickerView; IBOutlet NSTextField *sshClientPath; IBOutlet NSView *hiddenFileView; + IBOutlet NSTableView *sslCipherView; @private NSAlert *_currentAlert; NSOpenPanel *_currentFilePanel; + NSMutableArray *sslCiphers; } - (IBAction)pickSSHClientViaFileBrowser:(id)sender; - (IBAction)pickSSHClient:(id)sender; +- (IBAction)resetCipherList:(id)sender; @end diff --git a/Source/SPNetworkPreferencePane.m b/Source/SPNetworkPreferencePane.m index 376ba39f..4f13c433 100644 --- a/Source/SPNetworkPreferencePane.m +++ b/Source/SPNetworkPreferencePane.m @@ -30,12 +30,33 @@ #import "SPNetworkPreferencePane.h" +static NSString *SPSSLCipherListMarkerItem = @"--"; +static NSString *SPSSLCipherPboardTypeName = @"SSLCipherPboardType"; + @interface SPNetworkPreferencePane (Private) - (void)updateHiddenFiles; +- (void)loadSSLCiphers; +- (void)storeSSLCiphers; ++ (NSArray *)defaultSSLCipherList; @end @implementation SPNetworkPreferencePane +- (instancetype)init +{ + self = [super init]; + if (self) { + sslCiphers = [[NSMutableArray alloc] init]; + } + return self; +} + +- (void)dealloc +{ + SPClear(sslCiphers); + [super dealloc]; +} + #pragma mark - #pragma mark Preference pane protocol methods @@ -69,6 +90,16 @@ return NO; } +- (void)preferencePaneWillBeShown +{ + [self loadSSLCiphers]; + if(![[sslCipherView registeredDraggedTypes] containsObject:SPSSLCipherPboardTypeName]) + [sslCipherView registerForDraggedTypes:@[SPSSLCipherPboardTypeName]]; +} + +#pragma mark - +#pragma mark Custom SSH client methods + - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { if([SPHiddenKeyFileVisibilityKey isEqualTo:keyPath]) { @@ -131,4 +162,168 @@ SPClear(_currentAlert); } +#pragma mark - +#pragma mark SSL cipher list methods + +- (void)loadSSLCiphers +{ + NSArray *supportedCiphers = [SPNetworkPreferencePane defaultSSLCipherList]; + [sslCiphers removeAllObjects]; + + NSString *userCipherString = [prefs stringForKey:SPSSLCipherListKey]; + if(userCipherString) { + //expand user list + NSArray *userCipherList = [userCipherString componentsSeparatedByString:@":"]; + + //compare the users list to the valid list and only copy over valid items + for (NSString *userCipher in userCipherList) { + if (![supportedCiphers containsObject:userCipher] || [sslCiphers containsObject:userCipher]) { + SPLog(@"Unknown ssl cipher in users' list: %@",userCipher); + continue; + } + [sslCiphers addObject:userCipher]; + } + + //now we do the reverse and add valid ciphers that are not yet in the users list. + //We'll just assume the ones not in the users' list are newer and therefore better and add + //them at the top + NSUInteger shift = 0; + for (NSString *validCipher in supportedCiphers) { + if(![sslCiphers containsObject:validCipher]) { + [sslCiphers insertObject:validCipher atIndex:shift++]; + } + } + } + else { + //no user prefs configured, so we'll just go with the defaults + [sslCiphers addObjectsFromArray:supportedCiphers]; + } + + //reload UI + [sslCipherView deselectAll:nil]; + [sslCipherView reloadData]; +} + +- (void)storeSSLCiphers +{ + NSString *flattedList = [sslCiphers componentsJoinedByString:@":"]; + [prefs setObject:flattedList forKey:SPSSLCipherListKey]; +} + +- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView +{ + return [sslCiphers count]; +} + +- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +{ + NSString *value = [sslCiphers objectAtIndex:rowIndex]; + if ([value isEqualTo:SPSSLCipherListMarkerItem]) { + return NSLocalizedString(@"Disabled Cipher Suites", @"Preferences : Network : SSL Chiper suites : List seperator"); + } + return value; +} + +- (BOOL)tableView:(NSTableView *)tableView isGroupRow:(NSInteger)row +{ + return ([[sslCiphers objectAtIndex:row] isEqualTo:SPSSLCipherListMarkerItem]); +} + +- (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)row +{ + return ![self tableView:tableView isGroupRow:row]; +} + +- (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation +{ + if(row < 0) return NO; //why is that even a signed int when all "indexes" are unsigned!? + + NSPasteboard *pboard = [info draggingPasteboard]; + NSArray *draggedItems = [NSKeyedUnarchiver unarchiveObjectWithData:[pboard dataForType:SPSSLCipherPboardTypeName]]; + + NSUInteger nextInsert = row; + for (NSString *item in draggedItems) { + NSUInteger oldPos = [sslCiphers indexOfObject:item]; + [sslCiphers removeObjectAtIndex:oldPos]; + + if(oldPos < (NSUInteger)row) { + // readjust position because we removed an object further up in the list, shifting all following indexes down by 1 + nextInsert--; + } + + [sslCiphers insertObject:item atIndex:nextInsert++]; + } + + NSMutableIndexSet *newSelection = [NSMutableIndexSet indexSet]; + for (NSString *item in draggedItems) { + [newSelection addIndex:[sslCiphers indexOfObject:item]]; + } + + [self storeSSLCiphers]; + [sslCipherView selectRowIndexes:newSelection byExtendingSelection:NO]; + + return YES; +} + +- (NSDragOperation)tableView:(NSTableView *)aTableView validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)operation +{ + //cannot drop something on another item in the list, only between them + return (operation == NSTableViewDropOn)? NSDragOperationNone : NSDragOperationMove; +} + +- (BOOL)tableView:(NSTableView *)aTableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard +{ + //the marker cannot be actively reordered + if ([rowIndexes containsIndex:[sslCiphers indexOfObject:SPSSLCipherListMarkerItem]]) + return NO; + + //put the names of the items on the pasteboard. easier to work with than indexes... + NSMutableArray *items = [NSMutableArray arrayWithCapacity:[rowIndexes count]]; + [rowIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) { + [items addObject:[sslCiphers objectAtIndex:idx]]; + }]; + + NSData *arch = [NSKeyedArchiver archivedDataWithRootObject:items]; + [pboard declareTypes:@[SPSSLCipherPboardTypeName] owner:self]; + [pboard setData:arch forType:SPSSLCipherPboardTypeName]; + return YES; +} + +- (IBAction)resetCipherList:(id)sender +{ + //remove the user pref and reset the GUI + [prefs removeObjectForKey:SPSSLCipherListKey]; + [self loadSSLCiphers]; +} + ++ (NSArray *)defaultSSLCipherList +{ + //this is the default list as hardcoded in SPMySQLConnection.m + //Sadly there is no way to make MySQL give us the list of runtime-supported ciphers. + return @[@"DHE-RSA-AES256-SHA", + @"AES256-SHA", + @"DHE-RSA-AES128-SHA", + @"AES128-SHA", + @"AES256-RMD", + @"AES128-RMD", + @"DES-CBC3-RMD", + @"DHE-RSA-AES256-RMD", + @"DHE-RSA-AES128-RMD", + @"DHE-RSA-DES-CBC3-RMD", + @"RC4-SHA", + @"RC4-MD5", + @"DES-CBC3-SHA", + @"DES-CBC-SHA", + @"EDH-RSA-DES-CBC3-SHA", + @"EDH-RSA-DES-CBC-SHA", + SPSSLCipherListMarkerItem, //marker. disabled items below here + @"EDH-DSS-DES-CBC-SHA", + @"EDH-DSS-DES-CBC3-SHA", + @"DHE-DSS-AES128-SHA", + @"DHE-DSS-AES256-SHA", + @"DHE-DSS-DES-CBC3-RMD", + @"DHE-DSS-AES128-RMD", + @"DHE-DSS-AES256-RMD"]; +} + @end diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index ccbb99e5..195bf5df 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -195,6 +195,7 @@ 50EA92681AB23EFC008D3C4F /* SPTableCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1141A388117BBFF200126A28 /* SPTableCopy.m */; }; 50EA926A1AB246B8008D3C4F /* SPDatabaseActionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EA92691AB246B8008D3C4F /* SPDatabaseActionTest.m */; }; 50EAB5B81A8FBB08008F627A /* SPOSInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EAB5B71A8FBB08008F627A /* SPOSInfo.m */; }; + 50F530521ABCF66B002F2C1A /* reset.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 50F530511ABCF66B002F2C1A /* reset.pdf */; }; 5806B76411A991EC00813A88 /* SPDocumentController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5806B76311A991EC00813A88 /* SPDocumentController.m */; }; 580E8DB711EA774B000D8427 /* SequelProTabClose_Pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 580E8DAB11EA772C000D8427 /* SequelProTabClose_Pressed.png */; }; 580E8DB811EA774B000D8427 /* SequelProTabClose_Rollover.png in Resources */ = {isa = PBXBuildFile; fileRef = 580E8DAC11EA772C000D8427 /* SequelProTabClose_Rollover.png */; }; @@ -904,6 +905,7 @@ 50EA92691AB246B8008D3C4F /* SPDatabaseActionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseActionTest.m; sourceTree = "<group>"; }; 50EAB5B61A8FBB08008F627A /* SPOSInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPOSInfo.h; sourceTree = "<group>"; }; 50EAB5B71A8FBB08008F627A /* SPOSInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPOSInfo.m; sourceTree = "<group>"; }; + 50F530511ABCF66B002F2C1A /* reset.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = reset.pdf; sourceTree = "<group>"; }; 5806B76211A991EC00813A88 /* SPDocumentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDocumentController.h; sourceTree = "<group>"; }; 5806B76311A991EC00813A88 /* SPDocumentController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDocumentController.m; sourceTree = "<group>"; }; 580E8DAB11EA772C000D8427 /* SequelProTabClose_Pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SequelProTabClose_Pressed.png; sourceTree = "<group>"; }; @@ -2161,6 +2163,7 @@ 384582C60FB9603600DDACB6 /* proc-small.png */, 58F48AA2161D03C6008536A1 /* quick-connect-icon.pdf */, 58F48B2D161D08C0008536A1 /* quick-connect-icon-white.pdf */, + 50F530511ABCF66B002F2C1A /* reset.pdf */, 582E946F16837DB2003459FD /* showconsole.png */, 588B2CC50FE5641E00EC5FC0 /* ssh-connected.png */, 588B2CC60FE5641E00EC5FC0 /* ssh-connecting.png */, @@ -2983,6 +2986,7 @@ 582E940216829B0A003459FD /* button_bar_handle.png in Resources */, 582E940E1682A2AD003459FD /* button_bar_spacer@2x.png in Resources */, 582E94161682A463003459FD /* button_clear.png in Resources */, + 50F530521ABCF66B002F2C1A /* reset.pdf in Resources */, 582E94181682A4B4003459FD /* button_duplicate.png in Resources */, 582E941F16835DD4003459FD /* button_edit_mode_selected.png in Resources */, 582E942016835DD4003459FD /* button_edit_mode.png in Resources */, |