- Hide SSH options for favourites in the preferences, temporarily, to avoid confusion while this is non-functional.

 - Clean up +/- buttons beneath the prefs and change the incorrectly labelled "-" button to "Copy"

1 files changed, 154 insertions, 87 deletions

diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 211e9aff..799b91fc 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -1366,7 +1366,7 @@
 			<object class="NSWindowTemplate" id="142512296">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{119, 773}, {710, 292}}</string>
+				<string key="NSWindowRect">{{119, 783}, {710, 282}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">Preferences</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -1383,7 +1383,7 @@
 						<object class="NSButton" id="98546574">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 237}, {190, 18}}</string>
+							<string key="NSFrame">{{19, 227}, {190, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="640312923">
@@ -1414,7 +1414,7 @@
 						<object class="NSButton" id="168178889">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 217}, {190, 18}}</string>
+							<string key="NSFrame">{{19, 207}, {190, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="743845997">
@@ -1436,7 +1436,7 @@
 						<object class="NSButton" id="404675813">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 197}, {203, 18}}</string>
+							<string key="NSFrame">{{19, 187}, {203, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="241850972">
@@ -1468,27 +1468,27 @@
 										<object class="NSTableView" id="207456822">
 											<reference key="NSNextResponder" ref="44813966"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{414, 169}</string>
+											<string key="NSFrameSize">{425, 182}</string>
 											<reference key="NSSuperview" ref="44813966"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="733755652">
 												<reference key="NSNextResponder" ref="175827989"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{414, 17}</string>
+												<string key="NSFrameSize">{425, 17}</string>
 												<reference key="NSSuperview" ref="175827989"/>
 												<reference key="NSTableView" ref="207456822"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="1024004993">
 												<reference key="NSNextResponder" ref="1003742956"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{415, 0}, {12, 17}}</string>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{-22, 0}, {12, 17}}</string>
 												<reference key="NSSuperview" ref="1003742956"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="245728218">
 													<string key="NSIdentifier">name</string>
-													<double key="NSWidth">8.000000e+01</double>
+													<double key="NSWidth">9.000000e+01</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1539,7 +1539,7 @@
 												</object>
 												<object class="NSTableColumn" id="392250876">
 													<string key="NSIdentifier">host</string>
-													<double key="NSWidth">8.000000e+01</double>
+													<double key="NSWidth">9.000000e+01</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1566,7 +1566,7 @@
 												</object>
 												<object class="NSTableColumn" id="434530023">
 													<string key="NSIdentifier">user</string>
-													<double key="NSWidth">8.000000e+01</double>
+													<double key="NSWidth">8.900000e+01</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1598,7 +1598,7 @@
 												</object>
 												<object class="NSTableColumn" id="650577164">
 													<string key="NSIdentifier">port</string>
-													<double key="NSWidth">3.200000e+01</double>
+													<double key="NSWidth">4.100000e+01</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1625,7 +1625,7 @@
 												</object>
 												<object class="NSTableColumn" id="814467956">
 													<string key="NSIdentifier">database</string>
-													<double key="NSWidth">8.000000e+01</double>
+													<double key="NSWidth">1.000000e+02</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1652,7 +1652,7 @@
 												</object>
 												<object class="NSTableColumn" id="931839220">
 													<string key="NSIdentifier">useSSH</string>
-													<double key="NSWidth">4.400000e+01</double>
+													<double key="NSWidth">4.600000e+01</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1685,6 +1685,7 @@
 													<bool key="NSIsResizeable">YES</bool>
 													<bool key="NSIsEditable">YES</bool>
 													<reference key="NSTableView" ref="207456822"/>
+													<bool key="NSHidden">YES</bool>
 												</object>
 											</object>
 											<double key="NSIntercellSpacingWidth">3.000000e+00</double>
@@ -1715,7 +1716,7 @@
 											<bool key="NSAllowsTypeSelect">YES</bool>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {414, 169}}</string>
+									<string key="NSFrame">{{1, 17}, {425, 182}}</string>
 									<reference key="NSSuperview" ref="1003742956"/>
 									<reference key="NSDocView" ref="207456822"/>
 									<reference key="NSBGColor" ref="129141099"/>
@@ -1723,7 +1724,7 @@
 								</object>
 								<object class="NSScroller" id="257545235">
 									<reference key="NSNextResponder" ref="1003742956"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{415, 17}, {11, 169}}</string>
 									<reference key="NSSuperview" ref="1003742956"/>
 									<int key="NSsFlags">256</int>
