Changeset 2103

Timestamp:

11/12/04 22:17:34 (4 years ago)

Author:

timothy

Message:

Merged more of the trunk changes into the overhaul branch.

Files:

• branches/overhaul/JVChatRoom.m (modified) (1 diff)
• branches/overhaul/JVDirectChat.h (modified) (1 diff)
• branches/overhaul/JVDirectChat.m (modified) (7 diffs)
• branches/overhaul/MVBuddyListController.m (modified) (3 diffs)
• branches/overhaul/MVConnectionsController.m (modified) (2 diffs)

branches/overhaul/JVChatRoom.m

@@ -467 +467 @@
-                        NSEnumerator *enumerator = [[[mbr menu] itemArray] objectEnumerator];
-                        while( ( item = [enumerator nextObject] ) ) [ret addObject:[[item copy] autorelease]];
+
+                        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( NSArray * ), @encode( id ), @encode( id ), nil];
+                        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+
+                        [invocation setSelector:@selector( contextualMenuItemsForObject:inView: )];
+                        [invocation setArgument:&mbr atIndex:2];
+                        [invocation setArgument:&self atIndex:3];
+
+                        NSArray *results = [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+                        if( [results count] ) {
+                                [ret addObject:[NSMenuItem separatorItem]];
+
+                                NSArray *items = nil;
+                                enumerator = [results objectEnumerator];
+                                while( ( items = [enumerator nextObject] ) ) {
+                                        if( ! [items respondsToSelector:@selector( objectEnumerator )] ) continue;
+                                        NSEnumerator *ienumerator = [items objectEnumerator];
+                                        while( ( item = [ienumerator nextObject] ) )
+                                                if( [item isKindOfClass:[NSMenuItem class]] ) [ret addObject:item];
+                                }
+
+                                if( [[ret lastObject] isSeparatorItem] )
+                                        [ret removeObjectIdenticalTo:[ret lastObject]];
+                        }
-                } else {
-                        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Send Message", "send message contextual menu") action:NULL keyEquivalent:@""] autorelease];

branches/overhaul/JVDirectChat.h

@@ -36 +36 @@
-        long _previousLogOffset;
-        BOOL _forceSplitViewPosition;
+
+        BOOL _loadingPersonImage;
+        NSData *_personImageData;
-}
-- (id) initWithTarget:(id) target;

branches/overhaul/JVDirectChat.m

