Update project for Xcode 4.

Author: McSpider

.gitignore

@@ -1,8 +1,39 @@
-build/
+# Mac OS X Finder and whatnot
 .DS_Store
 *.psd
-*.pages
-**/*.pbxuser
-*.mode2v3
+
+# Sparkle distribution Private Key (Don't check me in!)
+dsa_priv.pem
+
+# XCode (and ancestors) per-user config (very noisy, and not relevant)
+*.mode1
 *.mode1v3
-**/*.perspectivev*
+*.mode2v3
+*.perspective
+*.perspectivev3
+*.pbxuser
+Documentation/Generated
+doxygenWarnings.txt
+*.xcodeproj/xcuserdata/*.xcuserdatad
+*.xcodeproj/project.xcworkspace/xcuserdata/*.xcuserdatad
+
+# Generated files
+VersionX-revision.h
+
+# build products
+build/
+*.[oa]
+
+# Other source repository archive directories (protects when importing)
+.hg
+.svn
+CVS
+
+# automatic backup files
+*~.nib
+*.swp
+*~
+*(Autosaved).rtfd/
+Backup[ ]of[ ]*.pages/
+Backup[ ]of[ ]*.key/
+Backup[ ]of[ ]*.numbers/

Classes/Controllers/BWSheetController.h

@@ -0,0 +1,31 @@
+//
+//  BWSheetController.h
+//  BWToolkit
+//
+//  Created by Brandon Walkin (www.brandonwalkin.com)
+//  All code is provided under the New BSD license.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface BWSheetController : NSObject
+{
+	NSWindow *sheet;
+	NSWindow *parentWindow;
+	id delegate;
+}
+
+@property (nonatomic, retain) IBOutlet NSWindow *sheet, *parentWindow;
+@property (nonatomic, retain) IBOutlet id delegate;
+
+- (IBAction)openSheet:(id)sender;
+- (IBAction)closeSheet:(id)sender;
+- (IBAction)messageDelegateAndCloseSheet:(id)sender;
+
+// The optional delegate should implement the method:
+// - (BOOL)shouldCloseSheet:(id)sender
+// Return YES if you want the sheet to close after the button click, NO if it shouldn't close. The sender
+// object is the button that requested the close. This is helpful because in the event that there are multiple buttons
+// hooked up to the messageDelegateAndCloseSheet: method, you can distinguish which button called the method. 
+
+@end

Classes/Controllers/BWSheetController.m

@@ -0,0 +1,75 @@
+//
+//  BWSheetController.m
+//  BWToolkit
+//
+//  Created by Brandon Walkin (www.brandonwalkin.com)
+//  All code is provided under the New BSD license.
+//
+
+#import "BWSheetController.h"
+//#import "NSWindow-NSTimeMachineSupport.h"
+
+@implementation BWSheetController
+
+@synthesize parentWindow, sheet, delegate;
+
+- (void)awakeFromNib
+{
+	// Hack so the sheet doesn't appear at launch in Cocoa Simulator (or in the actual app if "Visible at Launch" is checked)
+	[sheet setAlphaValue:0];
+	[sheet performSelector:@selector(orderOut:) withObject:nil afterDelay:0];
+	
+	// If the sheet has a toolbar or a bottom bar, make sure those elements can't move the window (private API)
+	if ([sheet respondsToSelector:@selector(setMovable:)])
+		[sheet setMovable:NO];
+}
+
+- (id)initWithCoder:(NSCoder *)decoder;
+{
+    if ((self = [super init]) != nil)
+	{
+		NSWindowController *tempSheetController = [decoder decodeObjectForKey:@"BWSCSheet"];
+		NSWindowController *tempParentWindowController = [decoder decodeObjectForKey:@"BWSCParentWindow"];
+		
+		sheet = [tempSheetController window];
+		parentWindow = [tempParentWindowController window];
+	}
+	return self;
+}
+
+- (void)encodeWithCoder:(NSCoder*)coder
+{	
+	NSWindowController *tempSheetController = [[[NSWindowController alloc] initWithWindow:sheet] autorelease];
+	NSWindowController *tempParentWindowController = [[[NSWindowController alloc] initWithWindow:parentWindow] autorelease];
+	
+	[coder encodeObject:tempSheetController forKey:@"BWSCSheet"];
+	[coder encodeObject:tempParentWindowController forKey:@"BWSCParentWindow"];
+}
+
+- (IBAction)openSheet:(id)sender
+{
+	[sheet setAlphaValue:1];
+	[NSApp beginSheet:sheet modalForWindow:parentWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
+}
+
+- (IBAction)closeSheet:(id)sender
+{
+	[sheet orderOut:nil];
+	[NSApp endSheet:sheet];
+}
+
+- (IBAction)messageDelegateAndCloseSheet:(id)sender
+{
+	if (delegate != nil && [delegate respondsToSelector:@selector(shouldCloseSheet:)])
+	{	
+		if ([delegate performSelector:@selector(shouldCloseSheet:) withObject:sender])	
+			[self closeSheet:self];
+	}
+	else
+	{
+		[self closeSheet:self];
+	}
+}
+
+
+@end

Classes/Controllers/MainController.h

@@ -15,7 +15,7 @@
 #import "KBHostmasksData.h"
 #import	"KBLuaActionsData.h"
 #import	"KBAutojoinData.h"
-#import "KBTextField.h"
+#import "KBSTextField.h"
 
 
 @interface MainController : NSObject {
@@ -27,7 +27,7 @@
 	IBOutlet NSButton *nicknameAsTrigger;
 	IBOutlet NSButton *rejoinKickedRooms;
 	IBOutlet NSMenuItem *debugMenuItem;
-	IBOutlet KBTextField *commandField;
+	IBOutlet KBSTextField *commandField;
 
 	IBOutlet NSTextView *serverOutput;
 	IBOutlet NSProgressIndicator *activityIndicator;

Classes/Controllers/MainController.m

@@ -29,7 +29,13 @@ @implementation MainController
 // Connect to or disconnect IRC connection
 - (IBAction)toggleIrcConnection:(id)sender
 {
-	if (![ircConnection isConnected]) {
+	if (![ircConnection isConnected]) {		
+		// Check if for valid irc login, create a random one if needed
+		if ([settings.username length] == 0) {
+			NSString *randomUser = [NSString stringWithFormat:@"Serty%i%i%i",arc4random() % 10,arc4random() % 10,arc4random() % 10];
+			[settings setUsername:randomUser];
+		}
+		
 		// Get connection data
 		NSArray *connectionArray = [[serverAddress stringValue] componentsSeparatedByString:@":"];
 		NSString *ircServer;
@@ -62,6 +68,7 @@ - (IBAction)toggleIrcConnection:(id)sender
 		[serverAddress setEnabled:NO];
 		[mainView selectTabViewItemAtIndex:1];
 		[ircConnection connectToIRC:[connectionData objectAtIndex:4]  port:[[connectionData objectAtIndex:5] intValue]];
+		[self logMessage:@"Establishing connection to server" type:1];
 	}
 	else {
 		[activityIndicator startAnimation:self];
@@ -84,7 +91,7 @@ - (IBAction)parseCommand:(id)sender
 		return;
 	}
 	if (![ircConnection isConnected]) {
-		[self logMessage:@"IRCBot - No IRC Connection\n› Type help for help\n" type:1];
+		[self logMessage:@"No IRC Connection\n› Type help for help\n" type:1];
 		[commandField setStringValue:@""];
 		return;
 	}
@@ -114,7 +121,7 @@ - (IBAction)parseCommand:(id)sender
 		}
 	}
 	else {
-		[self logMessage:@"IRCBot - Invalid Command\n› Type help for help" type:4];
+		[self logMessage:@"Invalid Command\n› Type help for help" type:4];
 	}			
 
 	[commandField addPopUpItemWithTitle:commandString];
@@ -165,7 +172,7 @@ - (void)awakeFromNib
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
 	if (!(ircConnection = [[IRCConnection alloc] initWithDelegate:self]))
-		[self logMessage:@"IRCBot - IRCConnection Allocation Error" type:1];
+		[self logMessage:@"IRCConnection Allocation Error" type:1];
 
 	lua = [[LuaController alloc] init];
 	[lua setParentClass:self];
@@ -176,7 +183,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 	[commandField setDisplaysMenu:YES];
 
 	[self refreshConnectionData];
-	[self logMessage:@"Welcome to IRCBot\n› For help type help.\n" type:4];
+	[self logMessage:@"Welcome to IRCBot -- For help type help.\n" type:4];
 }
 
 // Application should quit but server is still connected
@@ -256,7 +263,7 @@ - (void)pingAlive:(NSString *)server
 - (void)joinRoom:(NSString *)aRoom
 {
 	if ([aRoom hasPrefix:@"#"]) {
-		[self logMessage:@"IRCBot - Joining Room" type:1];
+		[self logMessage:@"Joining Room" type:1];
 		NSString* joinMessage = [NSString stringWithFormat:@"JOIN %@ \r\n", aRoom];
 		[ircConnection sendRawString:joinMessage logAs:2];
 		[rooms addRoom:aRoom];
@@ -266,7 +273,7 @@ - (void)joinRoom:(NSString *)aRoom
 - (void)partRoom:(NSString *)aRoom
 {
 	if ([aRoom hasPrefix:@"#"]) {
-		[self logMessage:@"IRCBot - Parting Room" type:1];
+		[self logMessage:@"Parting Room" type:1];
 		NSString* partMessage = [NSString stringWithFormat:@"PART %@ \r\n", aRoom];
 		[ircConnection sendRawString:partMessage logAs:2];
 		[rooms setStatus:@"None" forRoom:aRoom];
@@ -276,7 +283,7 @@ - (void)partRoom:(NSString *)aRoom
 - (void)authUser:(NSString *)aUsername pass:(NSString *)aPassword nick:(NSString *)aNick realName:(NSString *)aName
 {
 	// Create auth messages
-	[self logMessage:@"IRCBot - Authenticating User" type:1];
+	[self logMessage:@"Authenticating User" type:1];
 	NSString *userMessage, *passMessage, *nickMessage, *nickServMessage;
 
 	userMessage = [NSString stringWithFormat:@"USER %@ %@ %@ \r\n", aUsername, @" 0 * :", aName];
@@ -294,7 +301,7 @@ - (void)authUser:(NSString *)aUsername pass:(NSString *)aPassword nick:(NSString
 		[ircConnection sendMessage:nickServMessage To:@"NickServ" logAs:2];
 	}
 	else {
-		[self logMessage:@"IRCBot - No password specified!" type:1];
+		[self logMessage:@"No password specified!" type:1];
 	}
 }
 
@@ -305,7 +312,7 @@ - (void)parseServerOutput:(NSString *)input type:(NSString *)type
 		NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease];
 		[formatter setDateFormat:@"hh:mm"];
 		NSString *time = [formatter stringFromDate:[NSDate date]];
-		[self logMessage:[NSString stringWithFormat:@"%@ %@ %@",time,type,input] type:0];
+		[self logMessage:[NSString stringWithFormat:@"%@ [%@] %@",time,type,input] type:0];
 	}
 	else
 		[self logMessage:[NSString stringWithFormat:@"%@",input] type:0];
@@ -356,7 +363,7 @@ - (void)parseServerOutput:(NSString *)input type:(NSString *)type
 			NSRange tempRange = [[tempArray objectAtIndex:1] rangeOfString:[connectionData objectAtIndex:2]];
 			NSString *room = [[tempArray objectAtIndex:1] substringWithRange:NSMakeRange(0,tempRange.location-1)];
 			NSString *reason = [[tempArray objectAtIndex:1] substringFromIndex:tempRange.location+tempRange.length+2];
-			[self logMessage:[NSString stringWithFormat:@"IRCBot - You have just been kicked from:%@ reason:%@",room,reason] type:1];
+			[self logMessage:[NSString stringWithFormat:@"You have just been kicked from:%@ reason:%@",room,reason] type:1];
 			[rooms setStatus:@"Warning" forRoom:room];
 
 			if ([rejoinKickedRooms state]) {
@@ -426,31 +433,31 @@ - (void)logMessage:(NSString *)message type:(int)type
 				[secureMessage replaceCharactersInRange:[secureMessage rangeOfString:[connectionData objectAtIndex:1]] withString:@"******"];
 
 	// Get the length of the textview contents
-	NSRange theEnd=NSMakeRange([[serverOutput string] length],0);
+	NSRange theEnd = NSMakeRange([[serverOutput string] length],0);
 
 	NSMutableString *formatedMessage;
-	NSColor *textColor;		
+	NSColor *textColor;
 	NSFont *textFont = [NSFont fontWithName:@"Menlo" size:12.0];
 
 	// Setup color of string depending on type
 	if (type == 1) {
-		textColor = [NSColor colorWithCalibratedRed:0.35 green:0.00 blue:0.00 alpha:1.00];
+		textColor = [NSColor colorWithCalibratedRed:0.35 green:0.00 blue:0.00 alpha:1.00]; // Red -- Notice
 		formatedMessage = [NSString stringWithFormat:@"› %@\n",secureMessage];
 	}
 	else if (type == 2) {
-		textColor = [NSColor colorWithCalibratedRed:0.00 green:0.00 blue:0.35 alpha:1.00];
+		textColor = [NSColor colorWithCalibratedRed:0.00 green:0.00 blue:0.35 alpha:1.00]; // Blue -- Status
 		formatedMessage = [NSString stringWithFormat:@"› %@",secureMessage];
 	}
 	else if (type == 3) {
-		textColor = [NSColor colorWithCalibratedRed:0.15 green:0.30 blue:0.00 alpha:1.00];
+		textColor = [NSColor colorWithCalibratedRed:0.15 green:0.30 blue:0.00 alpha:1.00]; // Green -- Activity
 		formatedMessage = [NSString stringWithFormat:@"› %@",secureMessage];
 	}
 	else if (type == 4) {
-		textColor = [NSColor colorWithCalibratedRed:0.24 green:0.00 blue:0.30 alpha:1.00];
+		textColor = [NSColor colorWithCalibratedRed:0.24 green:0.00 blue:0.30 alpha:1.00]; // Purple -- Info
 		formatedMessage = [NSString stringWithFormat:@"› %@\n",secureMessage];
 	}
 	else {
-		textColor = [NSColor blackColor];
+		textColor = [NSColor blackColor]; // Black
 		formatedMessage = [NSString stringWithFormat:@"%@\n",secureMessage];
 	}
 
@@ -496,7 +503,7 @@ - (void)didConnectToHost:(NSString *)host port:(UInt16)port
 
 - (void)didDissconect
 {
-	[self logMessage:@"IRCBot - Socket disconnected\n" type:1];
+	[self logMessage:@"Socket disconnected\n" type:1];
 
 	// Stop activity indicator and disable and enable all relevant controls
 	[activityIndicator stopAnimation:self];
@@ -505,7 +512,6 @@ - (void)didDissconect
 	[connectionButton setEnabled:YES];
 	[connectionButton setTitle:@"Connect"];
 	[mainView selectTabViewItemAtIndex:0];
-	[self clearLog:nil];
 }
 
 

Classes/Data/KBAutojoinData.m

@@ -44,7 +44,14 @@ - (void)addRoom:(NSString *)room autojoin:(BOOL)autojoin
 
 - (void)removeRoom:(NSString *)room
 {
-	
+	// Untested
+	int index;
+	for (index = 0; [self.autojoinArray count] > index; index++) {
+		if ([[[self.autojoinArray objectAtIndex:index] objectAtIndex:0] isEqualToString:room]) {
+			[self.autojoinArray removeObjectAtIndex:index];
+			return;
+		}
+	}
 }
 
 - (void)clearData

Classes/Data/KBHostmasksData.h

@@ -8,6 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "RegexKitLite.h"
+#import "BWSheetController.h"
 
 @interface KBHostmasksData : NSObject {
 	int userIndex;

Classes/Data/KBHostmasksData.m

@@ -116,11 +116,10 @@ - (void)clearData
 
 - (BOOL)getAuthForHostmask:(NSString *)hostmask
 {
-	int index;
 	for (NSArray *hostmaskData in self.hostmaskArray) {
 		NSString *tempHostmask = [hostmaskData objectAtIndex:0];
 		BOOL blocked = [[hostmaskData objectAtIndex:1] intValue];
-		if ([tempHostmask isMatchedByRegex:hostmask] && !blocked) {
+		if ([hostmask isMatchedByRegex:tempHostmask] && !blocked) {
 			return YES;
 		}
 	}
@@ -149,7 +148,7 @@ - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColum
 
 - (void)tableViewSelectionDidChange:(NSNotification *)notification
 {
-	if ([hostmaskView selectedRow] == -1 || [hostmaskView selectedRow] == 0)
+	if ([hostmaskView selectedRow] == -1)
 		[removeHostmaskButton setEnabled:NO];
 	else
 		[removeHostmaskButton setEnabled:YES];

Classes/Data/KBLuaActionsData.h

@@ -8,6 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "KBLuaAction.h"
+#import "BWSheetController.h"
 
 @interface KBLuaActionsData : NSObject {
 	int actionIndex;