@@ -1733,13 +1734,13 @@
 								</object>
 								<object class="NSScroller" id="1049987731">
 									<reference key="NSNextResponder" ref="1003742956"/>
-									<int key="NSvFlags">256</int>
+									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 186}, {414, 11}}</string>
 									<reference key="NSSuperview" ref="1003742956"/>
 									<int key="NSsFlags">257</int>
 									<reference key="NSTarget" ref="1003742956"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">2.315789e-01</double>
+									<double key="NSPercent">9.951923e-01</double>
 								</object>
 								<object class="NSClipView" id="175827989">
 									<reference key="NSNextResponder" ref="1003742956"/>
@@ -1748,7 +1749,7 @@
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="733755652"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {414, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {425, 17}}</string>
 									<reference key="NSSuperview" ref="1003742956"/>
 									<reference key="NSDocView" ref="733755652"/>
 									<reference key="NSBGColor" ref="129141099"/>
@@ -1756,9 +1757,9 @@
 								</object>
 								<reference ref="1024004993"/>
 							</object>
-							<string key="NSFrame">{{263, 52}, {427, 198}}</string>
+							<string key="NSFrame">{{263, 40}, {427, 200}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
-							<int key="NSsFlags">50</int>
+							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="257545235"/>
 							<reference key="NSHScroller" ref="1049987731"/>
 							<reference key="NSContentView" ref="44813966"/>
@@ -1769,7 +1770,7 @@
 						<object class="NSTextField" id="123224733">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{260, 258}, {52, 14}}</string>
+							<string key="NSFrame">{{260, 248}, {52, 14}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="503714814">
@@ -1790,7 +1791,7 @@
 						<object class="NSButton" id="463862448">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{664, 16}, {28, 30}}</string>
+							<string key="NSFrame">{{660, 19}, {30, 23}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="777318512">
@@ -1803,11 +1804,11 @@
 									<int key="NSfFlags">1044</int>
 								</object>
 								<reference key="NSControlView" ref="463862448"/>
-								<int key="NSButtonFlags">113524991</int>
-								<int key="NSButtonFlags2">402653186</int>
+								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags2">402653218</int>
 								<object class="NSCustomResource" key="NSNormalImage">
 									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">connectionadd</string>
+									<string key="NSResourceName">NSAddTemplate</string>
 								</object>
 								<string key="NSAlternateContents"/>
 								<string key="NSKeyEquivalent">a</string>
@@ -1818,7 +1819,7 @@
 						<object class="NSButton" id="1041662747">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{632, 16}, {28, 30}}</string>
+							<string key="NSFrame">{{631, 19}, {30, 23}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="224476992">
@@ -1827,11 +1828,11 @@
 								<string key="NSContents">Remove</string>
 								<reference key="NSSupport" ref="568942350"/>
 								<reference key="NSControlView" ref="1041662747"/>
-								<int key="NSButtonFlags">113524991</int>
-								<int key="NSButtonFlags2">2</int>
+								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags2">34</int>
 								<object class="NSCustomResource" key="NSNormalImage">
 									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">connectiondelete</string>
+									<string key="NSResourceName">NSRemoveTemplate</string>
 								</object>
 								<string key="NSAlternateContents"/>
 								<string type="base64-UTF8" key="NSKeyEquivalent">fw</string>
@@ -1842,7 +1843,7 @@
 						<object class="NSButton" id="737120239">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{600, 16}, {28, 30}}</string>
+							<string key="NSFrame">{{580, 19}, {52, 23}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="351109649">
@@ -1851,11 +1852,29 @@
 								<string key="NSContents">Copy</string>
 								<reference key="NSSupport" ref="568942350"/>
 								<reference key="NSControlView" ref="737120239"/>
-								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags">-2036580097</int>
 								<int key="NSButtonFlags2">34</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSRemoveTemplate</string>
+								<object class="NSImage" key="NSNormalImage">
+									<int key="NSImageFlags">549650432</int>
+									<string key="NSSize">{1, 1}</string>
+									<object class="NSMutableArray" key="NSReps">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<integer value="0" id="8"/>
+											<object class="NSBitmapImageRep">
+												<object class="NSData" key="NSTIFFRepresentation">
+													<bytes key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
+AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEQAAAA
+ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
+												</object>
+											</object>
+										</object>
+									</object>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MCAwAA</bytes>
+									</object>
 								</object>
 								<string key="NSAlternateContents"/>
 								<string type="base64-UTF8" key="NSKeyEquivalent">fw</string>
@@ -1866,7 +1885,7 @@
 						<object class="NSTextField" id="806941966">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{22, 75}, {51, 18}}</string>