@@ -97 +97 @@
-static NSString *JVToolbarClearItemIdentifier = @"JVToolbarClearItem";
-
-
+ <ABImageClient>
-- (void) addEventMessageToLogAndDisplay:(NSString *) message withName:(NSString *) name andAttributes:(NSDictionary *) attributes entityEncodeAttributes:(BOOL) encode;
-- (void) addMessageToLogAndDisplay:(NSData *) message fromUser:(MVChatUser *) user asAction:(BOOL) action;
@@ -749 +749 @@
-
-        // allow commands to be passed to plugins if we arn't connected, allow commands to pass to plugins and server if we are just out of the room
-! [[[send textStorage] string] hasPrefix:@"/"]
+( ! [[[send textStorage] string] hasPrefix:@"/"] || [[[send textStorage] string] hasPrefix:@"//"] )
-
-        _historyIndex = 0;
@@ -772 +772 @@
-
-                if( ( [subMsg length] >= 1 && range.length ) || ( [subMsg length] && ! range.length ) ) {
-
+&& ! [[subMsg string] hasPrefix:@"//"] 
-                                BOOL handled = NO;
-                                NSScanner *scanner = [NSScanner scannerWithString:[subMsg string]];
@@ -788 +788 @@
-                                        [[self connection] sendRawMessage:[command stringByAppendingFormat:@" %@", [arguments string]]];
-                        } else {
+                                if( [[subMsg string] hasPrefix:@"//"] ) {
+                                        [subMsg deleteCharactersInRange:NSMakeRange(0,1)];
+                                }
-                                if( [[NSUserDefaults standardUserDefaults] boolForKey:@"MVChatNaturalActions"] && ! action ) {
-                                        extern NSArray *JVAutoActionVerbs;
@@ -1129 +1132 @@
-
-- (NSArray *) webView:(WebView *) sender contextMenuItemsForElement:(NSDictionary *) element defaultMenuItems:(NSArray *) defaultMenuItems {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                [item setTarget:self];
-                [item setAction:@selector( clearDisplay: )];
-                [ret addObject:item];
-
+
+
+
+
+
+
+
-
-        return ret;
@@ -1866 +1886 @@
-}
-
+- (void) consumeImageData:(NSData *) data forTag:(int) tag {
+        [_personImageData autorelease];
+        _personImageData = [data retain];
+        _loadingPersonImage = NO;
+}
+
-- (void) _saveSelfIcon {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                return;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1885 +1926 @@
-                return;
-        }
-
-
+
-        [imageData writeToFile:[NSString stringWithFormat:@"/tmp/%@.tif", [buddy uniqueIdentifier]] atomically:NO];
-}

branches/overhaul/MVBuddyListController.m

@@ -2 +2 @@
-#import <ChatCore/MVChatConnection.h>
-#import <ChatCore/NSStringAdditions.h>
+#import <ChatCore/MVChatPluginManager.h>
+#import <ChatCore/NSMethodSignatureAdditions.h>
-
-#import "MVBuddyListController.h"
@@ -375 +377 @@
-                if( emailValue && index != NSNotFound ) {
-                        [emailValue replaceValueAtIndex:index withValue:[email objectValue]];
-
+if( [(NSString *)[email objectValue] length] ) 
-                        emailValue = [[[ABMutableMultiValue alloc] init] autorelease];
-                        [emailValue addValue:[email objectValue] withLabel:kABOtherLabel];
-                }
-
-
+
+
-
-                [person setImageData:[[image image] TIFFRepresentation]];
@@ -741 +744 @@
-
-- (NSMenu *) tableView:(MVTableView *) tableView menuForTableColumn:(NSTableColumn *) tableColumn row:(int) row {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/overhaul/MVConnectionsController.m

@@ -895 +895 @@
-- (NSMenu *) tableView:(NSTableView *) view menuForTableColumn:(NSTableColumn *) column row:(int) row {
-        if( view == connections ) {
+                MVChatConnection *connection = [[_bookmarks objectAtIndex:row] objectForKey:@"connection"];
+                BOOL connected = [connection isConnected];
-                NSMenu *menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
-                NSMenuItem *item = nil;
-                BOOL connected = [(MVChatConnection *)[[_bookmarks objectAtIndex:row] objectForKey:@"connection"] isConnected];
-
-                item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Get Info", "get info contextual menu item title" ) action:@selector( getInfo: ) keyEquivalent:@""] autorelease];
@@ -930 +931 @@
-                [item setTarget:self];
-                [menu addItem:item];
+
+                NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( NSArray * ), @encode( id ), @encode( id ), nil];
+                NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
+                id view = nil;
+
+                [invocation setSelector:@selector( contextualMenuItemsForObject:inView: )];
+                [invocation setArgument:&connection atIndex:2];
+                [invocation setArgument:&view atIndex:3];
+
+                NSArray *results = [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+                if( [results count] ) {
+                        [menu addItem:[NSMenuItem separatorItem]];
+                        
+                        NSArray *items = nil;
+                        NSEnumerator *enumerator = [results objectEnumerator];
+                        while( ( items = [enumerator nextObject] ) ) {
+                                if( ! [items respondsToSelector:@selector( objectEnumerator )] ) continue;
+                                NSEnumerator *ienumerator = [items objectEnumerator];
+                                while( ( item = [ienumerator nextObject] ) )
+                                        if( [item isKindOfClass:[NSMenuItem class]] ) [menu addItem:item];
+                        }
+                }
+
+                if( [[[menu itemArray] lastObject] isSeparatorItem] )
+                        [menu removeItem:[[menu itemArray] lastObject]];
-
-                return [[menu retain] autorelease];