aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Interfaces/English.lproj/UserManagerView.xib12
-rw-r--r--Source/SPUserManager.h4
-rw-r--r--Source/SPUserManager.m10
3 files changed, 13 insertions, 13 deletions
diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib
index 2961ebd1..557617f2 100644
--- a/Interfaces/English.lproj/UserManagerView.xib
+++ b/Interfaces/English.lproj/UserManagerView.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="31"/>
+ <integer value="27"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -395,7 +395,7 @@
<object class="NSTabViewItem" id="820796939">
<string key="NSIdentifier">General</string>
<object class="NSView" key="NSView" id="143215913">
- <reference key="NSNextResponder" ref="716372522"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -524,7 +524,6 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {511, 414}}</string>
- <reference key="NSSuperview" ref="716372522"/>
</object>
<string key="NSLabel">General</string>
<reference key="NSColor" ref="409859189"/>
@@ -1314,7 +1313,7 @@
<object class="NSTabViewItem" id="285628164">
<string key="NSIdentifier">Resources</string>
<object class="NSView" key="NSView" id="169019919">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="716372522"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1579,19 +1578,20 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {511, 414}}</string>
+ <reference key="NSSuperview" ref="716372522"/>
</object>
<string key="NSLabel">Resources</string>
<reference key="NSColor" ref="409859189"/>
<reference key="NSTabView" ref="716372522"/>
</object>
</object>
- <reference key="NSSelectedTabViewItem" ref="820796939"/>
+ <reference key="NSSelectedTabViewItem" ref="285628164"/>
<reference key="NSFont" ref="746597359"/>
<int key="NSTvFlags">0</int>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="143215913"/>
+ <reference ref="169019919"/>
</object>
</object>
<object class="NSButton" id="445730006">
diff --git a/Source/SPUserManager.h b/Source/SPUserManager.h
index febeb472..09c1ecb5 100644
--- a/Source/SPUserManager.h
+++ b/Source/SPUserManager.h
@@ -26,7 +26,7 @@
@class MCPConnection;
-@interface SPUserManager : NSObject {
+@interface SPUserManager : NSWindowController {
NSPersistentStoreCoordinator *persistentStoreCoordinator;
NSManagedObjectModel *managedObjectModel;
@@ -40,7 +40,7 @@
IBOutlet NSOutlineView* outlineView;
IBOutlet NSTabView *tabView;
IBOutlet NSTreeController *treeController;
- IBOutlet NSWindow *window;
+// IBOutlet NSWindow *window;
IBOutlet NSPanel *addHostSheet;
}
diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m
index e44c9e51..973ff142 100644
--- a/Source/SPUserManager.m
+++ b/Source/SPUserManager.m
@@ -105,7 +105,7 @@
[self _initializeUsers];
// [NSThread detachNewThreadSelector:@selector(_initializeUsers) toTarget:self withObject:nil];
- [window makeKeyAndOrderFront:nil];
+ [[self window] makeKeyAndOrderFront:nil];
}
- (void)_initializeUsers
@@ -293,7 +293,7 @@
if (!outlineView) {
[NSBundle loadNibNamed:@"UserManagerView" owner:self];
}
- [window makeKeyAndOrderFront:nil];
+ [[self window] makeKeyAndOrderFront:nil];
}
#pragma mark -
@@ -362,7 +362,7 @@
- (IBAction)doCancel:(id)sender
{
[[self managedObjectContext] rollback];
- [window close];
+ [[self window] close];
}
- (IBAction)doApply:(id)sender
@@ -375,7 +375,7 @@
}
else
{
- [window close];
+ [[self window] close];
}
// [self _clearData];
}
@@ -643,7 +643,7 @@
nil,
nil,
nil,
- window,
+ [self window],
self,
NULL,
NULL,