+							<string key="NSFrame">{{22, 65}, {51, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="271241912">
@@ -1888,7 +1907,7 @@
 						<object class="NSTextField" id="68052230">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{78, 76}, {168, 14}}</string>
+							<string key="NSFrame">{{78, 66}, {168, 14}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="559434116">
@@ -1904,7 +1923,7 @@
 						<object class="NSButton" id="851752934">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 177}, {225, 18}}</string>
+							<string key="NSFrame">{{19, 167}, {225, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="66072963">
@@ -1926,7 +1945,7 @@
 						<object class="NSButton" id="243879219">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 157}, {185, 18}}</string>
+							<string key="NSFrame">{{19, 147}, {185, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="285776142">
@@ -1948,7 +1967,7 @@
 						<object class="NSButton" id="831104417">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 97}, {100, 18}}</string>
+							<string key="NSFrame">{{19, 87}, {100, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="756576347">
@@ -1970,7 +1989,7 @@
 						<object class="NSTextField" id="871452374">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{123, 98}, {76, 18}}</string>
+							<string key="NSFrame">{{123, 88}, {76, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="995216132">
@@ -1987,7 +2006,7 @@
 						<object class="NSTextField" id="898567731">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{204, 99}, {30, 14}}</string>
+							<string key="NSFrame">{{204, 89}, {30, 14}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="935622201">
@@ -2003,7 +2022,7 @@
 						<object class="NSTextField" id="903135386">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{162, 52}, {98, 14}}</string>
+							<string key="NSFrame">{{162, 42}, {98, 14}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="902388592">
@@ -2019,7 +2038,7 @@
 						<object class="NSButton" id="694106864">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 137}, {185, 18}}</string>
+							<string key="NSFrame">{{19, 127}, {185, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="160637283">
@@ -2041,7 +2060,7 @@
 						<object class="NSPopUpButton" id="875312152">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">258</int>
-							<string key="NSFrame">{{19, 46}, {141, 22}}</string>
+							<string key="NSFrame">{{19, 36}, {141, 22}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="520776436">
@@ -2374,7 +2393,7 @@
 						<object class="NSButton" id="355398401">
 							<reference key="NSNextResponder" ref="577801299"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{19, 117}, {194, 18}}</string>
+							<string key="NSFrame">{{19, 107}, {194, 18}}</string>
 							<reference key="NSSuperview" ref="577801299"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="693721839">
@@ -2392,8 +2411,28 @@
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
+						<object class="NSButton" id="72703796">
+							<reference key="NSNextResponder" ref="577801299"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{263, 19}, {318, 23}}</string>
+							<reference key="NSSuperview" ref="577801299"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="696351536">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="568942350"/>
+								<reference key="NSControlView" ref="72703796"/>
+								<int key="NSButtonFlags">147603711</int>
+								<int key="NSButtonFlags2">162</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
+						</object>
 					</object>
-					<string key="NSFrameSize">{710, 292}</string>
+					<string key="NSFrameSize">{710, 282}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{213, 129}</string>
@@ -2408,7 +2447,7 @@
 			<object class="NSWindowTemplate" id="505727398">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{828, 556}, {278, 365}}</string>
+				<string key="NSWindowRect">{{828, 672}, {278, 249}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">favoriteSheet</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -2425,7 +2464,7 @@
 						<object class="NSTextField" id="133407513">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 223}, {159, 18}}</string>
+							<string key="NSFrame">{{20, 107}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="363824013">
@@ -2442,7 +2481,7 @@
 						<object class="NSSecureTextField" id="622497651">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 249}, {159, 18}}</string>
+							<string key="NSFrame">{{20, 133}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSecureTextFieldCell" key="NSCell" id="455443720">
@@ -2463,7 +2502,7 @@
 						<object class="NSTextField" id="1004858887">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 302}, {29, 14}}</string>
+							<string key="NSFrame">{{184, 186}, {29, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="888028330">
@@ -2479,7 +2518,7 @@
 						<object class="NSTextField" id="642868453">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 276}, {29, 14}}</string>
+							<string key="NSFrame">{{184, 160}, {29, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="756071891">
@@ -2495,7 +2534,7 @@
 						<object class="NSTextField" id="1044049211">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 224}, {63, 14}}</string>
