Changeset 2364

Timestamp:

02/21/05 23:43:23 (4 years ago)

Author:

timothy

Message:

* Moved AppleScript? plugin support to a plugin like F-Script.
* Added: /as and /applescript commands to load, unload and edit plugins.
* AppleScript? editor is work in progress. Currently only lets you read the script. It will be like a mini ScriptEditor? soon.

Files:

• trunk/Chat Core.xcode/project.pbxproj (modified) (5 diffs)
• trunk/Colloquy.pch (modified) (1 diff)
• trunk/Colloquy.xcode/project.pbxproj (modified) (8 diffs)
• trunk/JVChatController.m (modified) (2 diffs)
• trunk/JVChatRoomPanel.m (modified) (2 diffs)
• trunk/JVChatTranscriptPanel.m (modified) (2 diffs)
• trunk/JVDirectChatPanel.m (modified) (2 diffs)
• trunk/JVNotificationController.m (modified) (2 diffs)
• trunk/MVApplicationController.m (modified) (2 diffs)
• trunk/MVChatConnection.m (modified) (2 diffs)
• trunk/MVChatPluginManager.m (modified) (2 diffs)
• trunk/MVIRCChatConnection.m (modified) (1 diff)
• trunk/Plug-Ins/AppleScript Support (added)
• trunk/Plug-Ins/AppleScript Support/AppleScript Support.pch (added)
• trunk/Plug-Ins/AppleScript Support/AppleScript Support.xcode (added)
• trunk/Plug-Ins/AppleScript Support/AppleScript Support.xcode/project.pbxproj (added)
• trunk/Plug-Ins/AppleScript Support/AppleScript Support.xcode/timothy.mode1 (added)
• trunk/Plug-Ins/AppleScript Support/AppleScript Support.xcode/timothy.pbxuser (added)
• trunk/Plug-Ins/AppleScript Support/AppleScriptPanel.nib (added)
• trunk/Plug-Ins/AppleScript Support/AppleScriptPanel.nib/classes.nib (added)
• trunk/Plug-Ins/AppleScript Support/AppleScriptPanel.nib/info.nib (added)
• trunk/Plug-Ins/AppleScript Support/AppleScriptPanel.nib/keyedobjects.nib (added)
• trunk/Plug-Ins/AppleScript Support/Info.plist (added)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptChatPlugin.h (moved) (moved from trunk/MVChatScriptPlugin.h) (2 diffs)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptChatPlugin.m (moved) (moved from trunk/MVChatScriptPlugin.m) (4 diffs)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptEditorPanel.h (added)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptEditorPanel.m (added)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptPluginLoader.h (added)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptPluginLoader.m (added)
• trunk/Plug-Ins/AppleScript Support/scriptEditor.png (added)

trunk/Chat Core.xcode/project.pbxproj

