Skip to content
Browse files

Add support for ssh access use public key

  • Loading branch information...
1 parent 19da920 commit 1f1c33de8bbbce5ef77478b8d8d53e6bd84f519b @bububa bububa committed Jun 14, 2011
View
4 AddConnectionController.h
@@ -26,6 +26,7 @@
IBOutlet NSTextField *sshportTextField;
IBOutlet NSTextField *sshuserTextField;
IBOutlet NSSecureTextField *sshpasswordTextField;
+ IBOutlet NSTextField *sshkeyfileTextField;
IBOutlet ConnectionsArrayController *connectionsArrayController;
NSDictionary *connectionInfo;
NSManagedObjectContext *managedObjectContext;
@@ -47,6 +48,7 @@
@property (nonatomic, retain) NSTextField *sshportTextField;
@property (nonatomic, retain) NSTextField *sshuserTextField;
@property (nonatomic, retain) NSSecureTextField *sshpasswordTextField;
+@property (nonatomic, retain) NSTextField *sshkeyfileTextField;
@property (nonatomic, retain) NSDictionary *connectionInfo;
@property (nonatomic, retain) ConnectionsArrayController *connectionsArrayController;
@property (nonatomic, retain) NSManagedObjectContext *managedObjectContext;
@@ -57,4 +59,6 @@
- (IBAction)enableRepl:(id)sender;
- (BOOL)validateConnection;
+- (IBAction)chooseKeyPath:(id)sender;
+
@end
View
32 AddConnectionController.m
@@ -28,6 +28,7 @@ @implementation AddConnectionController
@synthesize sshportTextField;
@synthesize sshuserTextField;
@synthesize sshpasswordTextField;
+@synthesize sshkeyfileTextField;
@synthesize connectionInfo;
@synthesize connectionsArrayController;
@synthesize managedObjectContext;
@@ -54,6 +55,7 @@ - (void)dealloc {
[sshportTextField release];
[sshuserTextField release];
[sshpasswordTextField release];
+ [sshkeyfileTextField release];
[connectionInfo release];
[connectionsArrayController release];
[managedObjectContext release];
@@ -91,6 +93,7 @@ - (IBAction)add:(id)sender {
NSUInteger sshport;
NSString *sshuser;
NSString *sshpassword;
+ NSString *sshkeyfile;
if ([ [hostTextField stringValue] length] == 0) {
host = [[NSString alloc] initWithString:@"localhost"];
}else{
@@ -133,13 +136,14 @@ - (IBAction)add:(id)sender {
sshuser = [[NSString alloc] initWithString:[sshuserTextField stringValue]];
sshpassword = [[NSString alloc] initWithString:[sshpasswordTextField stringValue]];
+ sshkeyfile = [[NSString alloc] initWithString:[sshkeyfileTextField stringValue]];
if ([usesshCheckBox state])
{
usessh = 1;
}
- NSArray *keys = [[NSArray alloc] initWithObjects:@"host", @"hostport", @"userepl", @"servers", @"repl_name", @"alias", @"adminuser", @"adminpass", @"defaultdb", @"usessh", @"bindaddress", @"bindport", @"sshhost", @"sshport", @"sshuser", @"sshpassword", nil];
- NSArray *objs = [[NSArray alloc] initWithObjects:host, [NSNumber numberWithInt:hostport], [NSNumber numberWithInt:userepl], servers, repl_name, alias, adminuser, adminpass, defaultdb, [NSNumber numberWithInt:usessh], bindaddress, [NSNumber numberWithInt:bindport], sshhost, [NSNumber numberWithInt:sshport], sshuser, sshpassword, nil];
+ NSArray *keys = [[NSArray alloc] initWithObjects:@"host", @"hostport", @"userepl", @"servers", @"repl_name", @"alias", @"adminuser", @"adminpass", @"defaultdb", @"usessh", @"bindaddress", @"bindport", @"sshhost", @"sshport", @"sshuser", @"sshpassword", @"sshkeyfile", nil];
+ NSArray *objs = [[NSArray alloc] initWithObjects:host, [NSNumber numberWithInt:hostport], [NSNumber numberWithInt:userepl], servers, repl_name, alias, adminuser, adminpass, defaultdb, [NSNumber numberWithInt:usessh], bindaddress, [NSNumber numberWithInt:bindport], sshhost, [NSNumber numberWithInt:sshport], sshuser, sshpassword, sshkeyfile, nil];
if (!connectionInfo) {
connectionInfo = [[NSMutableDictionary alloc] initWithCapacity:13];
}
@@ -153,6 +157,7 @@ - (IBAction)add:(id)sender {
[sshhost release];
[sshuser release];
[sshpassword release];
+ [sshkeyfile release];
[bindaddress release];
if ([self validateConnection]) {
[self close];
@@ -198,13 +203,15 @@ - (IBAction)enableSSH:(id)sender
[sshuserTextField setEnabled:YES];
[sshpasswordTextField setEnabled:YES];
[sshportTextField setEnabled:YES];
+ [sshkeyfileTextField setEnabled:YES];
}else {
[bindaddressTextField setEnabled:NO];
[bindportTextField setEnabled:NO];
[sshhostTextField setEnabled:NO];
[sshuserTextField setEnabled:NO];
[sshpasswordTextField setEnabled:NO];
[sshportTextField setEnabled:NO];
+ [sshkeyfileTextField setEnabled:NO];
}
}
@@ -221,4 +228,25 @@ - (IBAction)enableRepl:(id)sender
}
}
+
+- (IBAction)chooseKeyPath:(id)sender
+{
+ NSOpenPanel *tvarNSOpenPanelObj = [NSOpenPanel openPanel];
+ NSInteger tvarNSInteger = [tvarNSOpenPanelObj runModalForTypes:nil];
+ if(tvarNSInteger == NSOKButton){
+ NSLog(@"doOpen we have an OK button");
+ //NSString * tvarDirectory = [tvarNSOpenPanelObj directory];
+ //NSLog(@"doOpen directory = %@",tvarDirectory);
+ NSString * tvarFilename = [tvarNSOpenPanelObj filename];
+ NSLog(@"doOpen filename = %@",tvarFilename);
+ [sshkeyfileTextField setStringValue:tvarFilename];
+ } else if(tvarNSInteger == NSCancelButton) {
+ NSLog(@"doOpen we have a Cancel button");
+ return;
+ } else {
+ NSLog(@"doOpen tvarInt not equal 1 or zero = %3d",tvarNSInteger);
+ return;
+ } // end if
+}
+
@end
View
2 Connection.h
@@ -21,6 +21,7 @@
NSNumber *sshport;
NSString *sshuser;
NSString *sshpassword;
+ NSString *sshkeyfile;
NSString *bindaddress;
NSNumber *bindport;
NSSet *databases;
@@ -41,6 +42,7 @@
@property (nonatomic, retain) NSNumber *sshport;
@property (nonatomic, retain) NSString *sshuser;
@property (nonatomic, retain) NSString *sshpassword;
+@property (nonatomic, retain) NSString *sshkeyfile;
@property (nonatomic, retain) NSString *bindaddress;
@property (nonatomic, retain) NSNumber *bindport;
@property (nonatomic, retain) NSNumber *usessh;
View
1 Connection.m
@@ -27,6 +27,7 @@ @implementation Connection
@dynamic sshport;
@dynamic sshuser;
@dynamic sshpassword;
+@dynamic sshkeyfile;
@dynamic bindaddress;
@dynamic bindport;
View
1 ConnectionWindowController.mm
@@ -83,6 +83,7 @@ - (void) connect:(BOOL)haveHostAddress {
[sshTunnel setUser:conn.sshuser];
[sshTunnel setHost:conn.sshhost];
[sshTunnel setPassword:conn.sshpassword];
+ [sshTunnel setKeyfile:conn.sshkeyfile];
[sshTunnel setPort:[conn.sshport intValue]];
[sshTunnel setPortForwardings:portForwardings];
[sshTunnel setAliveCountMax:3];
View
264 EditConnection.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.SystemVersion">10J869</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
+ <string key="NS.object.0">823</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -41,7 +41,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, 170}, {353, 515}}</string>
+ <string key="NSWindowRect">{{196, 123}, {353, 562}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Edit Connection</string>
<string key="NSWindowClass">NSWindow</string>
@@ -55,7 +55,7 @@
<object class="NSTextField" id="67757933">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{65, 434}, {166, 22}}</string>
+ <string key="NSFrame">{{65, 481}, {166, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="439898299">
@@ -93,7 +93,7 @@
<object class="NSTextField" id="192239309">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{22, 439}, {61, 17}}</string>
+ <string key="NSFrame">{{22, 486}, {61, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="978724357">
@@ -122,7 +122,7 @@
<object class="NSTextField" id="687256447">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{22, 478}, {38, 17}}</string>
+ <string key="NSFrame">{{22, 525}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="235274533">
@@ -178,7 +178,7 @@
<object class="NSTextField" id="728551703">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{65, 473}, {273, 22}}</string>
+ <string key="NSFrame">{{65, 520}, {273, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="899217921">
@@ -196,7 +196,7 @@
<object class="NSTextField" id="439810179">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{236, 439}, {38, 17}}</string>
+ <string key="NSFrame">{{236, 486}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="473250053">
@@ -212,7 +212,7 @@
<object class="NSTextField" id="397828869">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{279, 434}, {59, 22}}</string>
+ <string key="NSFrame">{{279, 481}, {59, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="15862352">
@@ -230,7 +230,7 @@
<object class="NSButton" id="192380983">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 226}, {128, 18}}</string>
+ <string key="NSFrame">{{18, 273}, {128, 18}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="39264354">
@@ -257,7 +257,7 @@
<object class="NSBox" id="974486977">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{20, 217}, {313, 5}}</string>
+ <string key="NSFrame">{{20, 264}, {313, 5}}</string>
<reference key="NSSuperview" ref="1006"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -279,7 +279,7 @@
<object class="NSTextField" id="323049007">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 194}, {92, 17}}</string>
+ <string key="NSFrame">{{17, 241}, {92, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="744042504">
@@ -295,7 +295,7 @@
<object class="NSTextField" id="536100685">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 189}, {112, 22}}</string>
+ <string key="NSFrame">{{114, 236}, {112, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="83619286">
@@ -313,7 +313,7 @@
<object class="NSTextField" id="257684037">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{231, 194}, {38, 17}}</string>
+ <string key="NSFrame">{{231, 241}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="231502663">
@@ -329,15 +329,15 @@
<object class="NSTextField" id="636345969">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{274, 189}, {59, 22}}</string>
+ <string key="NSFrame">{{274, 236}, {59, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="357557126">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="331414289"/>
- <string key="NSPlaceholderString">8888</string>
+ <string key="NSPlaceholderString">27017</string>
<reference key="NSControlView" ref="636345969"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="20197699"/>
@@ -347,7 +347,7 @@
<object class="NSTextField" id="1021737732">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 149}, {92, 17}}</string>
+ <string key="NSFrame">{{17, 196}, {92, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="619592540">
@@ -363,7 +363,7 @@
<object class="NSTextField" id="95969265">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 147}, {112, 22}}</string>
+ <string key="NSFrame">{{114, 194}, {112, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="549449150">
@@ -380,7 +380,7 @@
<object class="NSTextField" id="340020746">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 113}, {92, 17}}</string>
+ <string key="NSFrame">{{17, 160}, {92, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="12365007">
@@ -396,7 +396,7 @@
<object class="NSTextField" id="837364992">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 108}, {219, 22}}</string>
+ <string key="NSFrame">{{114, 155}, {219, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1059399721">
@@ -413,7 +413,7 @@
<object class="NSTextField" id="324050016">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 73}, {92, 17}}</string>
+ <string key="NSFrame">{{17, 120}, {92, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="947277020">
@@ -429,7 +429,7 @@
<object class="NSSecureTextField" id="468408808">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 68}, {219, 22}}</string>
+ <string key="NSFrame">{{114, 115}, {219, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="659565223">
@@ -450,7 +450,7 @@
<object class="NSTextField" id="349183617">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{231, 149}, {38, 17}}</string>
+ <string key="NSFrame">{{231, 196}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="590184183">
@@ -466,7 +466,7 @@
<object class="NSTextField" id="615991638">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{274, 147}, {59, 22}}</string>
+ <string key="NSFrame">{{274, 194}, {59, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="58763885">
@@ -484,7 +484,7 @@
<object class="NSTextField" id="944104151">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{65, 396}, {117, 22}}</string>
+ <string key="NSFrame">{{65, 443}, {117, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1660822">
@@ -502,7 +502,7 @@
<object class="NSTextField" id="771365645">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{22, 399}, {38, 17}}</string>
+ <string key="NSFrame">{{22, 446}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="544633735">
@@ -518,7 +518,7 @@
<object class="NSTextField" id="366242055">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{187, 398}, {50, 17}}</string>
+ <string key="NSFrame">{{187, 445}, {50, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="386380019">
@@ -534,7 +534,7 @@
<object class="NSSecureTextField" id="545686403">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{242, 396}, {96, 22}}</string>
+ <string key="NSFrame">{{242, 443}, {96, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="401094904">
@@ -556,7 +556,7 @@
<object class="NSTextField" id="470612027">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{22, 366}, {38, 17}}</string>
+ <string key="NSFrame">{{22, 413}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="422411707">
@@ -572,7 +572,7 @@
<object class="NSTextField" id="391926733">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{65, 363}, {273, 22}}</string>
+ <string key="NSFrame">{{65, 410}, {273, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="620180655">
@@ -590,7 +590,7 @@
<object class="NSButton" id="1055103075">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 332}, {128, 18}}</string>
+ <string key="NSFrame">{{18, 379}, {128, 18}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="351206321">
@@ -612,7 +612,7 @@
<object class="NSBox" id="455566274">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{20, 323}, {313, 5}}</string>
+ <string key="NSFrame">{{20, 370}, {313, 5}}</string>
<reference key="NSSuperview" ref="1006"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -634,7 +634,7 @@
<object class="NSTextField" id="883392167">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 300}, {61, 17}}</string>
+ <string key="NSFrame">{{17, 347}, {61, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="796776664">
@@ -650,7 +650,7 @@
<object class="NSTextField" id="776140439">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{96, 297}, {237, 22}}</string>
+ <string key="NSFrame">{{96, 344}, {237, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="598543486">
@@ -668,7 +668,7 @@
<object class="NSTextField" id="626401020">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 265}, {74, 17}}</string>
+ <string key="NSFrame">{{17, 312}, {74, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="229084784">
@@ -684,7 +684,7 @@
<object class="NSTextField" id="288080018">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{96, 262}, {237, 22}}</string>
+ <string key="NSFrame">{{96, 309}, {237, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="428415513">
@@ -699,8 +699,62 @@
<reference key="NSTextColor" ref="1027850759"/>
</object>
</object>
+ <object class="NSTextField" id="536562313">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 81}, {92, 17}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="835082251">
+ <int key="NSCellFlags">68288064</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">SSH KEY FILE</string>
+ <reference key="NSSupport" ref="331414289"/>
+ <reference key="NSControlView" ref="536562313"/>
+ <reference key="NSBackgroundColor" ref="837390586"/>
+ <reference key="NSTextColor" ref="872321760"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="1060354085">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{114, 76}, {152, 22}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="415273265">
+ <int key="NSCellFlags">-1804468671</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="331414289"/>
+ <string key="NSPlaceholderString">~/.ssh/id_rsa</string>
+ <reference key="NSControlView" ref="1060354085"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <reference key="NSBackgroundColor" ref="20197699"/>
+ <reference key="NSTextColor" ref="1027850759"/>
+ </object>
+ </object>
+ <object class="NSButton" id="758276270">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{274, 74}, {59, 25}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="695486255">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Select</string>
+ <reference key="NSSupport" ref="331414289"/>
+ <reference key="NSControlView" ref="758276270"/>
+ <int key="NSButtonFlags">-2038152961</int>
+ <int key="NSButtonFlags2">163</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ </object>
</object>
- <string key="NSFrameSize">{353, 515}</string>
+ <string key="NSFrameSize">{353, 562}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -924,6 +978,22 @@
</object>
<int key="connectionID">113</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">sshkeyfileTextField</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="1060354085"/>
+ </object>
+ <int key="connectionID">120</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">chooseKeyPath:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="758276270"/>
+ </object>
+ <int key="connectionID">121</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -969,8 +1039,6 @@
<reference ref="67757933"/>
<reference ref="192239309"/>
<reference ref="687256447"/>
- <reference ref="535974254"/>
- <reference ref="317947487"/>
<reference ref="728551703"/>
<reference ref="439810179"/>
<reference ref="397828869"/>
@@ -1000,6 +1068,11 @@
<reference ref="776140439"/>
<reference ref="626401020"/>
<reference ref="288080018"/>
+ <reference ref="536562313"/>
+ <reference ref="1060354085"/>
+ <reference ref="758276270"/>
+ <reference ref="535974254"/>
+ <reference ref="317947487"/>
</object>
<reference key="parent" ref="1005"/>
</object>
@@ -1466,6 +1539,48 @@
<reference key="object" ref="351206321"/>
<reference key="parent" ref="1055103075"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">114</int>
+ <reference key="object" ref="536562313"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="835082251"/>
+ </object>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">115</int>
+ <reference key="object" ref="1060354085"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="415273265"/>
+ </object>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">116</int>
+ <reference key="object" ref="758276270"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="695486255"/>
+ </object>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">117</int>
+ <reference key="object" ref="695486255"/>
+ <reference key="parent" ref="758276270"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">118</int>
+ <reference key="object" ref="415273265"/>
+ <reference key="parent" ref="1060354085"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">119</int>
+ <reference key="object" ref="835082251"/>
+ <reference key="parent" ref="536562313"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1493,6 +1608,15 @@
<string>107.IBPluginDependency</string>
<string>108.IBPluginDependency</string>
<string>109.IBPluginDependency</string>
+ <string>114.IBPluginDependency</string>
+ <string>114.IBViewBoundsToFrameTransform</string>
+ <string>115.IBPluginDependency</string>
+ <string>115.IBViewBoundsToFrameTransform</string>
+ <string>116.IBPluginDependency</string>
+ <string>116.IBViewBoundsToFrameTransform</string>
+ <string>117.IBPluginDependency</string>
+ <string>118.IBPluginDependency</string>
+ <string>119.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
<string>20.CustomClassName</string>
<string>20.IBPluginDependency</string>
@@ -1584,9 +1708,9 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>{{68, 232}, {353, 515}}</string>
+ <string>{{68, 185}, {353, 562}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{68, 232}, {353, 515}}</string>
+ <string>{{68, 185}, {353, 562}}</string>
<integer value="1"/>
<string>{196, 240}</string>
<string>{{202, 428}, {480, 270}}</string>
@@ -1616,6 +1740,21 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw4UAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABC5AAAw4UAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDiQAAw4WAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>ConnectionsArrayController</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1632,11 +1771,11 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDhYAAwiQAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDhYAAwrAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDOQAAwiQAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDOQAAwrAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
@@ -1779,7 +1918,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">113</int>
+ <int key="maxID">121</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1800,6 +1939,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>cancel:</string>
+ <string>chooseKeyPath:</string>
<string>enableRepl:</string>
<string>enableSSH:</string>
<string>save:</string>
@@ -1810,13 +1950,15 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>cancel:</string>
+ <string>chooseKeyPath:</string>
<string>enableRepl:</string>
<string>enableSSH:</string>
<string>save:</string>
@@ -1828,6 +1970,10 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">chooseKeyPath:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">enableRepl:</string>
<string key="candidateClassName">id</string>
</object>
@@ -1857,6 +2003,7 @@
<string>replnameTextField</string>
<string>serversTextField</string>
<string>sshhostTextField</string>
+ <string>sshkeyfileTextField</string>
<string>sshpasswordTextField</string>
<string>sshportTextField</string>
<string>sshuserTextField</string>
@@ -1877,6 +2024,7 @@
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
+ <string>NSTextField</string>
<string>NSSecureTextField</string>
<string>NSTextField</string>
<string>NSTextField</string>
@@ -1900,6 +2048,7 @@
<string>replnameTextField</string>
<string>serversTextField</string>
<string>sshhostTextField</string>
+ <string>sshkeyfileTextField</string>
<string>sshpasswordTextField</string>
<string>sshportTextField</string>
<string>sshuserTextField</string>
@@ -1957,6 +2106,10 @@
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">sshkeyfileTextField</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">sshpasswordTextField</string>
<string key="candidateClassName">NSSecureTextField</string>
</object>
@@ -1987,20 +2140,6 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">JSON/NSObject+SBJSON.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">JSON/SBJsonWriter.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">Tunnel.h</string>
</object>
</object>
@@ -2421,6 +2560,13 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">RegexKit.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
</object>
</object>
View
4 EditConnectionController.h
@@ -27,6 +27,7 @@
IBOutlet NSTextField *sshportTextField;
IBOutlet NSTextField *sshuserTextField;
IBOutlet NSSecureTextField *sshpasswordTextField;
+ IBOutlet NSTextField *sshkeyfileTextField;
IBOutlet ConnectionsArrayController *connectionsArrayController;
Connection *connection;
NSManagedObjectContext *managedObjectContext;
@@ -48,6 +49,7 @@
@property (nonatomic, retain) NSTextField *sshportTextField;
@property (nonatomic, retain) NSTextField *sshuserTextField;
@property (nonatomic, retain) NSSecureTextField *sshpasswordTextField;
+@property (nonatomic, retain) NSTextField *sshkeyfileTextField;
@property (nonatomic, retain) Connection *connection;
@property (nonatomic, retain) ConnectionsArrayController *connectionsArrayController;
@property (nonatomic, retain) NSManagedObjectContext *managedObjectContext;
@@ -58,4 +60,6 @@
- (IBAction)enableRepl:(id)sender;
- (BOOL)validateConnection:(NSDictionary *)connectionInfo;
+- (IBAction)chooseKeyPath:(id)sender;
+
@end
View
33 EditConnectionController.m
@@ -30,6 +30,7 @@ @implementation EditConnectionController
@synthesize sshportTextField;
@synthesize sshuserTextField;
@synthesize sshpasswordTextField;
+@synthesize sshkeyfileTextField;
@synthesize connection;
@synthesize connectionsArrayController;
@synthesize managedObjectContext;
@@ -56,6 +57,7 @@ - (void)dealloc {
[sshportTextField release];
[sshuserTextField release];
[sshpasswordTextField release];
+ [sshkeyfileTextField release];
[connection release];
[connectionsArrayController release];
[managedObjectContext release];
@@ -83,6 +85,7 @@ - (IBAction)showWindow:(id)sender {
[sshportTextField bind:@"value" toObject:connection withKeyPath:@"sshport" options:nil];
[sshuserTextField bind:@"value" toObject:connection withKeyPath:@"sshuser" options:nil];
[sshpasswordTextField bind:@"value" toObject:connection withKeyPath:@"sshpassword" options:nil];
+ [sshkeyfileTextField bind:@"value" toObject:connection withKeyPath:@"sshkeyfile" options:nil];
[usesshCheckBox bind:@"value" toObject:connection withKeyPath:@"usessh" options:nil];
[self enableSSH:nil];
[self enableRepl:nil];
@@ -109,6 +112,7 @@ - (IBAction)save:(id)sender {
NSUInteger sshport;
NSString *sshuser;
NSString *sshpassword;
+ NSString *sshkeyfile;
if ([ [hostTextField stringValue] length] == 0) {
host = [[NSString alloc] initWithString:@"localhost"];
}else{
@@ -150,13 +154,14 @@ - (IBAction)save:(id)sender {
}
sshuser = [[NSString alloc] initWithString:[sshuserTextField stringValue]];
sshpassword = [[NSString alloc] initWithString:[sshpasswordTextField stringValue]];
+ sshkeyfile = [[NSString alloc] initWithString:[sshkeyfileTextField stringValue]];
if ([usesshCheckBox state])
{
usessh = 1;
}
- NSArray *keys = [[NSArray alloc] initWithObjects:@"host", @"hostport", @"userepl", @"servers", @"repl_name", @"alias", @"adminuser", @"adminpass", @"defaultdb", @"usessh", @"bindaddress", @"bindport", @"sshhost", @"sshport", @"sshuser", @"sshpassword", nil];
- NSArray *objs = [[NSArray alloc] initWithObjects:host, [NSNumber numberWithInt:hostport], [NSNumber numberWithInt:userepl], servers, repl_name, alias, adminuser, adminpass, defaultdb, [NSNumber numberWithInt:usessh], bindaddress, [NSNumber numberWithInt:bindport], sshhost, [NSNumber numberWithInt:sshport], sshuser, sshpassword, nil];
+ NSArray *keys = [[NSArray alloc] initWithObjects:@"host", @"hostport", @"userepl", @"servers", @"repl_name", @"alias", @"adminuser", @"adminpass", @"defaultdb", @"usessh", @"bindaddress", @"bindport", @"sshhost", @"sshport", @"sshuser", @"sshpassword", @"sshkeyfile", nil];
+ NSArray *objs = [[NSArray alloc] initWithObjects:host, [NSNumber numberWithInt:hostport], [NSNumber numberWithInt:userepl], servers, repl_name, alias, adminuser, adminpass, defaultdb, [NSNumber numberWithInt:usessh], bindaddress, [NSNumber numberWithInt:bindport], sshhost, [NSNumber numberWithInt:sshport], sshuser, sshpassword, sshkeyfile, nil];
NSDictionary *connectionInfo = [[NSDictionary alloc] initWithObjects:objs forKeys:keys];
[keys release];
[objs release];
@@ -170,6 +175,7 @@ - (IBAction)save:(id)sender {
[sshhost release];
[sshuser release];
[sshpassword release];
+ [sshkeyfile release];
[bindaddress release];
if ([self validateConnection:connectionInfo]) {
@@ -189,6 +195,7 @@ - (IBAction)save:(id)sender {
connection.sshport = [connectionInfo objectForKey:@"sshport"];
connection.sshuser = [connectionInfo objectForKey:@"sshuser"];
connection.sshpassword = [connectionInfo objectForKey:@"sshpassword"];
+ connection.sshkeyfile = [connectionInfo objectForKey:@"sshkeyfile"];
[self close];
}
[connectionInfo release];
@@ -234,13 +241,15 @@ - (IBAction)enableSSH:(id)sender
[sshuserTextField setEnabled:YES];
[sshportTextField setEnabled:YES];
[sshpasswordTextField setEnabled:YES];
+ [sshkeyfileTextField setEnabled:YES];
}else {
[bindaddressTextField setEnabled:NO];
[bindportTextField setEnabled:NO];
[sshhostTextField setEnabled:NO];
[sshportTextField setEnabled:NO];
[sshuserTextField setEnabled:NO];
[sshpasswordTextField setEnabled:NO];
+ [sshkeyfileTextField setEnabled:NO];
}
}
@@ -258,4 +267,24 @@ - (IBAction)enableRepl:(id)sender
}
+- (IBAction)chooseKeyPath:(id)sender
+{
+ NSOpenPanel *tvarNSOpenPanelObj = [NSOpenPanel openPanel];
+ NSInteger tvarNSInteger = [tvarNSOpenPanelObj runModalForTypes:nil];
+ if(tvarNSInteger == NSOKButton){
+ NSLog(@"doOpen we have an OK button");
+ //NSString * tvarDirectory = [tvarNSOpenPanelObj directory];
+ //NSLog(@"doOpen directory = %@",tvarDirectory);
+ NSString * tvarFilename = [tvarNSOpenPanelObj filename];
+ NSLog(@"doOpen filename = %@",tvarFilename);
+ [sshkeyfileTextField setStringValue:tvarFilename];
+ } else if(tvarNSInteger == NSCancelButton) {
+ NSLog(@"doOpen we have a Cancel button");
+ return;
+ } else {
+ NSLog(@"doOpen tvarInt not equal 1 or zero = %3d",tvarNSInteger);
+ return;
+ } // end if
+}
+
@end
View
12 MongoHub.xcodeproj/project.pbxproj
@@ -273,7 +273,7 @@
1DA6806B11888BDD00DFDD29 /* NSString+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Extras.m"; sourceTree = "<group>"; };
1DBFFAF312C1FDF200B643CA /* NSProgressIndicator+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSProgressIndicator+Extras.h"; sourceTree = "<group>"; };
1DBFFAF412C1FDF200B643CA /* NSProgressIndicator+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSProgressIndicator+Extras.m"; sourceTree = "<group>"; };
- 1DCB3D0012C63CD400423160 /* MongoHub_DataModel 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MongoHub_DataModel 2.xcdatamodel"; sourceTree = "<group>"; };
+ 1DCB3D0012C63CD400423160 /* MongoHub_DataModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MongoHub_DataModel.xcdatamodel; sourceTree = "<group>"; };
1DCC562712C264600025F181 /* StatMonitorTableController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatMonitorTableController.h; sourceTree = "<group>"; };
1DCC562812C264600025F181 /* StatMonitorTableController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatMonitorTableController.m; sourceTree = "<group>"; };
1DD1CA8112C8EFD4007F2909 /* SyntaxDefinition.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SyntaxDefinition.plist; sourceTree = "<group>"; };
@@ -282,6 +282,7 @@
1DD1CA8712C8F004007F2909 /* HTML.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = HTML.plist; sourceTree = "<group>"; };
1DD1CA8812C8F004007F2909 /* Objective C.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Objective C.plist"; sourceTree = "<group>"; };
1DDC486812CB7758009924A1 /* JSON.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = JSON.plist; sourceTree = "<group>"; };
+ 1DDC5E0513A673AE00D0E4D2 /* MongoHub_DataModel2.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MongoHub_DataModel2.0.xcdatamodel; sourceTree = "<group>"; };
1DEC7F3912B7ECAC00FC804E /* Tunnel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tunnel.h; sourceTree = "<group>"; };
1DEC7F3A12B7ECAC00FC804E /* Tunnel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tunnel.m; sourceTree = "<group>"; };
1DEC7FF012B7EDB900FC804E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
@@ -300,7 +301,7 @@
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
2F7446980DB6B7EA00F9684A /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* MongoHub_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MongoHub_Prefix.pch; sourceTree = "<group>"; };
- 770B37EC0679A11B001EADE2 /* MongoHub_DataModel.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = MongoHub_DataModel.xcdatamodel; sourceTree = "<group>"; };
+ 770B37EC0679A11B001EADE2 /* MongoHub_DataModel1.0.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = MongoHub_DataModel1.0.xcdatamodel; sourceTree = "<group>"; };
77C82804067257F0000B614F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
77C8280B06725ACE000B614F /* MongoHub_AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MongoHub_AppDelegate.h; sourceTree = "<group>"; };
77C8280C06725ACE000B614F /* MongoHub_AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MongoHub_AppDelegate.m; sourceTree = "<group>"; };
@@ -1047,10 +1048,11 @@
1DCB3CFE12C63CD400423160 /* MongoHub_DataModel.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
- 770B37EC0679A11B001EADE2 /* MongoHub_DataModel.xcdatamodel */,
- 1DCB3D0012C63CD400423160 /* MongoHub_DataModel 2.xcdatamodel */,
+ 770B37EC0679A11B001EADE2 /* MongoHub_DataModel1.0.xcdatamodel */,
+ 1DCB3D0012C63CD400423160 /* MongoHub_DataModel.xcdatamodel */,
+ 1DDC5E0513A673AE00D0E4D2 /* MongoHub_DataModel2.0.xcdatamodel */,
);
- currentVersion = 1DCB3D0012C63CD400423160 /* MongoHub_DataModel 2.xcdatamodel */;
+ currentVersion = 1DCB3D0012C63CD400423160 /* MongoHub_DataModel.xcdatamodel */;
path = MongoHub_DataModel.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
View
82 MongoHub.xcodeproj/syd.mode1v3
@@ -254,7 +254,7 @@
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
<array>
<real>22</real>
- <real>223</real>
+ <real>350</real>
</array>
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
<array>
@@ -267,22 +267,26 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array>
<string>29B97314FDCFA39411CA2CEA</string>
+ <string>7756732906782D8800D1FEB8</string>
+ <string>1DCB3CFE12C63CD400423160</string>
<string>080E96DDFE201D6D7F000001</string>
+ <string>1D93C608118417D5003216F7</string>
<string>1D93C3CC11836849003216F7</string>
+ <string>1D93C29B118341BD003216F7</string>
<string>29B97317FDCFA39411CA2CEA</string>
<string>1C37FBAC04509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>9</integer>
- <integer>7</integer>
- <integer>2</integer>
+ <integer>20</integer>
+ <integer>12</integer>
+ <integer>10</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 67}, {245, 646}}</string>
+ <string>{{0, 89}, {372, 646}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -294,21 +298,21 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {262, 664}}</string>
+ <string>{{0, 0}, {389, 664}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>SCMStatusColumn</string>
<real>22</real>
<string>MainColumn</string>
- <real>223</real>
+ <real>350</real>
</array>
<key>RubberWindowFrame</key>
<string>50 73 1129 705 0 0 1280 778 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
<key>Proportion</key>
- <string>262pt</string>
+ <string>389pt</string>
</dict>
<dict>
<key>Dock</key>
@@ -321,19 +325,19 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>ConnectionWindowController.mm</string>
+ <string>Tunnel.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>ConnectionWindowController.mm</string>
+ <string>Tunnel.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>1DDC5D6913A64A7C00D0E4D2</string>
+ <string>1DDC5E5F13A6833E00D0E4D2</string>
<key>history</key>
<array>
<string>1D93C3E211836A06003216F7</string>
@@ -384,12 +388,8 @@
<string>1DEC7E0412B7A7FF00FC804E</string>
<string>1DEC7E4512B7B5B600FC804E</string>
<string>1DEC7F1912B7E6EE00FC804E</string>
- <string>1DCC9C2312C0F7BE003B101E</string>
- <string>1DBFFA5B12C1F0E800B643CA</string>
<string>1DBFFAF912C1FEE600B643CA</string>
<string>1DBFFAFB12C1FEE600B643CA</string>
- <string>1DBFFB4312C207CC00B643CA</string>
- <string>1DBFFBCD12C221C100B643CA</string>
<string>1DBFFC1C12C2279C00B643CA</string>
<string>1DCC55C112C254E10025F181</string>
<string>1DCC567412C26ABE0025F181</string>
@@ -400,22 +400,15 @@
<string>1DCC56F112C278240025F181</string>
<string>1DCB3C5A12C6171900423160</string>
<string>1DCB3CEE12C63ABB00423160</string>
- <string>1DCB3CF312C63ABB00423160</string>
- <string>1DCB3CF412C63ABB00423160</string>
- <string>1DCB3D1312C6438B00423160</string>
<string>1DCB3D3C12C64A7900423160</string>
- <string>1DCB3D4912C64B9000423160</string>
<string>1D640E8112C8B4D30030AA4C</string>
<string>1D640EB712C8B6BF0030AA4C</string>
<string>1D64101312C8EA840030AA4C</string>
<string>1D64101512C8EA840030AA4C</string>
- <string>1D64101912C8EA840030AA4C</string>
<string>1D64101A12C8EA840030AA4C</string>
<string>1D64102212C8EA840030AA4C</string>
<string>1D64104012C8EDB90030AA4C</string>
- <string>1DD1CAD312C9059D007F2909</string>
<string>1D245D6512CB6C7500665802</string>
- <string>1D245D6712CB6C7500665802</string>
<string>1DDC491E12CBB720009924A1</string>
<string>1DDC491F12CBB720009924A1</string>
<string>1DDC492112CBB720009924A1</string>
@@ -430,11 +423,7 @@
<string>1DDC498B12CBC58A009924A1</string>
<string>1DDC49B212CBCA60009924A1</string>
<string>1DDC49B312CBCA60009924A1</string>
- <string>1DDC49B612CBCA60009924A1</string>
<string>1D03E9E712D48DF400B72756</string>
- <string>1D04CABA12D71CDB007F3730</string>
- <string>1D04CABB12D71CDB007F3730</string>
- <string>1D04CABC12D71CDB007F3730</string>
<string>1D04CABF12D71CDB007F3730</string>
<string>1D04CAC012D71CDB007F3730</string>
<string>1D04CAC112D71CDB007F3730</string>
@@ -444,18 +433,35 @@
<string>1D04CC1B12D778CE007F3730</string>
<string>1D317F0612F0A8C600255AF7</string>
<string>1D317F0712F0A8C600255AF7</string>
- <string>1D3AA96213069B95004319D4</string>
- <string>1D3AA9691306A8E8004319D4</string>
<string>1D3AA96A1306A8E8004319D4</string>
<string>1D3AA97F1306C4CD004319D4</string>
<string>1D3AA9811306C4CD004319D4</string>
- <string>1D3AA9BC1306E1BC004319D4</string>
- <string>1D3AAA101306FC0B004319D4</string>
- <string>1D3AAA191306FD57004319D4</string>
- <string>1D3AAA2A1307036C004319D4</string>
<string>1DDC5D5A13A63E7C00D0E4D2</string>
- <string>1DDC5D6713A64A7C00D0E4D2</string>
- <string>1DDC5D6813A64A7C00D0E4D2</string>
+ <string>1DDC5DB413A66DDE00D0E4D2</string>
+ <string>1DDC5DB813A66DDE00D0E4D2</string>
+ <string>1DDC5DBA13A66DDE00D0E4D2</string>
+ <string>1DDC5DBB13A66DDE00D0E4D2</string>
+ <string>1DDC5DBC13A66DDE00D0E4D2</string>
+ <string>1DDC5DBD13A66DDE00D0E4D2</string>
+ <string>1DDC5DBE13A66DDE00D0E4D2</string>
+ <string>1DDC5DC313A66DDE00D0E4D2</string>
+ <string>1DDC5DC413A66DDE00D0E4D2</string>
+ <string>1DDC5DC513A66DDE00D0E4D2</string>
+ <string>1DDC5DC613A66DDE00D0E4D2</string>
+ <string>1DDC5DC713A66DDE00D0E4D2</string>
+ <string>1DDC5DDC13A66F7300D0E4D2</string>
+ <string>1DDC5DF313A6723300D0E4D2</string>
+ <string>1DDC5DFD13A6736D00D0E4D2</string>
+ <string>1DDC5E3913A6781F00D0E4D2</string>
+ <string>1DDC5E3A13A6781F00D0E4D2</string>
+ <string>1DDC5E3B13A6781F00D0E4D2</string>
+ <string>1DDC5E4813A67C1B00D0E4D2</string>
+ <string>1DDC5E4913A67C1B00D0E4D2</string>
+ <string>1DDC5E4A13A67C1B00D0E4D2</string>
+ <string>1DDC5E4C13A67C1B00D0E4D2</string>
+ <string>1DDC5E5313A67E3600D0E4D2</string>
+ <string>1DDC5E5A13A6819200D0E4D2</string>
+ <string>1DDC5E5B13A6819200D0E4D2</string>
</array>
</dict>
<key>SplitCount</key>
@@ -467,7 +473,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {862, 522}}</string>
+ <string>{{0, 0}, {735, 522}}</string>
<key>RubberWindowFrame</key>
<string>50 73 1129 705 0 0 1280 778 </string>
</dict>
@@ -487,7 +493,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 527}, {862, 137}}</string>
+ <string>{{0, 527}, {735, 137}}</string>
<key>RubberWindowFrame</key>
<string>50 73 1129 705 0 0 1280 778 </string>
</dict>
@@ -498,7 +504,7 @@
</dict>
</array>
<key>Proportion</key>
- <string>862pt</string>
+ <string>735pt</string>
</dict>
</array>
<key>Name</key>
@@ -653,10 +659,10 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
+ <string>1C78EAAD065D492600B07095</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>1D93C1AB118329FB003216F7</string>
<string>/Users/syd/Documents/Works/codes/MongoHub/MongoHub.xcodeproj</string>
- <string>1C78EAAD065D492600B07095</string>
</array>
<key>WindowString</key>
<string>50 73 1129 705 0 0 1280 778 </string>
View
4,806 MongoHub.xcodeproj/syd.pbxuser
4,667 additions, 139 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 MongoHub_AppDelegate.m
@@ -110,7 +110,6 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator {
}
NSURL *url = [NSURL fileURLWithPath: [applicationSupportDirectory stringByAppendingPathComponent: @"storedata"]];
-
// set store options to enable spotlight indexing
NSMutableDictionary *storeOptions = [NSMutableDictionary dictionary];
[storeOptions setObject:YOUR_EXTERNAL_RECORD_EXTENSION forKey:NSExternalRecordExtensionOption];
@@ -322,6 +321,7 @@ - (IBAction)addConection:(id)sender {
[newObj setValue:[[sender object] objectForKey:@"bindport"] forKey:@"bindport"];
[newObj setValue:[[sender object] objectForKey:@"sshhost"] forKey:@"sshhost"];
[newObj setValue:[[sender object] objectForKey:@"sshport"] forKey:@"sshport"];
+ [newObj setValue:[[sender object] objectForKey:@"sshkeyfile"] forKey:@"sshkeyfile"];
[newObj setValue:[[sender object] objectForKey:@"sshuser"] forKey:@"sshuser"];
[newObj setValue:[[sender object] objectForKey:@"sshpassword"] forKey:@"sshpassword"];
[connectionsArrayController addObject:newObj];
View
2 MongoHub_DataModel.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
- <string>MongoHub_DataModel 2.xcdatamodel</string>
+ <string>MongoHub_DataModel.xcdatamodel</string>
</dict>
</plist>
View
BIN MongoHub_DataModel.xcdatamodeld/MongoHub_DataModel.xcdatamodel/elements
Binary file not shown.
View
BIN MongoHub_DataModel.xcdatamodeld/MongoHub_DataModel.xcdatamodel/layout
Binary file not shown.
View
BIN MongoHub_DataModel.xcdatamodeld/MongoHub_DataModel1.0.xcdatamodel/elements
Binary file not shown.
View
BIN MongoHub_DataModel.xcdatamodeld/MongoHub_DataModel1.0.xcdatamodel/layout
Binary file not shown.
View
0 ...MongoHub_DataModel 2.xcdatamodel/elements → ...ongoHub_DataModel2.0.xcdatamodel/elements
File renamed without changes.
View
0 ...d/MongoHub_DataModel 2.xcdatamodel/layout → .../MongoHub_DataModel2.0.xcdatamodel/layout
File renamed without changes.
View
264 NewConnection.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.SystemVersion">10J869</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
+ <string key="NS.object.0">823</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -41,7 +41,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{196, -4}, {353, 514}}</string>
+ <string key="NSWindowRect">{{196, -46}, {353, 556}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Add New Connection</string>
<string key="NSWindowClass">NSWindow</string>
@@ -55,7 +55,7 @@
<object class="NSTextField" id="385098847">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{60, 433}, {166, 22}}</string>
+ <string key="NSFrame">{{60, 475}, {166, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="831759586">
@@ -93,7 +93,7 @@
<object class="NSTextField" id="481817906">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 438}, {61, 17}}</string>
+ <string key="NSFrame">{{17, 480}, {61, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="693908631">
@@ -122,7 +122,7 @@
<object class="NSTextField" id="804787260">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 477}, {38, 17}}</string>
+ <string key="NSFrame">{{17, 519}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="808162319">
@@ -178,7 +178,7 @@
<object class="NSTextField" id="140042863">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{60, 472}, {273, 22}}</string>
+ <string key="NSFrame">{{60, 514}, {273, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="528545305">
@@ -196,7 +196,7 @@
<object class="NSTextField" id="121248960">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{231, 438}, {38, 17}}</string>
+ <string key="NSFrame">{{231, 480}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="78535634">
@@ -212,7 +212,7 @@
<object class="NSTextField" id="882441313">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{274, 433}, {59, 22}}</string>
+ <string key="NSFrame">{{274, 475}, {59, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="40956291">
@@ -230,7 +230,7 @@
<object class="NSButton" id="408554184">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 226}, {128, 18}}</string>
+ <string key="NSFrame">{{18, 268}, {128, 18}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="786089172">
@@ -257,7 +257,7 @@
<object class="NSBox" id="428535044">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{20, 217}, {313, 5}}</string>
+ <string key="NSFrame">{{20, 259}, {313, 5}}</string>
<reference key="NSSuperview" ref="1006"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -279,7 +279,7 @@
<object class="NSTextField" id="774814530">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 194}, {92, 17}}</string>
+ <string key="NSFrame">{{17, 236}, {92, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="698125176">
@@ -295,7 +295,7 @@
<object class="NSTextField" id="783184467">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 189}, {112, 22}}</string>
+ <string key="NSFrame">{{114, 231}, {112, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="590402444">
@@ -313,7 +313,7 @@
<object class="NSTextField" id="848451483">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{231, 194}, {38, 17}}</string>
+ <string key="NSFrame">{{231, 236}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="798453179">
@@ -329,15 +329,15 @@
<object class="NSTextField" id="679797063">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{274, 189}, {59, 22}}</string>
+ <string key="NSFrame">{{274, 231}, {59, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="683783072">
<int key="NSCellFlags">-1267597759</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="625640474"/>
- <string key="NSPlaceholderString">8888</string>
+ <string key="NSPlaceholderString">27017</string>
<reference key="NSControlView" ref="679797063"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="514943928"/>
@@ -347,7 +347,7 @@
<object class="NSTextField" id="1018458001">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 149}, {92, 17}}</string>
+ <string key="NSFrame">{{17, 191}, {92, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="463935641">
@@ -363,7 +363,7 @@
<object class="NSTextField" id="284987309">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 147}, {112, 22}}</string>
+ <string key="NSFrame">{{114, 189}, {112, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1003195172">
@@ -380,7 +380,7 @@
<object class="NSTextField" id="1052798818">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 113}, {100, 17}}</string>
+ <string key="NSFrame">{{17, 155}, {100, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="992486977">
@@ -396,7 +396,7 @@
<object class="NSTextField" id="843934097">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 108}, {219, 22}}</string>
+ <string key="NSFrame">{{114, 150}, {219, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="873568523">
@@ -413,7 +413,7 @@
<object class="NSTextField" id="758234365">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 73}, {92, 17}}</string>
+ <string key="NSFrame">{{17, 115}, {92, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="391877378">
@@ -429,7 +429,7 @@
<object class="NSSecureTextField" id="712071201">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{114, 68}, {219, 22}}</string>
+ <string key="NSFrame">{{114, 110}, {219, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="294995091">
@@ -450,7 +450,7 @@
<object class="NSTextField" id="866055918">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{231, 149}, {38, 17}}</string>
+ <string key="NSFrame">{{231, 191}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1048235215">
@@ -466,7 +466,7 @@
<object class="NSTextField" id="560730068">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{274, 146}, {59, 22}}</string>
+ <string key="NSFrame">{{274, 188}, {59, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="966951036">
@@ -484,7 +484,7 @@
<object class="NSTextField" id="332482545">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{60, 400}, {117, 22}}</string>
+ <string key="NSFrame">{{60, 442}, {117, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="8417176">
@@ -502,7 +502,7 @@
<object class="NSTextField" id="757623527">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 403}, {38, 17}}</string>
+ <string key="NSFrame">{{17, 445}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="945672524">
@@ -518,7 +518,7 @@
<object class="NSTextField" id="920865441">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{182, 402}, {56, 17}}</string>
+ <string key="NSFrame">{{182, 444}, {56, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="610098413">
@@ -534,7 +534,7 @@
<object class="NSSecureTextField" id="88230749">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{237, 400}, {96, 22}}</string>
+ <string key="NSFrame">{{237, 442}, {96, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="515246835">
@@ -556,7 +556,7 @@
<object class="NSTextField" id="1017411476">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 366}, {38, 17}}</string>
+ <string key="NSFrame">{{17, 408}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="416826863">
@@ -572,7 +572,7 @@
<object class="NSTextField" id="323900807">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{60, 364}, {273, 22}}</string>
+ <string key="NSFrame">{{60, 406}, {273, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="485838073">
@@ -590,7 +590,7 @@
<object class="NSButton" id="166628829">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 332}, {128, 18}}</string>
+ <string key="NSFrame">{{18, 374}, {128, 18}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="582657572">
@@ -612,7 +612,7 @@
<object class="NSBox" id="183730265">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{20, 323}, {313, 5}}</string>
+ <string key="NSFrame">{{20, 365}, {313, 5}}</string>
<reference key="NSSuperview" ref="1006"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -634,7 +634,7 @@
<object class="NSTextField" id="853544458">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 300}, {61, 17}}</string>
+ <string key="NSFrame">{{17, 342}, {61, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="99198770">
@@ -650,7 +650,7 @@
<object class="NSTextField" id="728461863">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{99, 297}, {234, 22}}</string>
+ <string key="NSFrame">{{99, 339}, {234, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="19818498">
@@ -668,7 +668,7 @@
<object class="NSTextField" id="584479736">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 265}, {77, 17}}</string>
+ <string key="NSFrame">{{17, 307}, {77, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="404073705">
@@ -684,7 +684,7 @@
<object class="NSTextField" id="221760659">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags