Changeset 3488

Timestamp:

12/26/06 16:05:10 (2 years ago)

Author:

timothy

Message:

Hooks up the create buddy interface to the new buddy list code. The buddy list has returned!

Files:

• trunk/Controllers/MVBuddyListController.h (modified) (2 diffs)
• trunk/Controllers/MVBuddyListController.m (modified) (21 diffs)
• trunk/Languages/English.lproj/MVBuddyList.nib/classes.nib (added)
• trunk/Languages/English.lproj/MVBuddyList.nib/info.nib (modified) (1 diff)
• trunk/Languages/English.lproj/MVBuddyList.nib/keyedobjects.nib (added)
• trunk/Models/JVBuddy.h (modified) (1 diff)
• trunk/Models/JVBuddy.m (modified) (4 diffs)

trunk/Controllers/MVBuddyListController.h

@@ -27 +27 @@
-        IBOutlet NSWindow *newPersonWindow;
-        IBOutlet NSTextField *nickname;
-PopUpButton *server
+TableView *servers
-        IBOutlet NSTextField *firstName;
-        IBOutlet NSTextField *lastName;
@@ -34 +34 @@
-        IBOutlet NSButton *addButton;
-
+        NSString *_addPerson;
+        NSMutableSet *_addServers;
+
-        NSMutableSet *_buddyList;
-        NSMutableSet *_onlineBuddies;
-        NSMutableArray *_buddyOrder;
-        NSString *_addPerson;
-
-        BOOL _showFullNames;

trunk/Controllers/MVBuddyListController.m

@@ -11 +11 @@
-static MVBuddyListController *sharedInstance = nil;
-
-@interface ABPerson (ABPersonPrivate)
-+ (ABPerson *) personFromDictionary:(NSDictionary *) dictionary;
-- (NSDictionary *) dictionaryRepresentation;
-@end
-
-#pragma mark -
-
-@interface MVBuddyListController (MVBuddyListControllerPrivate)
-- (void) _loadBuddyList;
@@ -30 +23 @@
-
-@implementation MVBuddyListController
-+ (void) initialize {
-        [ABPerson addPropertiesAndTypes:[NSDictionary dictionaryWithObjectsAndKeys:
-                [NSNumber numberWithUnsignedInt:kABMultiStringProperty], JVBuddyAddressBookIRCNicknameProperty,
-                [NSNumber numberWithUnsignedInt:kABStringProperty], JVBuddyAddressBookSpeechVoiceProperty, nil]];
-}
-
-+ (MVBuddyListController *) sharedBuddyList {
-        return ( sharedInstance ? sharedInstance : ( sharedInstance = [[self alloc] initWithWindowNibName:nil] ) );
@@ -87 +74 @@
-        [_oldPositions release];
-        [_addPerson release];
+        [_addServers release];
-
-        _onlineBuddies = nil;
@@ -93 +81 @@
-        _oldPositions = nil;
-        _addPerson = nil;
+        _addServers = nil;
-
-        [super dealloc];
@@ -113 +102 @@
-        [theColumn setDataCell:prototypeCell];
-
-
-
+
+
+
+
+
+
+
-
-        [pickerView setAllowsMultipleSelection:NO];
@@ -203 +197 @@
-        }
-
-auto
+
-        _addPerson = nil;
-
-        NSEnumerator *enumerator = [[[MVConnectionsController defaultController] connections] objectEnumerator];
-        MVChatConnection *connection = nil;
-        NSMenu *menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
-        NSMenuItem *item = nil;
-
-        while( ( connection = [enumerator nextObject] ) ) {
-                item = [[[NSMenuItem alloc] initWithTitle:[connection server] action:NULL keyEquivalent:@""] autorelease];
-                [menu addItem:item];
-        }
-
-        [server setMenu:menu];
-
-        [firstName setObjectValue:@""];
-        [lastName setObjectValue:@""];
-        [email setObjectValue:@""];
-        [image setImage:nil];
-
-        [[NSApplication sharedApplication] beginSheet:pickerWindow modalForWindow:[self window] modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
@@ -240 +217 @@
-
-        ABPerson *person = [[pickerView selectedRecords] lastObject];
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -260 +231 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        [[NSApplication sharedApplication] beginSheet:newPersonWindow modalForWindow:[self window] modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
@@ -280 +270 @@
-        }
-
-auto
+
-        _addPerson = nil;
+
+        [_addServers release];
+        _addServers = nil;
-}
-
@@ -290 +283 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        _addPerson = nil;
+
+        [_addServers release];
+        _addServers = nil;
-}
-
-- (void) controlTextDidChange:(NSNotification *) notification {
-
+
+
-        else [addButton setEnabled:NO];
-}
@@ -388 +340 @@
-
-- (void) setNewBuddyServer:(MVChatConnection *) connection {
-[server selectItemWithTitle:[connection server]];
+
-}
-
@@ -606 +558 @@
-
-- (id) tableView:(NSTableView *) view objectValueForTableColumn:(NSTableColumn *) column row:(int) row {
-
+
+
+
+
+
+
+
+
+
-
-        if( [[column identifier] isEqualToString:@"buddy"] ) {
@@ -625 +585 @@
-
-- (void) tableView:(NSTableView *) view willDisplayCell:(id) cell forTableColumn:(NSTableColumn *) column row:(int) row {
-
+
+
+
+
+
+
+
+
+
+
-        if( [[column identifier] isEqualToString:@"buddy"] ) {
-                JVBuddy *buddy = [_buddyOrder objectAtIndex:row];
@@ -693 +662 @@
-
-- (void) tableView:(NSTableView *) tableView setObjectValue:(id) object forTableColumn:(NSTableColumn *) tableColumn row:(int) row {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        JVBuddy *buddy = [_buddyOrder objectAtIndex:row];
-        id users = [buddy users];
@@ -712 +699 @@
-
-- (NSMenu *) tableView:(MVTableView *) tableView menuForTableColumn:(NSTableColumn *) tableColumn row:(int) row {
+        if( tableView != buddies ) return nil;
+
-        NSMenu *menu = [[actionMenu copyWithZone:[self zone]] autorelease];
-        JVBuddy *buddy = [_buddyOrder objectAtIndex:row];
@@ -745 +734 @@
-
-- (NSString *) tableView:(MVTableView *) tableView toolTipForTableColumn:(NSTableColumn *) column row:(int) row {
-
+
+
-        NSMutableString *ret = [NSMutableString string];
-        JVBuddy *buddy = [_buddyOrder objectAtIndex:row];
@@ -769 +759 @@
-
-- (void) tableViewSelectionDidChange:(NSNotification *) notification {
+        if( [notification object] != buddies ) return;
+
-        BOOL enabled = ! ( [buddies selectedRow] == -1 );
-        [sendMessageButton setEnabled:enabled];
@@ -776 +768 @@
-
-- (NSDragOperation) tableView:(NSTableView *) tableView validateDrop:(id <NSDraggingInfo>) info proposedRow:(int) row proposedDropOperation:(NSTableViewDropOperation) operation {
+        if( tableView != buddies ) return NSDragOperationNone;
+
-        if( operation == NSTableViewDropOn && row != -1 )
-                return NSDragOperationMove;
@@ -782 +776 @@
-
-- (BOOL) tableView:(NSTableView *) tableView acceptDrop:(id <NSDraggingInfo>) info row:(int) row dropOperation:(NSTableViewDropOperation) operation {
+        if( tableView != buddies ) return NO;
+
-        NSPasteboard *board = [info draggingPasteboard];
-        if( [board availableTypeFromArray:[NSArray arrayWithObject:NSFilenamesPboardType]] ) {
@@ -801 +797 @@
-
-- (NSRange) tableView:(MVTableView *) tableView rowsInRect:(NSRect) rect defaultRange:(NSRange) defaultRange {
+        if( tableView != buddies ) return defaultRange;
+
-        if( _animating ) return NSMakeRange( 0, [_buddyOrder count] );
-        else return defaultRange;
@@ -979 +977 @@
-                [self _manuallySortAndUpdate];
-        }
+
+        [buddy registerWithApplicableConnections];
-}
-

trunk/Languages/English.lproj/MVBuddyList.nib/info.nib

@@ -10 +10 @@
-                <string>552 603 220 194 0 0 1280 832 </string>
-                <key>168</key>
-87
+99
-        </dict>
-        <key>IBFramework Version</key>
-43
+54
-        <key>IBLockedObjects</key>
-        <array/>
-        <key>IBOpenObjects</key>
-        <array>
+                <integer>115</integer>
+                <integer>80</integer>
-                <integer>168</integer>
-                <integer>41</integer>
-                <integer>80</integer>
-        </array>
-        <key>IBSystem Version</key>
-8I1119
+9A321
-</dict>
-</plist>

trunk/Models/JVBuddy.h

@@ -83 +83 @@
-
-- (ABPerson *) addressBookPersonRecord;
+- (void) setAddressBookPersonRecord:(ABPerson *) record;
-- (void) editInAddressBook;
-- (void) viewInAddressBook;

trunk/Models/JVBuddy.m

@@ -30 +30 @@
-#pragma mark -
-
-WithDictionaryRepresentation:(NSDictionary *) dictionary
+
-        if( ( self = [super init] ) ) {
-                _rules = [[NSMutableArray allocWithZone:nil] initWithCapacity:5];
-                _users = [[NSMutableArray allocWithZone:nil] initWithCapacity:5];
-
+
+
+
+
+
+
+
+
+
+
+
-                NSData *data = [dictionary objectForKey:@"picture"];
-                if( [data isKindOfClass:[NSData class]] && [data length] )
@@ -60 +70 @@
-
-                string = [dictionary objectForKey:@"uniqueIdentifier"];
-
+
+
-                        _uniqueIdentifier = [string copyWithZone:nil];
-
+
+
+
+
-                        _uniqueIdentifier = [[NSString locallyUniqueString] retain];
+                }
-
-                string = [dictionary objectForKey:@"addressBookPersonRecord"];
@@ -76 +91 @@
-                        [rule release];
-                }
-
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _registerWithConnection: ) name:MVChatConnectionDidConnectNotification object:nil];
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _disconnected: ) name:MVChatConnectionDidDisconnectNotification object:nil];
-
-                [self registerWithApplicableConnections];
-        }
-
@@ -431 +441 @@
-}
-
+- (void) setAddressBookPersonRecord:(ABPerson *) record {
+        id old = _person;
+        _person = [record retain];
+        [old release];
+}
+
-- (void) editInAddressBook {
-        if( ! _person ) return;