@@ -148 +148 @@
-//1C3
-//1C4
-                1C1C564F059EA8C9002FBEFB = {
-                        fileEncoding = 4;
-                        isa = PBXFileReference;
-                        lastKnownFileType = sourcecode.c.h;
-                        path = MVChatScriptPlugin.h;
-                        refType = 4;
-                        sourceTree = "<group>";
-                };
-                1C1C5650059EA8C9002FBEFB = {
-                        fileEncoding = 4;
-                        isa = PBXFileReference;
-                        lastKnownFileType = sourcecode.c.objc;
-                        path = MVChatScriptPlugin.m;
-                        refType = 4;
-                        sourceTree = "<group>";
-                };
-                1C1C5651059EA8C9002FBEFB = {
-                        fileRef = 1C1C564F059EA8C9002FBEFB;
-                        isa = PBXBuildFile;
-                        settings = {
-                                ATTRIBUTES = (
-                                        Public,
-                                );
-                        };
-                };
-                1C2EF7EB0427A40B00000102 = {
-                        fileEncoding = 4;
@@ -283 +258 @@
-                        buildActionMask = 2147483647;
-                        files = (
-                                1C1C5651059EA8C9002FBEFB,
-                                1C9CF4FE0615091400330D8D,
-                                1C943AAB063C260800618CD9,
@@ -319 +293 @@
-                                1C3D55BC05A4CBBE00F25F5E,
-                                1C3D55C205A4DC1E00F25F5E,
-                                1C9CF4FD0615091400330D8D,
-                                1C9CF4FF0615091500330D8D,
-                                1C9CF5010615091700330D8D,
@@ -1523 +1496 @@
-                        refType = 4;
-                        sourceTree = "<group>";
-                };
-                1C9CF4FD0615091400330D8D = {
-                        fileRef = 1C1C5650059EA8C9002FBEFB;
-                        isa = PBXBuildFile;
-                        settings = {
-                        };
-                };
-                1C9CF4FE0615091400330D8D = {
@@ -3559 +3526 @@
-                                1C2EF7EC0427A40B00000102,
-                                1C2EF7EB0427A40B00000102,
-                                1C1C5650059EA8C9002FBEFB,
-                                1C1C564F059EA8C9002FBEFB,
-                        );
-                        isa = PBXGroup;

trunk/Colloquy.pch

@@ -4 +4 @@
-#import <AGRegex/AGRegex.h>
-
-// 
+
-#endif

trunk/Colloquy.xcode/project.pbxproj

@@ -57 +57 @@
-                        projectDirPath = "";
-                        projectReferences = (
+                                {
+                                        ProductGroup = 1C04394707CAFC7D00304949;
+                                        ProjectRef = 1C04394607CAFC7D00304949;
+                                },
-                                {
-                                        ProductGroup = 0A60C1600630D96D00DC6280;
@@ -239 +243 @@
-//1C3
-//1C4
+                1C04393E07CAFC5800304949 = {
+                        children = (
+                                1C04394607CAFC7D00304949,
+                        );
+                        isa = PBXGroup;
+                        name = "AppleScript Support";
+                        path = "";
+                        refType = 4;
+                        sourceTree = "<group>";
+                };
+                1C04394607CAFC7D00304949 = {
+                        isa = PBXFileReference;
+                        lastKnownFileType = "wrapper.pb-project";
+                        name = "AppleScript Support.xcode";
+                        path = "Plug-Ins/AppleScript Support/AppleScript Support.xcode";
+                        refType = 4;
+                        sourceTree = "<group>";
+                };
+                1C04394707CAFC7D00304949 = {
+                        children = (
+                                1C04394807CAFC7D00304949,
+                        );
+                        isa = PBXGroup;
+                        name = Products;
+                        refType = 4;
+                        sourceTree = "<group>";
+                };
+                1C04394807CAFC7D00304949 = {
+                        fileType = wrapper.cfbundle;
+                        isa = PBXReferenceProxy;
+                        path = "AppleScript Support.plugin";
+                        refType = 3;
+                        remoteRef = 1C04394D07CAFCAF00304949;
+                        sourceTree = BUILT_PRODUCTS_DIR;
+                };
+                1C04394907CAFC9600304949 = {
+                        fileRef = 1C04394807CAFC7D00304949;
+                        isa = PBXBuildFile;
+                        settings = {
+                        };
+                };
+                1C04394A07CAFCA000304949 = {
+                        fileRef = 1C04394807CAFC7D00304949;
+                        isa = PBXBuildFile;
+                        settings = {
+                        };
+                };
+                1C04394B07CAFCA500304949 = {
+                        containerPortal = 1C04394607CAFC7D00304949;
+                        isa = PBXContainerItemProxy;
+                        proxyType = 1;
+                        remoteGlobalIDString = 8D5B49AC048680CD000E48DA;
+                        remoteInfo = "AppleScript Support Plugin";
+                };
+                1C04394C07CAFCA500304949 = {
+                        isa = PBXTargetDependency;
+                        name = "AppleScript Support Plugin (from AppleScript Support.xcode)";
+                        targetProxy = 1C04394B07CAFCA500304949;
+                };
+                1C04394D07CAFCAF00304949 = {
+                        containerPortal = 1C04394607CAFC7D00304949;
+                        isa = PBXContainerItemProxy;
+                        proxyType = 2;
+                        remoteGlobalIDString = 8D5B49B6048680CD000E48DA;
+                        remoteInfo = "AppleScript Support Plugin";
+                };
-                1C06052306471FFB002438AF = {
-                        fileEncoding = 4;
@@ -685 +755 @@
-                        settings = {
-                        };
-                };
-                1C1C569C059EAF4F002FBEFB = {
-                        fileEncoding = 4;
-                        isa = PBXFileReference;
-                        lastKnownFileType = sourcecode.c.h;
-                        path = MVChatScriptPlugin.h;
-                        refType = 4;
-                        sourceTree = "<group>";
-                };
-                1C1D19F105992D80000BB31A = {
@@ -2123 +2185 @@
-                                0A60C2B80630DA2C00DC6280,
-                                1C09DFF7052DFF6600D748CF,
+                                1C04394C07CAFCA500304949,
-                                1CE3F9C307C7C2B30049A366,
-                        );
@@ -2286 +2349 @@
-                                1C0A4C9C0799BDB00093B702,
-                                1C0A4C9D0799BDB00093B702,
+                                1C04394A07CAFCA000304949,
-                        );
-                        isa = PBXResourcesBuildPhase;
@@ -2983 +3047 @@
-                                1CD4C09A07824A010003620F,
-                                1C8CE1ED05A921AB0020D841,
+                                1C04394907CAFC9600304949,
-                                1CE3F9BF07C7C2A70049A366,
-                                1C51B8F2052DFAAA00BB459B,
@@ -3411 +3476 @@
-                        children = (
-                                1CC478480427BB5500000102,
+                                1C04393E07CAFC5800304949,
-                                1CE3F7BC07C7B60A0049A366,
-                                1CA56CCD042A713E00000102,
@@ -5165 +5231 @@
-                                1C8CF8E1066530D60080A2F5,
-                                1C2EF7EB0427A40B00000102,
-                                1C1C569C059EAF4F002FBEFB,
-                                1C18CD100528DBBA000001C8,
-                                F5E98623018B412B01EE70DE,

trunk/JVChatController.m

@@ -2 +2 @@
-#import <ChatCore/MVChatRoom.h>
-#import <ChatCore/MVChatUser.h>
-#import <ChatCore/MVChatScriptPlugin.h>
-#import <ChatCore/NSAttributedStringAdditions.h>
-
@@ -454 +453 @@
-#pragma mark -
-
-@implementation MVChatScriptPlugin (MVChatScriptPluginCommandSupport)
-- (BOOL) processUserCommand:(NSString *) command withArguments:(NSAttributedString *) arguments toConnection:(MVChatConnection *) connection inView:(id <JVChatViewController>) view {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:command, @"----", [arguments string], @"pcC1", view, @"pcC2", nil];
-        id result = [self callScriptHandler:'pcCX' withArguments:args forSelector:_cmd];
-        return ( [result isKindOfClass:[NSNumber class]] ? [result boolValue] : NO );
-}
-@end
-
-#pragma mark -
-
-@implementation JVChatWindowController (JVChatWindowControllerObjectSpecifier)
-- (NSScriptObjectSpecifier *) objectSpecifier {

trunk/JVChatRoomPanel.m

@@ -3 +3 @@
-#import <ChatCore/MVChatUser.h>
-#import <ChatCore/MVChatPluginManager.h>
-#import <ChatCore/MVChatScriptPlugin.h>
-#import <ChatCore/NSStringAdditions.h>
-#import <ChatCore/NSAttributedStringAdditions.h>
@@ -1303 +1302 @@
-}
-@end
-
-#pragma mark -
-
-@implementation MVChatScriptPlugin (MVChatScriptPluginRoomSupport)
-- (void) memberJoined:(JVChatRoomMember *) member inRoom:(JVChatRoomPanel *) room {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:member, @"----", room, @"mJr1", nil];
-        [self callScriptHandler:'mJrX' withArguments:args forSelector:_cmd];
-}
-
-- (void) memberParted:(JVChatRoomMember *) member fromRoom:(JVChatRoomPanel *) room forReason:(NSAttributedString *) reason {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:member, @"----", room, @"mPr1", [reason string], @"mPr2", nil];
-        [self callScriptHandler:'mPrX' withArguments:args forSelector:_cmd];
-}
-
-- (void) memberKicked:(JVChatRoomMember *) member fromRoom:(JVChatRoomPanel *) room by:(JVChatRoomMember *) by forReason:(NSAttributedString *) reason {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:member, @"----", room, @"mKr1", by, @"mKr2", [reason string], @"mKr3", nil];
-        [self callScriptHandler:'mKrX' withArguments:args forSelector:_cmd];
-}
-
-- (void) memberPromoted:(JVChatRoomMember *) member inRoom:(JVChatRoomPanel *) room by:(JVChatRoomMember *) by {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:member, @"----", [NSValue valueWithBytes:"cOpr" objCType:@encode( char * )], @"mSc1", by, @"mSc2", room, @"mSc3", nil];
-        [self callScriptHandler:'mScX' withArguments:args forSelector:_cmd];
-}
-
-- (void) memberDemoted:(JVChatRoomMember *) member inRoom:(JVChatRoomPanel *) room by:(JVChatRoomMember *) by {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:member, @"----", [NSValue valueWithBytes:( [member voice] ? "VoIc" : "noRm" ) objCType:@encode( char * )], @"mSc1", by, @"mSc2", room, @"mSc3", nil];
-        [self callScriptHandler:'mScX' withArguments:args forSelector:_cmd];
-}
-
-- (void) memberVoiced:(JVChatRoomMember *) member inRoom:(JVChatRoomPanel *) room by:(JVChatRoomMember *) by {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:member, @"----", [NSValue valueWithBytes:"VoIc" objCType:@encode( char * )], @"mSc1", by, @"mSc2", room, @"mSc3", nil];
-        [self callScriptHandler:'mScX' withArguments:args forSelector:_cmd];
-}
-
-- (void) memberDevoiced:(JVChatRoomMember *) member inRoom:(JVChatRoomPanel *) room by:(JVChatRoomMember *) by {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:member, @"----", [NSValue valueWithBytes:( [member operator] ? "cOpr" : "noRm" ) objCType:@encode( char * )], @"mSc1", by, @"mSc2", room, @"mSc3", nil];
-        [self callScriptHandler:'mScX' withArguments:args forSelector:_cmd];
-}
-
-- (void) joinedRoom:(JVChatRoomPanel *) room; {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:room, @"----", nil];
-        [self callScriptHandler:'jRmX' withArguments:args forSelector:_cmd];
-}
-
-- (void) partingFromRoom:(JVChatRoomPanel *) room; {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:room, @"----", nil];
-        [self callScriptHandler:'pRmX' withArguments:args forSelector:_cmd];
-}
-
-- (void) kickedFromRoom:(JVChatRoomPanel *) room by:(JVChatRoomMember *) by forReason:(NSAttributedString *) reason {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:room, @"----", by, @"kRm1", [reason string], @"kRm2", nil];
-        [self callScriptHandler:'kRmX' withArguments:args forSelector:_cmd];
-}
-
-- (void) topicChangedTo:(NSAttributedString *) topic inRoom:(JVChatRoomPanel *) room by:(JVChatRoomMember *) member {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:[topic string], @"rTc1", member, @"rTc2", room, @"rTc3", nil];
-        [self callScriptHandler:'rTcX' withArguments:args forSelector:_cmd];
-}
-@end

