aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Interfaces/English.lproj/UserManagerView.xib8
-rw-r--r--Source/SPUserManager.m13
2 files changed, 11 insertions, 10 deletions
diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib
index 99daff3c..869c6bb2 100644
--- a/Interfaces/English.lproj/UserManagerView.xib
+++ b/Interfaces/English.lproj/UserManagerView.xib
@@ -3,7 +3,7 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.InterfaceBuilderVersion">732</string>
<string key="IBDocument.AppKitVersion">1038.25</string>
<string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -15,8 +15,8 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>740</string>
- <string>1.2.1</string>
+ <string>732</string>
+ <string>1.2.5</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
@@ -391,7 +391,7 @@
<reference key="NSSuperview" ref="623571747"/>
<bool key="NSEnabled">YES</bool>
<object class="BWAnchoredButtonCell" key="NSCell" id="956168530">
- <int key="NSCellFlags">604110336</int>
+ <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="26"/>
diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m
index c2137f30..98db96f5 100644
--- a/Source/SPUserManager.m
+++ b/Source/SPUserManager.m
@@ -636,10 +636,12 @@
{
if ([self.managedObjectContext hasChanges])
{
- NSAlert *alert = [[[NSAlert alloc] init] autorelease];
- [alert addButtonWithTitle:NSLocalizedString(@"Continue", @"Continue")];
- [alert addButtonWithTitle:NSLocalizedString(@"Cancel",@"Cancel")];
- [alert setMessageText:@"Window has changes. All changes will be lost!"];
+ //NSAlert *alert = [[[NSAlert alloc] init] autorelease];
+ NSAlert *alert = [NSAlert alertWithMessageText:@"Window has changes. All changes will be lost!"
+ defaultButton:NSLocalizedString(@"Continue", @"Continue")
+ alternateButton:NSLocalizedString(@"Cancel",@"Cancel")
+ otherButton:nil
+ informativeTextWithFormat:@"Window has changes. All changes will be lost!"];
[alert setAlertStyle:NSWarningAlertStyle];
if ([alert runModal] == NSAlertAlternateReturn) // cancel
{
@@ -647,7 +649,6 @@
}
}
[self.managedObjectContext reset];
- [self _initializeUsers];
[treeController fetch:nil];
}
@@ -793,7 +794,7 @@
- (void)userManagerSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void*)context
{
- //[self refresh:nil];
+ [self refresh:nil];
}
- (BOOL)updateUsers:(NSArray *)updatedUsers