aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/UserManagerView.xib240
-rw-r--r--Source/SPUserManager.h1
-rw-r--r--Source/SPUserManager.m7
3 files changed, 139 insertions, 109 deletions
diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib
index edcf95dc..617efc9e 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,18 +15,18 @@
</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.2</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="592"/>
+ <integer value="31"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.brandonwalkin.BWToolkit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.brandonwalkin.BWToolkit</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -56,7 +56,7 @@
<string key="NSWindowTitle">User Managment</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{752, 506}</string>
<object class="NSView" key="NSWindowView" id="846307432">
<reference key="NSNextResponder"/>
@@ -148,7 +148,7 @@
<string key="NSColorName">controlBackgroundColor</string>
<object class="NSColor" key="NSColor" id="246134814">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="315534074">
@@ -412,7 +412,7 @@
<object class="NSTabViewItem" id="820796939">
<string key="NSIdentifier">General</string>
<object class="NSView" key="NSView" id="143215913">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="716372522"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -541,6 +541,7 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {480, 414}}</string>
+ <reference key="NSSuperview" ref="716372522"/>
</object>
<string key="NSLabel">General</string>
<reference key="NSColor" ref="409859189"/>
@@ -549,7 +550,7 @@
<object class="NSTabViewItem" id="1024639412">
<string key="NSIdentifier">Global Privileges</string>
<object class="NSView" key="NSView" id="202198269">
- <reference key="NSNextResponder" ref="716372522"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">288</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1366,7 +1367,6 @@
</object>
</object>
<string key="NSFrame">{{10, 33}, {480, 414}}</string>
- <reference key="NSSuperview" ref="716372522"/>
</object>
<string key="NSLabel">Global Privileges</string>
<reference key="NSColor" ref="409859189"/>
@@ -1643,13 +1643,13 @@
<reference key="NSTabView" ref="716372522"/>
</object>
</object>
- <reference key="NSSelectedTabViewItem" ref="1024639412"/>
+ <reference key="NSSelectedTabViewItem" ref="820796939"/>
<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="202198269"/>
+ <reference ref="143215913"/>
</object>
</object>
<object class="NSButton" id="445730006">
@@ -1711,7 +1711,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{752, 528}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSTreeController" id="889422316">
<object class="NSMutableArray" key="NSDeclaredKeys">
@@ -2363,39 +2363,6 @@
<int key="connectionID">542</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: selection.password</string>
- <reference key="source" ref="926329636"/>
- <reference key="destination" ref="889422316"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="926329636"/>
- <reference key="NSDestination" ref="889422316"/>
- <string key="NSLabel">value: selection.password</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">selection.password</string>
- <object class="NSDictionary" key="NSOptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSConditionallySetsHidden</string>
- <string>NSNoSelectionPlaceholder</string>
- <string>NSRaisesForNotApplicableKeys</string>
- <string>NSValidatesImmediately</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <boolean value="YES"/>
- <string>No Selection</string>
- <boolean value="NO"/>
- <boolean value="YES"/>
- </object>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">576</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">addUser:</string>
<reference key="source" ref="1001"/>
@@ -2469,35 +2436,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">value: arrangedObjects.displayName</string>
- <reference key="source" ref="716100442"/>
- <reference key="destination" ref="889422316"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="716100442"/>
- <reference key="NSDestination" ref="889422316"/>
- <string key="NSLabel">value: arrangedObjects.displayName</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">arrangedObjects.displayName</string>
- <object class="NSDictionary" key="NSOptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSAllowsEditingMultipleValuesSelection</string>
- <string>NSValidatesImmediately</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <boolean value="NO"/>
- <boolean value="YES"/>
- </object>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">604</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
<string key="label">value: selection.create_temporary_tables_priv</string>
<reference key="source" ref="460063174"/>
<reference key="destination" ref="889422316"/>
@@ -2513,37 +2451,6 @@
<int key="connectionID">606</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: selection.user</string>
- <reference key="source" ref="1021720165"/>
- <reference key="destination" ref="889422316"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="1021720165"/>
- <reference key="NSDestination" ref="889422316"/>
- <string key="NSLabel">value: selection.user</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">selection.user</string>
- <object class="NSDictionary" key="NSOptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSNoSelectionPlaceholder</string>
- <string>NSNotApplicablePlaceholder</string>
- <string>NSRaisesForNotApplicableKeys</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>No Selection</string>
- <string>User Not Selected</string>
- <boolean value="NO"/>
- </object>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">608</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">privsSupportedByServer</string>
<reference key="source" ref="1001"/>
@@ -3183,6 +3090,121 @@
</object>
<int key="connectionID">735</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: selection.password</string>
+ <reference key="source" ref="926329636"/>
+ <reference key="destination" ref="889422316"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="926329636"/>
+ <reference key="NSDestination" ref="889422316"/>
+ <string key="NSLabel">value: selection.password</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">selection.password</string>
+ <object class="NSDictionary" key="NSOptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSConditionallySetsHidden</string>
+ <string>NSNoSelectionPlaceholder</string>
+ <string>NSNullPlaceholder</string>
+ <string>NSRaisesForNotApplicableKeys</string>
+ <string>NSValidatesImmediately</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <boolean value="YES"/>
+ <string>No Selection</string>
+ <string>Empty Password</string>
+ <boolean value="NO"/>
+ <boolean value="YES"/>
+ </object>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">736</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">sortDescriptors: treeSortDescriptors</string>
+ <reference key="source" ref="889422316"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="889422316"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">sortDescriptors: treeSortDescriptors</string>
+ <string key="NSBinding">sortDescriptors</string>
+ <string key="NSKeyPath">treeSortDescriptors</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">740</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: selection.user</string>
+ <reference key="source" ref="1021720165"/>
+ <reference key="destination" ref="889422316"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="1021720165"/>
+ <reference key="NSDestination" ref="889422316"/>
+ <string key="NSLabel">value: selection.user</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">selection.user</string>
+ <object class="NSDictionary" key="NSOptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSNoSelectionPlaceholder</string>
+ <string>NSNotApplicablePlaceholder</string>
+ <string>NSNullPlaceholder</string>
+ <string>NSRaisesForNotApplicableKeys</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>No Selection</string>
+ <string>User Not Selected</string>
+ <string>Anonymous</string>
+ <boolean value="NO"/>
+ </object>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">741</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: arrangedObjects.displayName</string>
+ <reference key="source" ref="716100442"/>
+ <reference key="destination" ref="889422316"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="716100442"/>
+ <reference key="NSDestination" ref="889422316"/>
+ <string key="NSLabel">value: arrangedObjects.displayName</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">arrangedObjects.displayName</string>
+ <object class="NSDictionary" key="NSOptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSAllowsEditingMultipleValuesSelection</string>
+ <string>NSNullPlaceholder</string>
+ <string>NSValidatesImmediately</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <boolean value="NO"/>
+ <string>Anonymous</string>
+ <boolean value="YES"/>
+ </object>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">742</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -4297,11 +4319,11 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{204, 272}, {752, 506}}</string>
+ <string>{{59, 347}, {752, 506}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO"/>
<boolean value="NO"/>
- <string>{{204, 272}, {752, 506}}</string>
+ <string>{{59, 347}, {752, 506}}</string>
<boolean value="NO"/>
<boolean value="YES"/>
<string>{752, 506}</string>
@@ -4446,7 +4468,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">735</int>
+ <int key="maxID">742</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Source/SPUserManager.h b/Source/SPUserManager.h
index 48c8ad3f..0e619563 100644
--- a/Source/SPUserManager.h
+++ b/Source/SPUserManager.h
@@ -69,4 +69,5 @@
- (BOOL)updateUsers:(NSArray *)updatedUsers;
- (BOOL)grantPrivilegesToUser:(NSManagedObject *)user;
+- (NSArray *)treeSortDescriptors;
@end
diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m
index 40ec31e4..0a362395 100644
--- a/Source/SPUserManager.m
+++ b/Source/SPUserManager.m
@@ -226,6 +226,7 @@
}
// Reload data of the outline view with the changes.
[outlineView reloadData];
+ [treeController rearrangeObjects];
}
/**
@@ -375,6 +376,12 @@
}
}
+- (NSArray *)treeSortDescriptors
+{
+ NSSortDescriptor *descriptor = [[NSSortDescriptor alloc] initWithKey:@"displayName" ascending:YES];
+ return [NSArray arrayWithObject:descriptor];
+}
+
#pragma mark -
#pragma mark General IBAction methods
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 04:39:52 +0000