trunk/JVChatTranscriptPanel.m

@@ -3 +3 @@
-#import <ChatCore/MVChatConnection.h>
-#import <ChatCore/MVChatPluginManager.h>
-#import <ChatCore/MVChatScriptPlugin.h>
-#import <ChatCore/NSMethodSignatureAdditions.h>
-#import <ChatCore/NSStringAdditions.h>
@@ -803 +802 @@
-}
-@end
-
-#pragma mark -
-
-@implementation MVChatScriptPlugin (MVChatScriptPluginLinkClickSupport)
-- (BOOL) handleClickedLink:(NSURL *) url inView:(id <JVChatViewController>) view {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:[url absoluteString], @"----", view, @"hCl1", nil];
-        id result = [self callScriptHandler:'hClX' withArguments:args forSelector:_cmd];
-        return ( [result isKindOfClass:[NSNumber class]] ? [result boolValue] : NO );
-}
-@end

trunk/JVDirectChatPanel.m

@@ -5 +5 @@
-#import <ChatCore/MVChatRoom.h>
-#import <ChatCore/MVChatPluginManager.h>
-#import <ChatCore/MVChatScriptPlugin.h>
-#import <ChatCore/NSAttributedStringAdditions.h>
-#import <ChatCore/NSStringAdditions.h>
@@ -1793 +1792 @@
-}
-@end
-
-#pragma mark -
-
-@implementation MVChatScriptPlugin (MVChatScriptPluginChatSupport)
-- (void) processIncomingMessage:(JVMutableChatMessage *) message {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:message, @"----", [NSNumber numberWithBool:[message isAction]], @"piM1", [message sender], @"piM2", [message transcript], @"piM3", nil];
-        [self callScriptHandler:'piMX' withArguments:args forSelector:_cmd];
-}
-
-- (void) processOutgoingMessage:(JVMutableChatMessage *) message {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:message, @"----", [NSNumber numberWithBool:[message isAction]], @"poM1", [message transcript], @"poM2", nil];
-        [self callScriptHandler:'poMX' withArguments:args forSelector:_cmd];
-}
-
-/*- (void) userNamed:(NSString *) nickname isNowKnownAs:(NSString *) newNickname inView:(id <JVChatViewController>) view {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:nickname, @"----", newNickname, @"uNc1", view, @"uNc2", nil];
-        [self callScriptHandler:'uNcX' withArguments:args forSelector:_cmd];
-}*/
-@end