+							<string key="NSFrame">{{184, 108}, {63, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="701170939">
@@ -2511,7 +2550,7 @@
 						<object class="NSTextField" id="834250450">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 275}, {159, 18}}</string>
+							<string key="NSFrame">{{20, 159}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="248816528">
@@ -2572,7 +2611,7 @@
 						<object class="NSTextField" id="784008929">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 250}, {55, 14}}</string>
+							<string key="NSFrame">{{184, 134}, {55, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="106911925">
@@ -2588,7 +2627,7 @@
 						<object class="NSTextField" id="253597986">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 172}, {35, 14}}</string>
+							<string key="NSFrame">{{184, 56}, {35, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="143026256">
@@ -2604,7 +2643,7 @@
 						<object class="NSTextField" id="828199769">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 171}, {159, 18}}</string>
+							<string key="NSFrame">{{20, 55}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="226972500">
@@ -2621,7 +2660,7 @@
 						<object class="NSTextField" id="360181642">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 301}, {159, 18}}</string>
+							<string key="NSFrame">{{20, 185}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="969257359">
@@ -2638,7 +2677,7 @@
 						<object class="NSTextField" id="526510128">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 328}, {35, 14}}</string>
+							<string key="NSFrame">{{184, 212}, {35, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="419021908">
@@ -2654,7 +2693,7 @@
 						<object class="NSTextField" id="564743141">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 327}, {159, 18}}</string>
+							<string key="NSFrame">{{20, 211}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="985040924">
@@ -2671,7 +2710,7 @@
 						<object class="NSTextField" id="960356350">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 198}, {48, 14}}</string>
+							<string key="NSFrame">{{184, 82}, {48, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="774811191">
@@ -2687,7 +2726,7 @@
 						<object class="NSTextField" id="1056966506">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 197}, {159, 18}}</string>
+							<string key="NSFrame">{{20, 81}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="922735723">
@@ -2719,8 +2758,8 @@
 						</object>
 						<object class="NSButton" id="610013967">
 							<reference key="NSNextResponder" ref="388121886"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 147}, {118, 18}}</string>
+							<int key="NSvFlags">-2147483392</int>
+							<string key="NSFrame">{{17, 31}, {118, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="999287184">
@@ -2741,7 +2780,7 @@
 						<object class="NSTextField" id="61473119">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 97}, {159, 18}}</string>
+							<string key="NSFrame">{{20, -19}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="200101549">
@@ -2758,7 +2797,7 @@
 						<object class="NSTextField" id="454179152">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 71}, {159, 18}}</string>
+							<string key="NSFrame">{{20, -45}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="959856526">
@@ -2775,7 +2814,7 @@
 						<object class="NSTextField" id="159797207">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 97}, {55, 14}}</string>
+							<string key="NSFrame">{{184, -19}, {55, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="484979475">
@@ -2791,7 +2830,7 @@
 						<object class="NSTextField" id="708661907">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{183, 71}, {78, 14}}</string>
+							<string key="NSFrame">{{183, -45}, {78, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="266173512">
@@ -2806,8 +2845,8 @@
 						</object>
 						<object class="NSTextField" id="598744808">
 							<reference key="NSNextResponder" ref="388121886"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 123}, {159, 18}}</string>
+							<int key="NSvFlags">-2147483392</int>
+							<string key="NSFrame">{{20, 7}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="171890843">
@@ -2823,8 +2862,8 @@
 						</object>
 						<object class="NSTextField" id="781996466">
 							<reference key="NSNextResponder" ref="388121886"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 124}, {55, 14}}</string>
+							<int key="NSvFlags">-2147483392</int>
+							<string key="NSFrame">{{184, 8}, {55, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="167812000">
@@ -2840,7 +2879,7 @@
 						<object class="NSTextField" id="1019229109">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 45}, {159, 18}}</string>
+							<string key="NSFrame">{{20, -71}, {159, 18}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="187645822">
@@ -2857,7 +2896,7 @@
 						<object class="NSTextField" id="363218100">
 							<reference key="NSNextResponder" ref="388121886"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{184, 46}, {63, 14}}</string>
+							<string key="NSFrame">{{184, -70}, {63, 14}}</string>
 							<reference key="NSSuperview" ref="388121886"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="33769222">
@@ -2871,7 +2910,7 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{278, 365}</string>
+					<string key="NSFrameSize">{278, 249}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{213, 129}</string>
@@ -4711,9 +4750,6 @@
 							<reference ref="98546574"/>
 							<reference ref="1003742956"/>
 							<reference ref="123224733"/>