trunk/JVNotificationController.m

@@ -1 @@
-ScriptPlugin
+PluginManager
-#import <ChatCore/NSMethodSignatureAdditions.h>
-#import <GrowlAppBridge/GrowlApplicationBridge.h>
@@ -181 +181 @@
-}
-@end
-
-#pragma mark -
-
-@implementation MVChatScriptPlugin (MVChatScriptPluginNotificationSupport)
-- (void) performNotification:(NSString *) identifier withContextInfo:(NSDictionary *) context andPreferences:(NSDictionary *) preferences {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:identifier, @"----", context, @"nOt1", preferences, @"nOt2", nil];
-        [self callScriptHandler:'nOtX' withArguments:args forSelector:_cmd];
-}
-@end

trunk/MVApplicationController.m

@@ -3 +3 @@
-#import <ChatCore/MVChatPluginManager.h>
-#import <ChatCore/NSMethodSignatureAdditions.h>
-#import <ChatCore/MVChatScriptPlugin.h>
-#import <ChatCore/NSColorAdditions.h>
-#import "NSURLAdditions.h"
@@ -386 +385 @@
-#pragma mark -
-
-@implementation MVChatScriptPlugin (MVChatPluginContextualMenuSupport)
-- (IBAction) performContextualMenuItemAction:(id) sender {
-        id object = [sender representedObject];
-        NSMutableArray *submenu = [NSMutableArray array];
-
-        NSMenu *menu = [sender menu];
-        NSMenu *parent = nil;
-        while( ( parent = [menu supermenu] ) ) {
-                [submenu insertObject:[menu title] atIndex:0];
-                menu = parent;
-        }
-
-        NSString *title = [sender title];
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:title, @"----", object, @"pcM1", submenu, @"pcM2", nil];
-        [self callScriptHandler:'pcMX' withArguments:args forSelector:_cmd];
-}
-
-- (void) buildMenuInto:(NSMutableArray *) itemList fromReturnContainer:(id) container withRepresentedObject:(id) object {
-        if( [container respondsToSelector:@selector( objectEnumerator )] ) {
-                NSEnumerator *enumerator = [container objectEnumerator];
-                id item = nil;
-
-                while( ( item = [enumerator nextObject] ) ) {
-                        if( [item isKindOfClass:[NSString class]] ) {
-                                if( [item isEqualToString:@"-"] ) {
-                                        [itemList addObject:[NSMenuItem separatorItem]];
-                                } else {
-                                        NSMenuItem *mitem = [[[NSMenuItem alloc] initWithTitle:item action:@selector( performContextualMenuItemAction: ) keyEquivalent:@""] autorelease];
-                                        [mitem setTarget:self];
-                                        [mitem setRepresentedObject:object];
-                                        [itemList addObject:mitem];
-                                }
-                        } else if( [item isKindOfClass:[NSDictionary class]] ) {
-                                NSString *title = [item objectForKey:@"title"];
-                                NSArray *sub = [item objectForKey:@"submenu"];
-                                NSNumber *enabled = [item objectForKey:@"enabled"];
-                                NSNumber *checked = [item objectForKey:@"checked"];
-                                NSNumber *indent = [item objectForKey:@"indent"];
-                                NSNumber *alternate = [item objectForKey:@"alternate"];
-                                id iconPath = [item objectForKey:@"icon"];
-                                id iconSize = [item objectForKey:@"iconsize"];
-                                NSString *tooltip = [item objectForKey:@"tooltip"];
-                                id context = [item objectForKey:@"context"];
-
-                                if( ! [title isKindOfClass:[NSString class]] ) continue;
-                                if( ! [tooltip isKindOfClass:[NSString class]] ) tooltip = nil;
-                                if( ! [enabled isKindOfClass:[NSNumber class]] ) enabled = nil;
-                                if( ! [checked isKindOfClass:[NSNumber class]] ) checked = nil;
-                                if( ! [indent isKindOfClass:[NSNumber class]] ) indent = nil;
-                                if( ! [alternate isKindOfClass:[NSNumber class]] ) alternate = nil;
-                                if( ! [iconPath isKindOfClass:[NSString class]] && ! [iconPath isKindOfClass:[NSArray class]] ) iconPath = nil;
-                                if( ! [iconSize isKindOfClass:[NSArray class]] && ! [iconSize isKindOfClass:[NSNumber class]] ) iconSize = nil;
-                                if( ! [sub isKindOfClass:[NSArray class]] && ! [sub isKindOfClass:[NSDictionary class]] ) sub = nil;
-
-                                NSMenuItem *mitem = [[[NSMenuItem alloc] initWithTitle:title action:@selector( performContextualMenuItemAction: ) keyEquivalent:@""] autorelease];
-                                if( context ) [mitem setRepresentedObject:context];
-                                else [mitem setRepresentedObject:object];
-                                if( ! enabled || ( enabled && [enabled boolValue] ) ) [mitem setTarget:self];
-                                if( enabled && ! [enabled boolValue] ) [mitem setEnabled:[enabled boolValue]];
-                                if( checked ) [mitem setState:[checked intValue]];
-                                if( indent ) [mitem setIndentationLevel:MIN( 15, [indent unsignedIntValue] )];
-                                if( tooltip ) [mitem setToolTip:tooltip];
-
-                                if( alternate && [alternate unsignedIntValue] == 1 ) {
-                                        [mitem setKeyEquivalentModifierMask:NSAlternateKeyMask];
-                                        [mitem setAlternate:YES];
-                                } else if( alternate && [alternate unsignedIntValue] == 2 ) {
-                                        [mitem setKeyEquivalentModifierMask:( NSShiftKeyMask | NSAlternateKeyMask )];
-                                        [mitem setAlternate:YES];
-                                } else if( alternate && [alternate unsignedIntValue] == 3 ) {
-                                        [mitem setKeyEquivalentModifierMask:( NSShiftKeyMask | NSAlternateKeyMask | NSControlKeyMask )];
-                                        [mitem setAlternate:YES];
-                                }
-
-                                if( [iconPath isKindOfClass:[NSString class]] && [(NSString *)iconPath length] ) {
-                                        NSURL *iconURL = nil;
-                                        if( [iconPath hasPrefix:@"#"] ) {
-                                                NSSize size = NSZeroSize;
-                                                if( [iconSize isKindOfClass:[NSArray class]] && [(NSArray *)iconSize count] == 2 ) {
-                                                        size = NSMakeSize( [[iconSize objectAtIndex:0] unsignedIntValue], [[iconSize objectAtIndex:1] unsignedIntValue] );
-                                                } else if( [iconSize isKindOfClass:[NSNumber class]] ) {
-                                                        size = NSMakeSize( [iconSize unsignedIntValue], [iconSize unsignedIntValue] );
-                                                } else size = NSMakeSize( 24., 12. );
-
-                                                NSColor *color = [NSColor colorWithHTMLAttributeValue:iconPath];
-                                                NSImage *icon = [[[NSImage alloc] initWithSize:size] autorelease];
-
-                                                [icon lockFocus];
-                                                [[color shadowWithLevel:0.1] set];
-                                                [NSBezierPath fillRect:NSMakeRect( 0., 0., size.width, size.height )];
-                                                [color drawSwatchInRect:NSMakeRect( 1., 1., size.width - 2., size.height - 2. )];
-                                                [icon unlockFocus];
-
-                                                [mitem setImage:icon];
-                                        } else if( ( iconURL = [NSURL URLWithString:iconPath] ) ) {
-                                                // NSImage *icon = [[[NSImage allocWithZone:[self zone]] initByReferencingURL:[NSURL URLWithString:iconPath]] autorelease];
-                                                // Lets download the icon with a 1-second timeout
-                                                // Let's also ask for the cache if it exists rather than using protocol default
-                                                NSURLRequest *iconRequest = [NSURLRequest requestWithURL:iconURL cachePolicy:NSURLRequestReturnCacheDataElseLoad timeoutInterval:1.0];
-                                                NSData *iconData = [NSURLConnection sendSynchronousRequest:iconRequest returningResponse:nil error:nil];
-                                                NSImage *icon = [[[NSImage alloc] initWithData:iconData] autorelease];
-                                                if( icon ) [mitem setImage:icon];
-                                        } else {
-                                                if( ! [iconPath isAbsolutePath] ) {
-                                                        NSString *dir = [[self scriptFilePath] stringByDeletingLastPathComponent];
-                                                        iconPath = [dir stringByAppendingPathComponent:iconPath];
-                                                }
-
-                                                NSImage *icon = [[[NSImage allocWithZone:[self zone]] initByReferencingFile:iconPath] autorelease];
-                                                if( icon ) [mitem setImage:icon];
-                                        }
-
-                                        NSSize size = NSZeroSize;
-                                        if( [iconSize isKindOfClass:[NSArray class]] && [(NSArray *)iconSize count] == 2 ) {
-                                                size = NSMakeSize( [[iconSize objectAtIndex:0] unsignedIntValue], [[iconSize objectAtIndex:1] unsignedIntValue] );
-                                        } else if( [iconSize isKindOfClass:[NSNumber class]] ) {
-                                                size = NSMakeSize( [iconSize unsignedIntValue], [iconSize unsignedIntValue] );
-                                        }
-
-                                        if( [mitem image] && ! NSEqualSizes( size, NSZeroSize ) ) {
-                                                [[mitem image] setScalesWhenResized:YES];
-                                                [[mitem image] setSize:size];
-                                        }
-                                } else if( [iconPath isKindOfClass:[NSArray class]] && [(NSArray *)iconPath count] == 3 ) {
-                                        NSSize size = NSZeroSize;
-                                        if( [iconSize isKindOfClass:[NSArray class]] && [(NSArray *)iconSize count] == 2 ) {
-                                                size = NSMakeSize( [[iconSize objectAtIndex:0] unsignedIntValue], [[iconSize objectAtIndex:1] unsignedIntValue] );
-                                        } else if( [iconSize isKindOfClass:[NSNumber class]] ) {
-                                                size = NSMakeSize( [iconSize unsignedIntValue], [iconSize unsignedIntValue] );
-                                        } else size = NSMakeSize( 24., 12. );
-
-                                        NSColor *color = [NSColor colorWithCalibratedRed:( [[iconPath objectAtIndex:0] unsignedIntValue] / 65535. ) green:( [[iconPath objectAtIndex:1] unsignedIntValue] / 65535. ) blue:( [[iconPath objectAtIndex:2] unsignedIntValue] / 65535. ) alpha:1.];
-                                        NSImage *icon = [[[NSImage alloc] initWithSize:size] autorelease];
-
-                                        [icon lockFocus];
-                                        [[color shadowWithLevel:0.1] set];
-                                        [NSBezierPath fillRect:NSMakeRect( 0., 0., size.width, size.height )];
-                                        [color drawSwatchInRect:NSMakeRect( 1., 1., size.width - 2., size.height - 2. )];
-                                        [icon unlockFocus];
-
-                                        [mitem setImage:icon];
-                                }
-
-                                [itemList addObject:mitem];
-
-                                if( [sub respondsToSelector:@selector( objectEnumerator )] && [sub respondsToSelector:@selector( count )] && [sub count] ) {
-                                        NSMenu *submenu = [[[NSMenu allocWithZone:[self zone]] initWithTitle:title] autorelease];
-                                        NSMutableArray *subArray = [NSMutableArray array];
-
-                                        [self buildMenuInto:subArray fromReturnContainer:sub withRepresentedObject:object];
-
-                                        id subItem = nil;
-                                        NSEnumerator *subenumerator = [subArray objectEnumerator];
-                                        while( ( subItem = [subenumerator nextObject] ) )
-                                                [submenu addItem:subItem];
-
-                                        [mitem setSubmenu:submenu];
-                                }
-                        }
-                }
-        }
-}
-
-- (NSArray *) contextualMenuItemsForObject:(id) object inView:(id <JVChatViewController>) view {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:object, @"----", view, @"cMi1", nil];
-        id result = [self callScriptHandler:'cMiX' withArguments:args forSelector:_cmd];
-        NSMutableArray *ret = [NSMutableArray array];
-
-        if( ! result ) return nil;
-        if( ! [result isKindOfClass:[NSArray class]] )
-                result = [NSArray arrayWithObject:result];
-
-        [self buildMenuInto:ret fromReturnContainer:result withRepresentedObject:object];
-
-        if( [ret count] ) return ret;
-        return nil;
-}
-@end
-
-#pragma mark -
-
-@implementation NSApplication (NSApplicationScripting)
-- (void) newConnection:(NSScriptCommand *) command {

trunk/MVChatConnection.m

@@ -6 +6 @@
-#import "MVFileTransfer.h"
-#import "MVChatPluginManager.h"
-#import "MVChatScriptPlugin.h"
-#import "NSStringAdditions.h"
-#import "NSAttributedStringAdditions.h"
@@ -832 +831 @@
-}
-@end
-
-#pragma mark -
-
-@implementation MVChatScriptPlugin (MVChatScriptPluginConnectionSupport)
-- (BOOL) processSubcodeRequest:(NSString *) command withArguments:(NSString *) arguments fromUser:(MVChatUser *) user {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:command, @"----", ( arguments ? (id)arguments : (id)[NSNull null] ), @"psR1", user, @"psR2", [user connection], @"psR3", nil];
-        id result = [self callScriptHandler:'psRX' withArguments:args forSelector:_cmd];
-        return ( [result isKindOfClass:[NSNumber class]] ? [result boolValue] : NO );
-}
-
-- (BOOL) processSubcodeReply:(NSString *) command withArguments:(NSString *) arguments fromUser:(MVChatUser *) user {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:command, @"----", ( arguments ? (id)arguments : (id)[NSNull null] ), @"psL1", user, @"psL2", [user connection], @"psL3", nil];
-        id result = [self callScriptHandler:'psLX' withArguments:args forSelector:_cmd];
-        return ( [result isKindOfClass:[NSNumber class]] ? [result boolValue] : NO );
-}
-
-- (void) connected:(MVChatConnection *) connection {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:connection, @"----", nil];
-        [self callScriptHandler:'cTsX' withArguments:args forSelector:_cmd];
-}
-
-- (void) disconnecting:(MVChatConnection *) connection {
-        NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:connection, @"----", nil];
-        [self callScriptHandler:'dFsX' withArguments:args forSelector:_cmd];
-}
-@end

trunk/MVChatPluginManager.m

@@ -1 +1 @@
-#import "MVChatPluginManager.h"
-#import "MVChatScriptPlugin.h"
-#import "NSNumberAdditions.h"
-#import "NSMethodSignatureAdditions.h"
@@ -70 +69 @@
-                                        if( plugin ) [_plugins addObject:plugin];
-                                }
-                        } else if( [[file pathExtension] isEqualToString:@"scpt"] || [[file pathExtension] isEqualToString:@"scptd"] || [[file pathExtension] isEqualToString:@"applescript"] ) {
-                                NSAppleScript *script = [[[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/%@", path, file]] error:NULL] autorelease];
-                                if( ! [script compileAndReturnError:nil] ) continue;
-                                MVChatScriptPlugin *plugin = [[[MVChatScriptPlugin alloc] initWithScript:script atPath:[NSString stringWithFormat:@"%@/%@", path, file] withManager:self] autorelease];
-                                if( plugin ) [_plugins addObject:plugin];
-                        }
-                }

trunk/MVIRCChatConnection.m

@@ -11 +11 @@
-
-#import "MVChatPluginManager.h"
-#import "MVChatScriptPlugin.h"
-
-#import "NSAttributedStringAdditions.h"
-#import "NSColorAdditions.h"

trunk/Plug-Ins/AppleScript Support/JVAppleScriptChatPlugin.h

@@ -1 @@
-<ChatCore/MVChatPluginManager.h>
+"MVChatPluginManager.h"
-
-
+
+
-        NSAppleScript *_script;
-        NSString *_path;
@@ -10 +11 @@
-
-- (NSAppleScript *) script;
+- (MVChatPluginManager *) pluginManager;
-- (NSString *) scriptFilePath;
-- (id) callScriptHandler:(unsigned long) handler withArguments:(NSDictionary *) arguments forSelector:(SEL) selector;

trunk/Plug-Ins/AppleScript Support/JVAppleScriptChatPlugin.m

@@ -1 +1 @@
-#import "MVChatPluginManager.h"
-
+
+
+
+
+
+
+
+
-
-@interface NSScriptObjectSpecifier (NSScriptObjectSpecifierPrivate) // Private Foundation Methods
@@ -77 +84 @@
-#pragma mark -
-
-MVChatScrip
+JVAppleScriptCha
-- (id) initWithManager:(MVChatPluginManager *) manager {
-        if( ( self = [self init] ) ) {
+                _manager = manager;
-                _doseNotRespond = [[NSMutableSet set] retain];
-                _script = nil;
@@ -121 +129 @@
-