-							<reference ref="463862448"/>
-							<reference ref="1041662747"/>
-							<reference ref="737120239"/>
 							<reference ref="806941966"/>
 							<reference ref="68052230"/>
 							<reference ref="851752934"/>
@@ -4725,6 +4761,10 @@
 							<reference ref="694106864"/>
 							<reference ref="875312152"/>
 							<reference ref="355398401"/>
+							<reference ref="463862448"/>
+							<reference ref="1041662747"/>
+							<reference ref="737120239"/>
+							<reference ref="72703796"/>
 						</object>
 						<reference key="parent" ref="142512296"/>
 					</object>
@@ -5033,8 +5073,6 @@
 							<reference ref="642868453"/>
 							<reference ref="1044049211"/>
 							<reference ref="834250450"/>
-							<reference ref="263233492"/>
-							<reference ref="751668226"/>
 							<reference ref="784008929"/>
 							<reference ref="253597986"/>
 							<reference ref="828199769"/>
@@ -5043,7 +5081,6 @@
 							<reference ref="564743141"/>
 							<reference ref="960356350"/>
 							<reference ref="1056966506"/>
-							<reference ref="277530422"/>
 							<reference ref="610013967"/>
 							<reference ref="61473119"/>
 							<reference ref="454179152"/>
@@ -5053,6 +5090,9 @@
 							<reference ref="781996466"/>
 							<reference ref="1019229109"/>
 							<reference ref="363218100"/>
+							<reference ref="263233492"/>
+							<reference ref="751668226"/>
+							<reference ref="277530422"/>
 						</object>
 						<reference key="parent" ref="505727398"/>
 					</object>
@@ -5883,6 +5923,20 @@
 						<reference key="object" ref="67124884"/>
 						<reference key="parent" ref="991161599"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">840</int>
+						<reference key="object" ref="72703796"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="696351536"/>
+						</object>
+						<reference key="parent" ref="577801299"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">841</int>
+						<reference key="object" ref="696351536"/>
+						<reference key="parent" ref="72703796"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -6035,6 +6089,7 @@
 					<string>244.ImportedFromIB2</string>
 					<string>247.IBPluginDependency</string>
 					<string>247.ImportedFromIB2</string>
+					<string>249.IBEditorWindowLastContentRect</string>
 					<string>249.IBWindowTemplateEditedContentRect</string>
 					<string>249.ImportedFromIB2</string>
 					<string>249.editorWindowContentRectSynchronizationRect</string>
@@ -6437,6 +6492,8 @@
 					<string>835.IBPluginDependency</string>
 					<string>838.IBPluginDependency</string>
 					<string>839.IBPluginDependency</string>
+					<string>840.IBPluginDependency</string>
+					<string>841.IBPluginDependency</string>
 					<string>92.IBPluginDependency</string>
 					<string>92.ImportedFromIB2</string>
 				</object>
@@ -6548,11 +6605,11 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{14, 553}, {710, 292}}</string>
-					<string>{{14, 553}, {710, 292}}</string>
+					<string>{{14, 563}, {710, 282}}</string>
+					<string>{{14, 563}, {710, 282}}</string>
 					<reference ref="9"/>
 					<string>{{59, 583}, {710, 292}}</string>
-					<integer value="0" id="6"/>
+					<reference ref="8"/>
 					<reference ref="9"/>
 					<string>{3.40282e+38, 3.40282e+38}</string>
 					<string>{213, 107}</string>
@@ -6645,10 +6702,11 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{828, 556}, {278, 365}}</string>
+					<string>{{14, 596}, {278, 249}}</string>
+					<string>{{14, 596}, {278, 249}}</string>
 					<reference ref="9"/>
 					<string>{{828, 556}, {278, 365}}</string>
-					<reference ref="6"/>
+					<reference ref="8"/>
 					<reference ref="9"/>
 					<string>{3.40282e+38, 3.40282e+38}</string>
 					<string>{213, 107}</string>
@@ -7097,6 +7155,8 @@ Y2hhbmdlIHRoZSBvcmRlcg</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>
 					<reference ref="9"/>
 				</object>
 			</object>
@@ -7120,7 +7180,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">839</int>
+			<int key="maxID">841</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -7348,6 +7408,13 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/CMImageView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">Source/CMMCPConnection.h</string>
 					</object>
 				</object>