diff --git a/Classes/Controllers/GrowlController.m b/Classes/Controllers/TLOGrowlController.m similarity index 53% rename from Classes/Controllers/GrowlController.m rename to Classes/Controllers/TLOGrowlController.m index 77f49623b3..6630036ca0 100755 --- a/Classes/Controllers/GrowlController.m +++ b/Classes/Controllers/TLOGrowlController.m @@ -3,9 +3,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define CLICK_INTERVAL 2 +#define _clickInterval 2 -@implementation GrowlController +@implementation TLOGrowlController @synthesize owner; @synthesize lastClickedContext; @@ -14,8 +14,8 @@ @implementation GrowlController - (id)init { if ((self = [super init])) { -#ifdef _USES_NATIVE_NOTIFICATION_CENTER - if ([Preferences featureAvailableToOSXMountainLion]) { +#ifdef TXNativeNotificationCenterAvailable + if ([TPCPreferences featureAvailableToOSXMountainLion]) { [_NSUserNotificationCenter() setDelegate:self]; return self; @@ -29,89 +29,89 @@ - (id)init } -- (void)notify:(NotificationType)type title:(NSString *)title +- (void)notify:(TXNotificationType)type title:(NSString *)title desc:(NSString *)desc userInfo:(NSDictionary *)info { - if ([Preferences growlEnabledForEvent:type] == NO) return; + if ([TPCPreferences growlEnabledForEvent:type] == NO) return; NSString *kind = nil; NSInteger priority = 0; - BOOL sticky = [Preferences growlStickyForEvent:type]; + BOOL sticky = [TPCPreferences growlStickyForEvent:type]; switch (type) { - case NOTIFICATION_HIGHLIGHT: + case TXNotificationHighlightType: { priority = 1; - kind = TXTLS(@"NOTIFICATION_MSG_HIGHLIGHT"); - title = TXTFLS(@"NOTIFICATION_MSG_HIGHLIGHT_TITLE", title); + kind = TXTLS(@"NotificationHighlightMessage"); + title = TXTFLS(@"NotificationHighlightMessageTitle", title); break; } - case NOTIFICATION_NEW_TALK: + case TXNotificationNewQueryType: { priority = 1; - kind = TXTLS(@"NOTIFICATION_MSG_NEW_TALK"); - title = TXTLS(@"NOTIFICATION_MSG_NEW_TALK_TITLE"); + kind = TXTLS(@"NotificationNewPrivateQueryMessage"); + title = TXTLS(@"NotificationNewPrivateQueryMessageTitle"); break; } - case NOTIFICATION_CHANNEL_MSG: + case TXNotificationChannelMessageType: { - kind = TXTLS(@"NOTIFICATION_MSG_CHANNEL_MSG"); + kind = TXTLS(@"NotificationChannelTalkMessage"); break; } - case NOTIFICATION_CHANNEL_NOTICE: + case TXNotificationChannelNoticeType: { - kind = TXTLS(@"NOTIFICATION_MSG_CHANNEL_NOTICE"); - title = TXTFLS(@"NOTIFICATION_MSG_CHANNEL_NOTICE_TITLE", title); + kind = TXTLS(@"NotificationChannelNoticeMessage"); + title = TXTFLS(@"NotificationChannelNoticeMessageTitle", title); break; } - case NOTIFICATION_TALK_MSG: + case TXNotificationQueryMessageType: { - kind = TXTLS(@"NOTIFICATION_MSG_TALK_MSG"); - title = TXTLS(@"NOTIFICATION_MSG_TALK_MSG_TITLE"); + kind = TXTLS(@"NotificationPrivateQueryMessage"); + title = TXTLS(@"NotificationPrivateQueryMessageTitle"); break; } - case NOTIFICATION_TALK_NOTICE: + case TXNotificationQueryNoticeType: { - kind = TXTLS(@"NOTIFICATION_MSG_TALK_NOTICE"); - title = TXTLS(@"NOTIFICATION_MSG_TALK_NOTICE_TITLE"); + kind = TXTLS(@"NotificationPrivateNoticeMessage"); + title = TXTLS(@"NotificationPrivateNoticeMessageTitle"); break; } - case NOTIFICATION_KICKED: + case TXNotificationKickType: { - kind = TXTLS(@"NOTIFICATION_MSG_KICKED"); - title = TXTFLS(@"NOTIFICATION_MSG_KICKED_TITLE", title); + kind = TXTLS(@"NotificationKickedMessage"); + title = TXTFLS(@"NotificationKickedMessageTitle", title); break; } - case NOTIFICATION_INVITED: + case TXNotificationInviteType: { - kind = TXTLS(@"NOTIFICATION_MSG_INVITED"); - title = TXTFLS(@"NOTIFICATION_MSG_INVITED_TITLE", title); + kind = TXTLS(@"NotificationInvitedMessage"); + title = TXTFLS(@"NotificationInvitedMessageTitle", title); break; } - case NOTIFICATION_LOGIN: + case TXNotificationConnectType: { - kind = TXTLS(@"NOTIFICATION_MSG_LOGIN"); - title = TXTFLS(@"NOTIFICATION_MSG_LOGIN_TITLE", title); + kind = TXTLS(@"NotificationConnectedMessage"); + title = TXTFLS(@"NotificationConnectedMessageTitle", title); break; } - case NOTIFICATION_DISCONNECT: + case TXNotificationDisconnectType: { - kind = TXTLS(@"NOTIFICATION_MSG_DISCONNECT"); - title = TXTFLS(@"NOTIFICATION_MSG_DISCONNECT_TITLE", title); + kind = TXTLS(@"NotificationDisconnectMessage"); + title = TXTFLS(@"NotificationDisconnectMessageTitle", title); break; } - case NOTIFICATION_ADDRESS_BOOK_MATCH: + case TXNotificationAddressBookMatchType: { - kind = TXTLS(@"NOTIFICATION_ADDRESS_BOOK_MATCH"); - title = TXTLS(@"NOTIFICATION_MSG_ADDRESS_BOOK_MATCH_TITLE"); + kind = TXTLS(@"TXNotificationAddressBookMatchType"); + title = TXTLS(@"NotificationAddressBookMatchMessageTitle"); break; } } -#ifdef _USES_NATIVE_NOTIFICATION_CENTER - if ([Preferences featureAvailableToOSXMountainLion]) { +#ifdef TXNativeNotificationCenterAvailable + if ([TPCPreferences featureAvailableToOSXMountainLion]) { NSUserNotification *notification = [[NSUserNotification alloc] init]; notification.title = title; @@ -136,7 +136,7 @@ - (void)notify:(NotificationType)type title:(NSString *)title /* NSUserNotificationCenter */ -#ifdef _USES_NATIVE_NOTIFICATION_CENTER +#ifdef TXNativeNotificationCenterAvailable - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification @@ -152,18 +152,18 @@ - (void)userNotificationCenter:(NSUserNotificationCenter *)center - (NSString *)applicationNameForGrowl { - return [Preferences applicationName]; + return [TPCPreferences applicationName]; } - (NSDictionary *)registrationDictionaryForGrowl { NSArray *allNotifications = [NSArray arrayWithObjects: - TXTLS(@"NOTIFICATION_MSG_HIGHLIGHT"), TXTLS(@"NOTIFICATION_MSG_NEW_TALK"), - TXTLS(@"NOTIFICATION_MSG_CHANNEL_MSG"), TXTLS(@"NOTIFICATION_MSG_CHANNEL_NOTICE"), - TXTLS(@"NOTIFICATION_MSG_TALK_MSG"), TXTLS(@"NOTIFICATION_MSG_TALK_NOTICE"), - TXTLS(@"NOTIFICATION_MSG_KICKED"), TXTLS(@"NOTIFICATION_MSG_INVITED"), - TXTLS(@"NOTIFICATION_MSG_LOGIN"), TXTLS(@"NOTIFICATION_MSG_DISCONNECT"), - TXTLS(@"NOTIFICATION_ADDRESS_BOOK_MATCH"), nil]; + TXTLS(@"NotificationHighlightMessage"), TXTLS(@"NotificationNewPrivateQueryMessage"), + TXTLS(@"NotificationChannelTalkMessage"), TXTLS(@"NotificationChannelNoticeMessage"), + TXTLS(@"NotificationPrivateQueryMessage"), TXTLS(@"NotificationPrivateNoticeMessage"), + TXTLS(@"NotificationKickedMessage"), TXTLS(@"NotificationInvitedMessage"), + TXTLS(@"NotificationConnectedMessage"), TXTLS(@"NotificationDisconnectMessage"), + TXTLS(@"TXNotificationAddressBookMatchType"), nil]; return [NSDictionary dictionaryWithObjectsAndKeys:allNotifications, GROWL_NOTIFICATIONS_ALL, allNotifications, GROWL_NOTIFICATIONS_DEFAULT, nil]; } @@ -172,7 +172,7 @@ - (void)growlNotificationWasClicked:(NSDictionary *)context { CFAbsoluteTime now = CFAbsoluteTimeGetCurrent(); - if ((now - self.lastClickedTime) < CLICK_INTERVAL) { + if ((now - self.lastClickedTime) < _clickInterval) { if (self.lastClickedContext && [self.lastClickedContext isEqual:context]) { return; } diff --git a/Classes/Controllers/NickCompletionStatus.m b/Classes/Controllers/TLONickCompletionStatus.m similarity index 91% rename from Classes/Controllers/NickCompletionStatus.m rename to Classes/Controllers/TLONickCompletionStatus.m index c1e8f52c76..cbce8d0dfe 100755 --- a/Classes/Controllers/NickCompletionStatus.m +++ b/Classes/Controllers/TLONickCompletionStatus.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NickCompletionStatus +@implementation TLONickCompletionStatus @synthesize text; @synthesize range; diff --git a/Classes/Controllers/MasterController.m b/Classes/Controllers/TXMasterController.m similarity index 79% rename from Classes/Controllers/MasterController.m rename to Classes/Controllers/TXMasterController.m index 088d6250f4..9c3ef4137d 100755 --- a/Classes/Controllers/MasterController.m +++ b/Classes/Controllers/TXMasterController.m @@ -6,16 +6,16 @@ #define KInternetEventClass 1196773964 #define KAEGetURL 1196773964 -#define maximumSplitViewWidth 300 -#define minimumSplitViewWidth 120 -#define defaultSplitViewWidth 170 +#define _maximumSplitViewWidth 300 +#define _minimumSplitViewWidth 120 +#define _defaultSplitViewWidth 170 -@interface MasterController (Private) +@interface TXMasterController (Private) - (void)setColumnLayout; - (void)registerKeyHandlers; @end -@implementation MasterController +@implementation TXMasterController @synthesize addServerButton; @synthesize chanMenu; @@ -50,7 +50,7 @@ @implementation MasterController - (void)awakeFromNib { -#ifdef _MAC_OS_LION_OR_NEWER +#ifdef TXMacOSLionOrNewer [self.window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; #endif @@ -64,13 +64,13 @@ - (void)awakeFromNib [self.window makeMainWindow]; - [Preferences initPreferences]; + [TPCPreferences initPreferences]; [self.text setBackgroundColor:[NSColor clearColor]]; - [_NSNotificationCenter() addObserver:self selector:@selector(themeStyleDidChange:) name:ThemeStyleDidChangeNotification object:nil]; - [_NSNotificationCenter() addObserver:self selector:@selector(transparencyDidChange:) name:TransparencyDidChangeNotification object:nil]; - [_NSNotificationCenter() addObserver:self selector:@selector(inputHistorySchemeChanged:) name:InputHistoryGlobalSchemeNotification object:nil]; + [_NSNotificationCenter() addObserver:self selector:@selector(themeStyleDidChange:) name:TXThemePreferenceChangedNotification object:nil]; + [_NSNotificationCenter() addObserver:self selector:@selector(transparencyDidChange:) name:TXTransparencyPreferenceChangedNotification object:nil]; + [_NSNotificationCenter() addObserver:self selector:@selector(inputHistorySchemeChanged:) name:TXInputHistorySchemePreferenceChangedNotification object:nil]; [_NSWorkspaceNotificationCenter() addObserver:self selector:@selector(computerDidWakeUp:) name:NSWorkspaceDidWakeNotification object:nil]; [_NSWorkspaceNotificationCenter() addObserver:self selector:@selector(computerWillSleep:) name:NSWorkspaceWillSleepNotification object:nil]; @@ -83,18 +83,18 @@ - (void)awakeFromNib self.serverSplitView.fixedViewIndex = 0; self.memberSplitView.fixedViewIndex = 1; - self.viewTheme = [ViewTheme new]; - self.viewTheme.name = [Preferences themeName]; + self.viewTheme = [TPCViewTheme new]; + self.viewTheme.name = [TPCPreferences themeName]; [self loadWindowState]; - [self.window setAlphaValue:[Preferences themeTransparency]]; + [self.window setAlphaValue:[TPCPreferences themeTransparency]]; [self.text setReturnActionWithSelector:@selector(textEntered) owner:self]; - [LanguagePreferences setThemeForLocalization:self.viewTheme.path]; + [TLOLanguagePreferences setThemeForLocalization:self.viewTheme.path]; - IRCWorldConfig *seed = [[IRCWorldConfig alloc] initWithDictionary:[Preferences loadWorld]]; + IRCWorldConfig *seed = [[IRCWorldConfig alloc] initWithDictionary:[TPCPreferences loadWorld]]; self.extrac = [IRCExtras new]; self.world = [IRCWorld new]; @@ -143,14 +143,14 @@ - (void)awakeFromNib [self.memberList setTarget:self.menu]; [self.memberList setDoubleAction:@selector(memberListDoubleClicked:)]; - self.growl = [GrowlController new]; + self.growl = [TLOGrowlController new]; self.growl.owner = self.world; self.world.growl = self.growl; [self.formattingMenu enableWindowField:self.text]; - if ([Preferences inputHistoryIsChannelSpecific] == NO) { - self.inputHistory = [InputHistory new]; + if ([TPCPreferences inputHistoryIsChannelSpecific] == NO) { + self.inputHistory = [TLOInputHistory new]; } [self registerKeyHandlers]; @@ -167,7 +167,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)note [self.window makeKeyAndOrderFront:nil]; if (self.world.clients.count < 1) { - self.welcomeSheet = [WelcomeSheet new]; + self.welcomeSheet = [TDCWelcomeSheet new]; self.welcomeSheet.delegate = self; self.welcomeSheet.window = self.window; [self.welcomeSheet show]; @@ -176,9 +176,9 @@ - (void)applicationDidFinishLaunching:(NSNotification *)note } #ifdef IS_TRIAL_BINARY - [[PopupPrompts invokeInBackgroundThread] dialogWindowWithQuestion:TXTLS(@"TRIAL_BUILD_INTRO_DIALOG_MESSAGE") - title:TXTLS(@"TRIAL_BUILD_INTRO_DIALOG_TITLE") - defaultButton:TXTLS(@"OK_BUTTON") + [[PopupPrompts invokeInBackgroundThread] dialogWindowWithQuestion:TXTLS(@"TrialPeriodIntroductionDialogMessage") + title:TXTLS(@"TrialPeriodIntroductionDialogTitle") + defaultButton:TXTLS(@"OkButton") alternateButton:nil otherButton:nil suppressionKey:@"trial_period_info" @@ -241,11 +241,11 @@ - (BOOL)queryTerminate return YES; } - if ([Preferences confirmQuit]) { - NSInteger result = [PopupPrompts dialogWindowWithQuestion:TXTLS(@"WANT_QUIT_MESSAGE") - title:TXTLS(@"WANT_QUIT_TITLE") - defaultButton:TXTLS(@"QUIT_BUTTON") - alternateButton:TXTLS(@"CANCEL_BUTTON") + if ([TPCPreferences confirmQuit]) { + NSInteger result = [TLOPopupPrompts dialogWindowWithQuestion:TXTLS(@"ApplicationWantsToTerminatePromptMessage") + title:TXTLS(@"ApplicationWantsToTerminatePromptTitle") + defaultButton:TXTLS(@"QuitButton") + alternateButton:TXTLS(@"CancelButton") otherButton:nil suppressionKey:nil suppressionText:nil]; @@ -277,7 +277,7 @@ - (void)applicationWillTerminate:(NSNotification *)note [self.menu terminate]; [self saveWindowState]; - [Preferences updateTotalRunTime]; + [TPCPreferences updateTotalRunTime]; } #pragma mark - @@ -372,8 +372,8 @@ - (BOOL)windowShouldZoom:(NSWindow *)awindow toFrame:(NSRect)newFrame - (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)client { - NSMenu *editorMenu = [self.text menu]; - NSMenuItem *formatMenu = [self.formattingMenu formatterMenu]; + NSMenu *editorMenu = self.text.menu; + NSMenuItem *formatMenu = self.formattingMenu.formatterMenu; if (formatMenu) { NSInteger fmtrIndex = [editorMenu indexOfItemWithTitle:[formatMenu title]]; @@ -398,7 +398,7 @@ - (void)sendText:(NSString *)command [self.text setAttributedStringValue:[NSAttributedString emptyString]]; - if ([Preferences inputHistoryIsChannelSpecific]) { + if ([TPCPreferences inputHistoryIsChannelSpecific]) { self.world.selected.inputHistory.lastHistoryItem = nil; } @@ -415,7 +415,7 @@ - (void)sendText:(NSString *)command - (void)textEntered { - [self sendText:IRCCI_PRIVMSG]; + [self sendText:IRCCommandIndexPrivmsg]; } - (void)showMemberListSplitView:(BOOL)showList @@ -429,8 +429,8 @@ - (void)showMemberListSplitView:(BOOL)showList self.memberSplitView.inverted = NO; if ([self.memberSplitView isSubviewCollapsed:rightView] == NO) { - if (self.memberSplitViewOldPosition < minimumSplitViewWidth) { - self.memberSplitViewOldPosition = minimumSplitViewWidth; + if (self.memberSplitViewOldPosition < _minimumSplitViewWidth) { + self.memberSplitViewOldPosition = _minimumSplitViewWidth; } self.memberSplitView.position = self.memberSplitViewOldPosition; @@ -457,10 +457,10 @@ - (CGFloat)splitView:(NSSplitView *)splitView NSInteger leftWidth = [leftSide bounds].size.width; NSInteger rightWidth = [rightSide bounds].size.width; - return ((leftWidth + rightWidth) - minimumSplitViewWidth); + return ((leftWidth + rightWidth) - _minimumSplitViewWidth); } - return maximumSplitViewWidth; + return _maximumSplitViewWidth; } - (CGFloat)splitView:(NSSplitView *)splitView @@ -474,10 +474,10 @@ - (CGFloat)splitView:(NSSplitView *)splitView NSInteger leftWidth = [leftSide bounds].size.width; NSInteger rightWidth = [rightSide bounds].size.width; - return ((leftWidth + rightWidth) - maximumSplitViewWidth); + return ((leftWidth + rightWidth) - _maximumSplitViewWidth); } - return minimumSplitViewWidth; + return _minimumSplitViewWidth; } - (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview @@ -501,7 +501,7 @@ - (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview - (void)loadWindowState { - NSDictionary *dic = [Preferences loadWindowStateWithName:@"MainWindow"]; + NSDictionary *dic = [TPCPreferences loadWindowStateWithName:@"MainWindow"]; if (dic) { NSInteger x = [dic integerForKey:@"x"]; @@ -518,12 +518,12 @@ - (void)loadWindowState self.serverSplitView.position = [dic integerForKey:@"serverList"]; self.memberSplitView.position = [dic integerForKey:@"memberList"]; - if (self.serverSplitView.position < minimumSplitViewWidth) { - self.serverSplitView.position = defaultSplitViewWidth; + if (self.serverSplitView.position < _minimumSplitViewWidth) { + self.serverSplitView.position = _defaultSplitViewWidth; } - if (self.memberSplitView.position < minimumSplitViewWidth) { - self.memberSplitView.position = defaultSplitViewWidth; + if (self.memberSplitView.position < _minimumSplitViewWidth) { + self.memberSplitView.position = _defaultSplitViewWidth; } } else { NSScreen *screen = [NSScreen mainScreen]; @@ -554,7 +554,7 @@ - (void)saveWindowState NSMutableDictionary *dic = [NSMutableDictionary dictionary]; if (self.menu.isInFullScreenMode) { - [self.menu wantsFullScreenModeToggled:nil]; + [self.menu toggleFullscreenMode:nil]; } NSRect rect = self.window.frame; @@ -564,13 +564,13 @@ - (void)saveWindowState [dic setInteger:rect.size.width forKey:@"w"]; [dic setInteger:rect.size.height forKey:@"h"]; - if (self.serverSplitView.position < minimumSplitViewWidth) { - self.serverSplitView.position = defaultSplitViewWidth; + if (self.serverSplitView.position < _minimumSplitViewWidth) { + self.serverSplitView.position = _defaultSplitViewWidth; } - if (self.memberSplitView.position < minimumSplitViewWidth) { - if (self.memberSplitViewOldPosition < minimumSplitViewWidth) { - self.memberSplitView.position = defaultSplitViewWidth; + if (self.memberSplitView.position < _minimumSplitViewWidth) { + if (self.memberSplitViewOldPosition < _minimumSplitViewWidth) { + self.memberSplitView.position = _defaultSplitViewWidth; } else { self.memberSplitView.position = self.memberSplitViewOldPosition; } @@ -583,8 +583,8 @@ - (void)saveWindowState [_NSUserDefaults() setBool:[self.text isContinuousSpellCheckingEnabled] forKey:@"SpellChecking"]; [_NSUserDefaults() setBool:[self.text isAutomaticSpellingCorrectionEnabled] forKey:@"AutoSpellCorrection"]; - [Preferences saveWindowState:dic name:@"MainWindow"]; - [Preferences sync]; + [TPCPreferences saveWindowState:dic name:@"MainWindow"]; + [TPCPreferences sync]; } - (void)themeStyleDidChange:(NSNotification *)note @@ -594,21 +594,21 @@ - (void)themeStyleDidChange:(NSNotification *)note [self.world reloadTheme]; if (self.viewTheme.other.nicknameFormat) { - [sf appendString:TXTLS(@"THEME_CHANGE_OVERRIDE_PROMPT_NICKNAME_FORMAT")]; - [sf appendString:NSNewlineCharacter]; + [sf appendString:TXTLS(@"ThemeChangeOverridePromptNicknameFormat")]; + [sf appendString:NSStringNewlinePlaceholder]; } if (self.viewTheme.other.timestampFormat) { - [sf appendString:TXTLS(@"THEME_CHANGE_OVERRIDE_PROMPT_TIMESTAMP_FORMAT")]; - [sf appendString:NSNewlineCharacter]; + [sf appendString:TXTLS(@"ThemeChangeOverridePromptTimestampFormat")]; + [sf appendString:NSStringNewlinePlaceholder]; } if (self.viewTheme.other.channelViewFontOverrode) { - [sf appendString:TXTLS(@"THEME_CHANGE_OVERRIDE_PROMPT_CHANNEL_FONT")]; - [sf appendString:NSNewlineCharacter]; + [sf appendString:TXTLS(@"ThemeChangeOverridePromptChannelFont")]; + [sf appendString:NSStringNewlinePlaceholder]; } - if ([Preferences rightToLeftFormatting]) { + if ([TPCPreferences rightToLeftFormatting]) { [self.text setBaseWritingDirection:NSWritingDirectionRightToLeft]; } else { [self.text setBaseWritingDirection:NSWritingDirectionLeftToRight]; @@ -617,14 +617,14 @@ - (void)themeStyleDidChange:(NSNotification *)note sf = (NSMutableString *)[sf trim]; if (NSObjectIsNotEmpty(sf)) { - NSString *theme = [ViewTheme extractThemeName:[Preferences themeName]]; + NSString *theme = [TPCViewTheme extractThemeName:[TPCPreferences themeName]]; - [PopupPrompts sheetWindowWithQuestion:[NSApp keyWindow] - target:[PopupPrompts class] + [TLOPopupPrompts sheetWindowWithQuestion:[NSApp keyWindow] + target:[TLOPopupPrompts class] action:@selector(popupPromptNULLSelector:) - body:TXTFLS(@"THEME_CHANGE_OVERRIDE_PROMPT_MESSAGE", theme, sf) - title:TXTLS(@"THEME_CHANGE_OVERRIDE_PROMPT_TITLE") - defaultButton:TXTLS(@"OK_BUTTON") + body:TXTFLS(@"ThemeChangeOverridePromptMessage", theme, sf) + title:TXTLS(@"ThemeChangeOverridePromptTitle") + defaultButton:TXTLS(@"OkButton") alternateButton:nil otherButton:nil suppressionKey:@"theme_override_info" @@ -634,7 +634,7 @@ - (void)themeStyleDidChange:(NSNotification *)note - (void)transparencyDidChange:(NSNotification *)note { - [self.window setAlphaValue:[Preferences themeTransparency]]; + [self.window setAlphaValue:[TPCPreferences themeTransparency]]; } - (void)inputHistorySchemeChanged:(NSNotification *)note @@ -648,8 +648,8 @@ - (void)inputHistorySchemeChanged:(NSNotification *)note c.inputHistory = nil; } - if ([Preferences inputHistoryIsChannelSpecific]) { - c.inputHistory = [InputHistory new]; + if ([TPCPreferences inputHistoryIsChannelSpecific]) { + c.inputHistory = [TLOInputHistory new]; } for (IRCChannel *u in c.channels) { @@ -657,14 +657,14 @@ - (void)inputHistorySchemeChanged:(NSNotification *)note u.inputHistory = nil; } - if ([Preferences inputHistoryIsChannelSpecific]) { - u.inputHistory = [InputHistory new]; + if ([TPCPreferences inputHistoryIsChannelSpecific]) { + u.inputHistory = [TLOInputHistory new]; } } } - if ([Preferences inputHistoryIsChannelSpecific] == NO) { - self.inputHistory = [InputHistory new]; + if ([TPCPreferences inputHistoryIsChannelSpecific] == NO) { + self.inputHistory = [TLOInputHistory new]; } } @@ -691,10 +691,10 @@ - (void)completeNick:(BOOL)forward if (selectedRange.location == NSNotFound) return; if (PointerIsEmpty(self.completionStatus)) { - self.completionStatus = [NickCompletionStatus new]; + self.completionStatus = [TLONickCompletionStatus new]; } - NickCompletionStatus *status = self.completionStatus; + TLONickCompletionStatus *status = self.completionStatus; NSString *s = [self.text stringValue]; @@ -762,6 +762,7 @@ - (void)completeNick:(BOOL)forward ; } else { current = [current safeSubstringToIndex:i]; + break; } } @@ -777,7 +778,7 @@ - (void)completeNick:(BOOL)forward if (commandMode) { choices = [NSMutableArray array]; - for (NSString *command in [Preferences commandIndexList].allKeys) { + for (NSString *command in [TPCPreferences commandIndexList].allKeys) { [choices safeAddObject:[command lowercaseString]]; } @@ -791,12 +792,12 @@ - (void)completeNick:(BOOL)forward NSArray *scriptPaths = [NSArray arrayWithObjects: -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER - [Preferences whereScriptsUnsupervisedPath], +#ifdef TXUserScriptsFolderAvailable + [TPCPreferences whereScriptsUnsupervisedPath], #endif - [Preferences whereScriptsLocalPath], - [Preferences whereScriptsPath], nil]; + [TPCPreferences whereScriptsLocalPath], + [TPCPreferences whereScriptsPath], nil]; for (NSString *path in scriptPaths) { NSArray *resourceFiles = [_NSFileManager() contentsOfDirectoryAtPath:path error:NULL]; @@ -849,14 +850,14 @@ - (void)completeNick:(BOOL)forward [nicks safeAddObject:@"HostServ"]; [nicks safeAddObject:@"ChanServ"]; [nicks safeAddObject:@"MemoServ"]; - [nicks safeAddObject:[Preferences applicationName]]; + [nicks safeAddObject:[TPCPreferences applicationName]]; [lowerNicks safeAddObject:@"nickserv"]; [lowerNicks safeAddObject:@"rootserv"]; [lowerNicks safeAddObject:@"operserv"]; [lowerNicks safeAddObject:@"hostserv"]; [lowerNicks safeAddObject:@"chanserv"]; - [lowerNicks safeAddObject:[Preferences applicationName]]; + [lowerNicks safeAddObject:[TPCPreferences applicationName]]; choices = nicks; lowerChoices = lowerNicks; @@ -906,10 +907,10 @@ - (void)completeNick:(BOOL)forward inSpellDocumentWithTag:[self.text spellCheckerDocumentTag]]; if ((commandMode || channelMode) || head == NO) { - t = [t stringByAppendingString:NSWhitespaceCharacter]; + t = [t stringByAppendingString:NSStringWhitespacePlaceholder]; } else { - if (NSObjectIsNotEmpty([Preferences completionSuffix])) { - t = [t stringByAppendingString:[Preferences completionSuffix]]; + if (NSObjectIsNotEmpty([TPCPreferences completionSuffix])) { + t = [t stringByAppendingString:[TPCPreferences completionSuffix]]; } } @@ -940,18 +941,18 @@ - (void)completeNick:(BOOL)forward #pragma mark Keyboard Navigation typedef enum { - MOVE_UP, - MOVE_DOWN, - MOVE_LEFT, - MOVE_RIGHT, - MOVE_ALL, - MOVE_ACTIVE, - MOVE_UNREAD, -} MoveKind; - -- (void)move:(MoveKind)dir target:(MoveKind)target -{ - if (dir == MOVE_UP || dir == MOVE_DOWN) { + TXMoveUpKind, + TXMoveDownKind, + TXMoveLeftKind, + TXMoveRightKind, + TXMoveAllKind, + TXMoveActiveKind, + TXMoveUnreadKind, +} TXMoveKind; + +- (void)move:(TXMoveKind)dir target:(TXMoveKind)target +{ + if (dir == TXMoveUpKind || dir == TXMoveDownKind) { id sel = self.world.selected; if (PointerIsEmpty(sel)) return; @@ -964,7 +965,7 @@ - (void)move:(MoveKind)dir target:(MoveKind)target if (count <= 1) return; while (1 == 1) { - if (dir == MOVE_UP) { + if (dir == TXMoveUpKind) { --n; if (n < 0) n = (count - 1); @@ -979,13 +980,13 @@ - (void)move:(MoveKind)dir target:(MoveKind)target id i = [self.serverList itemAtRow:n]; if (i) { - if (target == MOVE_ACTIVE) { + if (target == TXMoveActiveKind) { if ([i isClient] == NO && [i isActive]) { [self.world select:i]; break; } - } else if (target == MOVE_UNREAD) { + } else if (target == TXMoveUnreadKind) { if ([i isUnread]) { [self.world select:i]; @@ -998,7 +999,7 @@ - (void)move:(MoveKind)dir target:(MoveKind)target } } } - } else if (dir == MOVE_LEFT || dir == MOVE_RIGHT) { + } else if (dir == TXMoveLeftKind || dir == TXMoveRightKind) { IRCClient *client = [self.world selectedClient]; if (PointerIsEmpty(client)) return; @@ -1012,7 +1013,7 @@ - (void)move:(MoveKind)dir target:(MoveKind)target if (count <= 1) return; while (1 == 1) { - if (dir == MOVE_LEFT) { + if (dir == TXMoveLeftKind) { --n; if (n < 0) n = (count - 1); @@ -1027,7 +1028,7 @@ - (void)move:(MoveKind)dir target:(MoveKind)target client = [self.world.clients safeObjectAtIndex:n]; if (client) { - if (target == MOVE_ACTIVE) { + if (target == TXMoveActiveKind) { if (client.isLoggedIn) { id t = ((client.lastSelectedChannel) ?: (id)client); @@ -1049,52 +1050,52 @@ - (void)move:(MoveKind)dir target:(MoveKind)target - (void)selectPreviousChannel:(NSEvent *)e { - [self move:MOVE_UP target:MOVE_ALL]; + [self move:TXMoveUpKind target:TXMoveAllKind]; } - (void)selectNextChannel:(NSEvent *)e { - [self move:MOVE_DOWN target:MOVE_ALL]; + [self move:TXMoveDownKind target:TXMoveAllKind]; } - (void)selectPreviousUnreadChannel:(NSEvent *)e { - [self move:MOVE_UP target:MOVE_UNREAD]; + [self move:TXMoveUpKind target:TXMoveUnreadKind]; } - (void)selectNextUnreadChannel:(NSEvent *)e { - [self move:MOVE_DOWN target:MOVE_UNREAD]; + [self move:TXMoveDownKind target:TXMoveUnreadKind]; } - (void)selectPreviousActiveChannel:(NSEvent *)e { - [self move:MOVE_UP target:MOVE_ACTIVE]; + [self move:TXMoveUpKind target:TXMoveActiveKind]; } - (void)selectNextActiveChannel:(NSEvent *)e { - [self move:MOVE_DOWN target:MOVE_ACTIVE]; + [self move:TXMoveDownKind target:TXMoveActiveKind]; } - (void)selectPreviousServer:(NSEvent *)e { - [self move:MOVE_LEFT target:MOVE_ALL]; + [self move:TXMoveLeftKind target:TXMoveAllKind]; } - (void)selectNextServer:(NSEvent *)e { - [self move:MOVE_RIGHT target:MOVE_ALL]; + [self move:TXMoveRightKind target:TXMoveAllKind]; } - (void)selectPreviousActiveServer:(NSEvent *)e { - [self move:MOVE_LEFT target:MOVE_ACTIVE]; + [self move:TXMoveLeftKind target:TXMoveActiveKind]; } - (void)selectNextActiveServer:(NSEvent *)e { - [self move:MOVE_RIGHT target:MOVE_ACTIVE]; + [self move:TXMoveRightKind target:TXMoveActiveKind]; } - (void)selectPreviousSelection:(NSEvent *)e @@ -1104,30 +1105,30 @@ - (void)selectPreviousSelection:(NSEvent *)e - (void)selectNextSelection:(NSEvent *)e { - [self move:MOVE_DOWN target:MOVE_ALL]; + [self move:TXMoveDownKind target:TXMoveAllKind]; } - (void)tab:(NSEvent *)e { - switch ([Preferences tabAction]) { - case TAB_COMPLETE_NICK: [self completeNick:YES]; break; - case TAB_UNREAD: [self move:MOVE_DOWN target:MOVE_UNREAD]; break; + switch ([TPCPreferences tabAction]) { + case TXTabKeyActionNickCompleteType: [self completeNick:YES]; break; + case TXTabKeyActionUnreadChannelType: [self move:TXMoveDownKind target:TXMoveUnreadKind]; break; default: break; } } - (void)shiftTab:(NSEvent *)e { - switch ([Preferences tabAction]) { - case TAB_COMPLETE_NICK: [self completeNick:NO]; break; - case TAB_UNREAD: [self move:MOVE_UP target:MOVE_UNREAD]; break; + switch ([TPCPreferences tabAction]) { + case TXTabKeyActionNickCompleteType: [self completeNick:NO]; break; + case TXTabKeyActionUnreadChannelType: [self move:TXMoveUpKind target:TXMoveUnreadKind]; break; default: break; } } - (void)sendMsgAction:(NSEvent *)e { - [self sendText:IRCCI_ACTION]; + [self sendText:IRCCommandIndexAction]; } - (void)_moveInputHistory:(BOOL)up checkScroller:(BOOL)scroll event:(NSEvent *)event @@ -1136,11 +1137,11 @@ - (void)_moveInputHistory:(BOOL)up checkScroller:(BOOL)scroll event:(NSEvent *)e NSInteger nol = [self.text numberOfLines]; if (nol >= 2) { - BOOL atTop = [self.text isAtTopfView]; + BOOL atTop = [self.text isAtTopOfView]; BOOL atBottom = [self.text isAtBottomOfView]; - if ((atTop && event.keyCode == KEY_DOWN) || - (atBottom && event.keyCode == KEY_UP) || + if ((atTop && event.keyCode == TXKeyDownArrowCode) || + (atBottom && event.keyCode == TXKeyUpArrowCode) || (atTop == NO && atBottom == NO)) { [self.text keyDownToSuper:event]; @@ -1252,7 +1253,7 @@ - (void)textFormattingBackgroundColor:(NSEvent *)e - (void)exitFullscreenMode:(NSEvent *)e { if (self.menu.isInFullScreenMode && [self.text isFocused] == NO) { - [self.menu wantsFullScreenModeToggled:nil]; + [self.menu toggleFullscreenMode:nil]; } else { [self.text keyDown:e]; } @@ -1288,15 +1289,15 @@ - (void)registerKeyHandlers [self.window setKeyHandlerTarget:self]; [self.text setKeyHandlerTarget:self]; - [self handler:@selector(exitFullscreenMode:) code:KEY_ESCAPE mods:0]; + [self handler:@selector(exitFullscreenMode:) code:TXKeyEscapeCode mods:0]; - [self handler:@selector(tab:) code:KEY_TAB mods:0]; - [self handler:@selector(shiftTab:) code:KEY_TAB mods:NSShiftKeyMask]; + [self handler:@selector(tab:) code:TXKeyTabCode mods:0]; + [self handler:@selector(shiftTab:) code:TXKeyTabCode mods:NSShiftKeyMask]; - [self handler:@selector(sendMsgAction:) code:KEY_ENTER mods:NSCommandKeyMask]; - [self handler:@selector(sendMsgAction:) code:KEY_RETURN mods:NSCommandKeyMask]; + [self handler:@selector(sendMsgAction:) code:TXKeyEnterCode mods:NSCommandKeyMask]; + [self handler:@selector(sendMsgAction:) code:TXKeyEnterCode mods:NSCommandKeyMask]; - [self handler:@selector(selectPreviousSelection:) code:KEY_TAB mods:NSAlternateKeyMask]; + [self handler:@selector(selectPreviousSelection:) code:TXKeyTabCode mods:NSAlternateKeyMask]; [self handler:@selector(textFormattingBold:) char:'b' mods:NSCommandKeyMask]; [self handler:@selector(textFormattingUnderline:) char:'u' mods:(NSCommandKeyMask | NSAlternateKeyMask)]; @@ -1309,19 +1310,20 @@ - (void)registerKeyHandlers [self inputHandler:@selector(focusWebview) char:'l' mods:(NSControlKeyMask | NSCommandKeyMask)]; - [self inputHandler:@selector(inputHistoryUpWithScrollCheck:) code:KEY_UP mods:0]; - [self inputHandler:@selector(inputHistoryUpWithScrollCheck:) code:KEY_UP mods:NSAlternateKeyMask]; + [self inputHandler:@selector(inputHistoryUpWithScrollCheck:) code:TXKeyUpArrowCode mods:0]; + [self inputHandler:@selector(inputHistoryUpWithScrollCheck:) code:TXKeyUpArrowCode mods:NSAlternateKeyMask]; - [self inputHandler:@selector(inputHistoryDownWithScrollCheck:) code:KEY_DOWN mods:0]; - [self inputHandler:@selector(inputHistoryDownWithScrollCheck:) code:KEY_DOWN mods:NSAlternateKeyMask]; + [self inputHandler:@selector(inputHistoryDownWithScrollCheck:) code:TXKeyDownArrowCode mods:0]; + [self inputHandler:@selector(inputHistoryDownWithScrollCheck:) code:TXKeyDownArrowCode mods:NSAlternateKeyMask]; } #pragma mark - #pragma mark WelcomeSheet Delegate -- (void)WelcomeSheet:(WelcomeSheet *)sender onOK:(NSDictionary *)config +- (void)welcomeSheet:(TDCWelcomeSheet *)sender onOK:(NSDictionary *)config { NSMutableArray *channels = [NSMutableArray array]; + NSMutableDictionary *dic = [NSMutableDictionary dictionary]; for (NSString *s in [config objectForKey:@"channels"]) { @@ -1335,12 +1337,12 @@ - (void)WelcomeSheet:(WelcomeSheet *)sender onOK:(NSDictionary *)config NSString *host = [config objectForKey:@"host"]; NSString *nick = [config objectForKey:@"nick"]; - [dic setObject:host forKey:@"host"]; - [dic setObject:host forKey:@"name"]; - [dic setObject:nick forKey:@"nick"]; - [dic setObject:channels forKey:@"channels"]; - [dic setObject:[config objectForKey:@"autoConnect"] forKey:@"auto_connect"]; - [dic setObject:[NSNumber numberWithLong:NSUTF8StringEncoding] forKey:@"encoding"]; + [dic setObject:host forKey:@"host"]; + [dic setObject:host forKey:@"name"]; + [dic setObject:nick forKey:@"nick"]; + [dic setObject:channels forKey:@"channels"]; + [dic setObject:[config objectForKey:@"autoConnect"] forKey:@"auto_connect"]; + [dic setObject:NSNumberWithLong(NSUTF8StringEncoding) forKey:@"encoding"]; [self.window makeKeyAndOrderFront:nil]; @@ -1354,7 +1356,7 @@ - (void)WelcomeSheet:(WelcomeSheet *)sender onOK:(NSDictionary *)config } } -- (void)WelcomeSheetWillClose:(WelcomeSheet *)sender +- (void)welcomeSheetWillClose:(TDCWelcomeSheet *)sender { self.welcomeSheet = nil; } diff --git a/Classes/Controllers/MenuController.m b/Classes/Controllers/TXMenuController.m similarity index 67% rename from Classes/Controllers/MenuController.m rename to Classes/Controllers/TXMenuController.m index b8421e37e2..d3a882da3d 100755 --- a/Classes/Controllers/MenuController.m +++ b/Classes/Controllers/TXMenuController.m @@ -3,22 +3,22 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define NO_CLIENT (PointerIsEmpty(u)) -#define NO_CHANNEL (PointerIsEmpty(c)) -#define NO_CLIENT_OR_CHANNEL (PointerIsEmpty(u) || PointerIsEmpty(c)) -#define IS_CLIENT (c.isTalk == NO && c.isChannel == NO && c.isClient == YES) -#define IS_CHANNEL (c.isTalk == NO && c.isChannel == YES && c.isClient == NO) -#define IS_QUERY (c.isTalk == YES && c.isChannel == NO && c.isClient == NO) -#define CONNECTED (u && u.isConnected && u.isLoggedIn) -#define NOT_CONNECTED (u && u.isConnected == NO && u.isLoggedIn == NO && u.isConnecting == NO) -#define ACTIVE (c && c.isActive) -#define NOT_ACTIVE (c && c.isActive == NO) - -@interface MenuController (Private) -- (LogView *)currentWebView; +#define _noClient (PointerIsEmpty(u)) +#define _noChannel (PointerIsEmpty(c)) +#define _noClientOrChannel (PointerIsEmpty(u) || PointerIsEmpty(c)) +#define _isClient (c.isTalk == NO && c.isChannel == NO && c.isClient == YES) +#define _isChannel (c.isTalk == NO && c.isChannel == YES && c.isClient == NO) +#define _isQuery (c.isTalk == YES && c.isChannel == NO && c.isClient == NO) +#define _connected (u && u.isConnected && u.isLoggedIn) +#define _notConnected (u && u.isConnected == NO && u.isLoggedIn == NO && u.isConnecting == NO) +#define _activate (c && c.isActive) +#define _notActive (c && c.isActive == NO) + +@interface TXMenuController (Private) +- (TVCLogView *)currentWebView; @end -@implementation MenuController +@implementation TXMenuController @synthesize aboutPanel; @synthesize channelSheet; @@ -45,7 +45,7 @@ @implementation MenuController - (id)init { if ((self = [super init])) { - self.currentSearchPhrase = NSNullObject; + self.currentSearchPhrase = NSStringEmptyPlaceholder; } return self; @@ -62,20 +62,20 @@ - (void)validateChannelMenuSubmenus:(NSMenuItem *)item { IRCChannel *c = [self.world selectedChannel]; - if (IS_CHANNEL) { - [[[item menu] itemWithTag:936] setHidden:NO]; - [[[item menu] itemWithTag:937] setHidden:NO]; + if (_isChannel) { + [[item.menu itemWithTag:936] setHidden:NO]; + [[item.menu itemWithTag:937] setHidden:NO]; - [[[item menu] itemWithTag:5422] setHidden:NO]; - [[[item menu] itemWithTag:5422] setEnabled:YES]; + [[item.menu itemWithTag:5422] setHidden:NO]; + [[item.menu itemWithTag:5422] setEnabled:YES]; - [[[[[item menu] itemWithTag:5422] submenu] itemWithTag:542] setEnabled:[Preferences logTranscript]]; + [[[item.menu itemWithTag:5422].submenu itemWithTag:542] setEnabled:[TPCPreferences logTranscript]]; } else { - [[[item menu] itemWithTag:936] setHidden:BOOLReverseValue(c.isTalk)]; - [[[item menu] itemWithTag:937] setHidden:BOOLReverseValue(c.isTalk)]; + [[item.menu itemWithTag:936] setHidden:BOOLReverseValue(c.isTalk)]; + [[item.menu itemWithTag:937] setHidden:BOOLReverseValue(c.isTalk)]; - [[[item menu] itemWithTag:5422] setEnabled:NO]; - [[[item menu] itemWithTag:5422] setHidden:YES]; + [[item.menu itemWithTag:5422] setEnabled:NO]; + [[item.menu itemWithTag:5422] setHidden:YES]; } } @@ -113,7 +113,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item { [self validateChannelMenuSubmenus:item]; - LogView *web = [self currentWebView]; + TVCLogView *web = [self currentWebView]; if (PointerIsEmpty(web)) return NO; return [web hasSelection]; @@ -121,7 +121,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 501: // connect { - BOOL condition = (CONNECTED || u.isConnecting); + BOOL condition = (_connected || u.isConnecting); [item setHidden:condition]; @@ -130,7 +130,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 502: // disconnect { - BOOL condition = (u && (CONNECTED || u.isConnecting)); + BOOL condition = (u && (_connected || u.isConnecting)); [item setHidden:BOOLReverseValue(condition)]; @@ -149,7 +149,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item case 511: // nick case 519: // channel list { - return CONNECTED; + return _connected; break; } case 522: // copy server @@ -159,7 +159,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 523: // delete server { - return NOT_CONNECTED; + return _notConnected; break; } case 541: // server property @@ -169,21 +169,21 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 592: // textual logs { - return [Preferences logTranscript]; + return [TPCPreferences logTranscript]; break; } case 601: // join { [self validateChannelMenuSubmenus:item]; - if (IS_QUERY) { + if (_isQuery) { [item setHidden:YES]; return NO; } else { - BOOL condition = (CONNECTED && NOT_ACTIVE && IS_CHANNEL); + BOOL condition = (_connected && _notActive && _isChannel); - if (CONNECTED) { + if (_connected) { [item setHidden:BOOLReverseValue(condition)]; } else { [item setHidden:NO]; @@ -196,31 +196,31 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 602: // leave { - if (IS_QUERY) { + if (_isQuery) { [item setHidden:YES]; return NO; } else { - [item setHidden:NOT_ACTIVE]; + [item setHidden:_notActive]; - return ACTIVE; + return _activate; } break; } case 611: // mode { - return ACTIVE; + return _activate; break; } case 612: // topic { - return ACTIVE; + return _activate; break; } case 651: // add channel { - if (IS_QUERY) { + if (_isQuery) { [item setHidden:YES]; return NO; @@ -234,14 +234,14 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 652: // delete channel { - if (IS_QUERY) { - [item setTitle:TXTLS(@"DELETE_QUERY_MENU_ITEM")]; + if (_isQuery) { + [item setTitle:TXTLS(@"DeleteQueryMenuItem")]; return YES; } else { - [item setTitle:TXTLS(@"DELETE_CHANNEL_MENU_ITEM")]; + [item setTitle:TXTLS(@"DeleteChannelMenuItem")]; - return IS_CHANNEL; + return _isChannel; } break; @@ -253,7 +253,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 2005: // invite { - if (NOT_CONNECTED || [self checkSelectedMembers:item] == NO) return NO; + if (_notConnected || [self checkSelectedMembers:item] == NO) return NO; NSInteger count = 0; @@ -268,16 +268,16 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 5421: // query logs { - if (IS_QUERY) { + if (_isQuery) { [item setHidden:NO]; - [[[item menu] itemWithTag:935] setHidden:YES]; + [[item.menu itemWithTag:935] setHidden:YES]; - return [Preferences logTranscript]; + return [TPCPreferences logTranscript]; } else { [item setHidden:YES]; - [[[item menu] itemWithTag:935] setHidden:NO]; + [[item.menu itemWithTag:935] setHidden:NO]; return NO; } @@ -290,49 +290,51 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL) return YES; + if (_noClientOrChannel) return YES; - switch ([Preferences cmdWResponseType]) { - case CMDWKEY_SHORTCUT_CLOSE: + switch ([TPCPreferences cmdWResponseType]) { + case TXCmdWShortcutCloseWindowType: { - [item setTitle:TXTLS(@"CMDWKEY_SHORTCUT_CLOSE_WINDOW")]; + [item setTitle:TXTLS(@"CmdWShortcutCloseWindowType")]; + break; } - case CMDWKEY_SHORTCUT_PARTC: + case TXCmdWShortcutPartChannelType: { - if (IS_CLIENT) { - [item setTitle:TXTLS(@"CMDWKEY_SHORTCUT_CLOSE_WINDOW")]; + if (_isClient) { + [item setTitle:TXTLS(@"CmdWShortcutCloseWindowType")]; + return NO; } else { - if (IS_CHANNEL) { - [item setTitle:TXTLS(@"CMDWKEY_SHORTCUT_PART_CHANNEL")]; + if (_isChannel) { + [item setTitle:TXTLS(@"CmdWShortcutLeaveChannelType")]; - if (NOT_ACTIVE) { + if (_notActive) { return NO; } } else { - [item setTitle:TXTLS(@"CMDWKEY_SHORTCUT_LEAVE_QUERY")]; + [item setTitle:TXTLS(@"CmdWShortcutCloseQueryType")]; } } break; } - case CMDWKEY_SHORTCUT_DISCT: + case TXCmdWShortcutDisconnectType: { - [item setTitle:TXTFLS(@"CMDWKEY_SHORTCUT_DISCONNECT", ((u.config.server) ?: u.config.name))]; + [item setTitle:TXTFLS(@"CmdWShortcutDisconnectServerType", ((u.config.server) ?: u.config.name))]; - if (NOT_CONNECTED) return NO; + if (_notConnected) return NO; break; } - case CMDWKEY_SHORTCUT_QUITA: + case TXCmdWShortcutTerminateType: { - [item setTitle:TXTLS(@"CMDWKEY_SHORTCUT_QUIT_APPLICATION")]; + [item setTitle:TXTLS(@"CmdWShortcutQuitApplicationType")]; break; } } } else { - [item setTitle:TXTLS(@"CMDWKEY_SHORTCUT_CLOSE_WINDOW")]; + [item setTitle:TXTLS(@"CmdWShortcutCloseWindowType")]; } return YES; @@ -340,12 +342,12 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 593: // Highlights { - return ([Preferences logAllHighlightsToQuery] && CONNECTED); + return ([TPCPreferences logAllHighlightsToQuery] && _connected); break; } case 54092: // Developer Mode { - if ([_NSUserDefaults() boolForKey:DeveloperEnvironmentToken] == YES) { + if ([_NSUserDefaults() boolForKey:TXDeveloperEnvironmentToken] == YES) { [item setState:NSOnState]; } else { [item setState:NSOffState]; @@ -413,7 +415,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item #pragma mark - #pragma mark Utilities -- (LogView *)currentWebView +- (TVCLogView *)currentWebView { return self.world.selected.log.view; } @@ -430,7 +432,7 @@ - (NSArray *)selectedMembers:(NSMenuItem *)sender NSMutableArray *ary = [NSMutableArray array]; - if (NO_CLIENT_OR_CHANNEL || NOT_ACTIVE || NOT_CONNECTED || IS_CLIENT) { + if (_noClientOrChannel || _notActive || _notConnected || _isClient) { return ary; } else { NSIndexSet *indexes = [self.memberList selectedRowIndexes]; @@ -473,14 +475,14 @@ - (void)deselectMembers:(NSMenuItem *)sender - (void)_onWantFindPanel:(id)sender { - NSString *newPhrase = [PopupPrompts dialogWindowWithInput:TXTLS(@"FIND_SEARCH_PHRASE_PROPMT_MESSAGE") - title:TXTLS(@"FIND_SEARCH_PRHASE_PROMPT_TITLE") - defaultButton:TXTLS(@"FIND_SEARCH_PHRASE_PROMPT_BUTTON") - alternateButton:TXTLS(@"CANCEL_BUTTON") + NSString *newPhrase = [TLOPopupPrompts dialogWindowWithInput:TXTLS(@"FindSearchPanelPromptMessage") + title:TXTLS(@"FindSearchPanelPromptTitle") + defaultButton:TXTLS(@"FindSearchPanelPromptButton") + alternateButton:TXTLS(@"CancelButton") defaultInput:self.currentSearchPhrase]; if (NSObjectIsEmpty(newPhrase)) { - self.currentSearchPhrase = NSNullObject; + self.currentSearchPhrase = NSStringEmptyPlaceholder; } else { if ([newPhrase isNotEqualTo:self.currentSearchPhrase]) { self.currentSearchPhrase = newPhrase; @@ -490,7 +492,7 @@ - (void)_onWantFindPanel:(id)sender [[[self iomt] currentWebView] searchFor:self.currentSearchPhrase direction:YES caseSensitive:NO wrap:YES]; } -- (void)onWantFindPanel:(id)sender +- (void)showFindPanel:(id)sender { if ([sender tag] == 1 || NSObjectIsEmpty(self.currentSearchPhrase)) { [[self invokeInBackgroundThread] _onWantFindPanel:sender]; @@ -511,37 +513,39 @@ - (void)commandWShortcutUsed:(id)sender IRCChannel *c = [self.world selectedChannel]; if ([self.window isKeyWindow]) { - switch ([Preferences cmdWResponseType]) { - case CMDWKEY_SHORTCUT_CLOSE: + switch ([TPCPreferences cmdWResponseType]) { + case TXCmdWShortcutCloseWindowType: { [self.window close]; + break; } - case CMDWKEY_SHORTCUT_PARTC: + case TXCmdWShortcutPartChannelType: { - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT) return; + if (_noClientOrChannel || _isClient) return; - if (IS_CHANNEL && ACTIVE) { + if (_isChannel && _activate) { [u partChannel:c]; } else { - if (IS_QUERY) { + if (_isQuery) { [self.world destroyChannel:c]; } } break; } - case CMDWKEY_SHORTCUT_DISCT: + case TXCmdWShortcutDisconnectType: { - if (NO_CLIENT || NOT_CONNECTED) return; + if (_noClient || _notConnected) return; [u quit]; break; } - case CMDWKEY_SHORTCUT_QUITA: + case TXCmdWShortcutTerminateType: { [NSApp terminate:nil]; + break; } } @@ -550,7 +554,7 @@ - (void)commandWShortcutUsed:(id)sender } } -- (void)onPreferences:(id)sender +- (void)showPreferencesDialog:(id)sender { if (self.preferencesController) { [self.preferencesController show]; @@ -558,7 +562,7 @@ - (void)onPreferences:(id)sender return; } - PreferencesController *pc = [PreferencesController alloc]; + TDCPreferencesController *pc = [TDCPreferencesController alloc]; pc.delegate = self; pc.world = self.world; @@ -570,19 +574,19 @@ - (void)onPreferences:(id)sender [self.preferencesController show]; } -- (void)preferencesDialogWillClose:(PreferencesController *)sender +- (void)preferencesDialogWillClose:(TDCPreferencesController *)sender { [self.world preferencesChanged]; self.preferencesController = nil; } -- (void)onCloseWindow:(id)sender +- (void)closeWindow:(id)sender { [[NSApp keyWindow] performClose:nil]; } -- (void)onWantMainWindowCentered:(id)sender; +- (void)centerMainWindow:(id)sender; { [[NSApp mainWindow] exactlyCenterWindow]; } @@ -597,17 +601,17 @@ - (void)onCloseCurrentPanel:(id)sender } } -- (void)onShowAcknowledgments:(id)sender +- (void)showAcknowledgments:(id)sender { - [_NSWorkspace() openURL:[NSURL fileURLWithPath:[[Preferences whereResourcePath] stringByAppendingPathComponent:@"Acknowledgments.pdf"]]]; + [_NSWorkspace() openURL:[NSURL fileURLWithPath:[[TPCPreferences whereResourcePath] stringByAppendingPathComponent:@"Acknowledgments.pdf"]]]; } -- (void)onShowContributors:(id)sender +- (void)showContributors:(id)sender { - [_NSWorkspace() openURL:[NSURL fileURLWithPath:[[Preferences whereResourcePath] stringByAppendingPathComponent:@"Contributors.pdf"]]]; + [_NSWorkspace() openURL:[NSURL fileURLWithPath:[[TPCPreferences whereResourcePath] stringByAppendingPathComponent:@"Contributors.pdf"]]]; } -- (void)onPaste:(id)sender +- (void)performPaste:(id)sender { NSWindow *win = [NSApp keyWindow]; if (PointerIsEmpty(win)) return; @@ -646,9 +650,9 @@ - (void)onPaste:(id)sender } } -- (void)onSearchWeb:(id)sender +- (void)searchGoogle:(id)sender { - LogView *web = [self currentWebView]; + TVCLogView *web = [self currentWebView]; if (PointerIsEmpty(web)) return; NSString *s = [web selection]; @@ -658,11 +662,11 @@ - (void)onSearchWeb:(id)sender NSString *urlStr = [NSString stringWithFormat:@"http://www.google.com/search?ie=UTF-8&q=%@", s]; - [URLOpener open:[NSURL URLWithString:urlStr]]; + [TLOpenLink open:[NSURL URLWithString:urlStr]]; } } -- (void)onCopyLogAsHtml:(id)sender +- (void)copyLogAsHtml:(id)sender { IRCTreeItem *sel = self.world.selected; @@ -671,7 +675,7 @@ - (void)onCopyLogAsHtml:(id)sender [_NSPasteboard() setStringContent:[sel.log.view contentString]]; } -- (void)onMarkScrollback:(id)sender +- (void)markScrollback:(id)sender { IRCTreeItem *sel = self.world.selected; @@ -680,7 +684,7 @@ - (void)onMarkScrollback:(id)sender [sel.log unmark]; [sel.log mark]; } -- (void)onGotoScrollbackMark:(id)sender; +- (void)gotoScrollbackMarker:(id)sender; { IRCTreeItem *sel = self.world.selected; @@ -689,7 +693,7 @@ - (void)onGotoScrollbackMark:(id)sender; [sel.log goToMark]; } -- (void)onClearScrollback:(id)sender +- (void)clearScrollback:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; @@ -713,60 +717,60 @@ - (void)onClearScrollback:(id)sender } } -- (void)onIncreaseFontSize:(id)sender +- (void)increaseLogFontSize:(id)sender { [self.world changeTextSize:YES]; } -- (void)onDecreaseFontSize:(id)sender +- (void)decreaseLogFontSize:(id)sender { [self.world changeTextSize:NO]; } -- (void)onMarkAllAsRead:(id)sender +- (void)markAllAsRead:(id)sender { [self.world markAllAsRead]; } -- (void)onConnect:(id)sender +- (void)connect:(id)sender { IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT || CONNECTED) return; + if (_noClient || _connected) return; [u connect]; [self.world expandClient:u]; } -- (void)onDisconnect:(id)sender +- (void)disconnect:(id)sender { IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT || NOT_CONNECTED) return; + if (_noClient || _notConnected) return; [u quit]; [u cancelReconnect]; } -- (void)onCancelReconnecting:(id)sender +- (void)cancelReconnection:(id)sender { IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT) return; + if (_noClient) return; [u cancelReconnect]; } -- (void)onNick:(id)sender +- (void)showNicknameChangeDialog:(id)sender { if (self.nickSheet) return; IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT || NOT_CONNECTED) return; + if (_noClient || _notConnected) return; - self.nickSheet = [NickSheet new]; + self.nickSheet = [TDCNickSheet new]; self.nickSheet.delegate = self; self.nickSheet.window = self.window; self.nickSheet.uid = u.uid; @@ -774,51 +778,51 @@ - (void)onNick:(id)sender [self.nickSheet start:u.myNick]; } -- (void)nickSheet:(NickSheet *)sender didInputNick:(NSString *)newNick +- (void)nickSheet:(TDCNickSheet *)sender didInputNick:(NSString *)newNick { IRCClient *u = [self.world findClientById:sender.uid]; - if (NO_CLIENT || NOT_CONNECTED) return; + if (_noClient || _notConnected) return; [u changeNick:newNick]; } -- (void)nickSheetWillClose:(NickSheet *)sender +- (void)nickSheetWillClose:(TDCNickSheet *)sender { self.nickSheet = nil; } -- (void)onChannelList:(id)sender +- (void)showServerChannelList:(id)sender { IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT || NOT_CONNECTED) return; + if (_noClient || _notConnected) return; [u createChannelListDialog]; - [u send:IRCCI_LIST, nil]; + [u send:IRCCommandIndexList, nil]; } -- (void)onAddServer:(id)sender +- (void)addServer:(id)sender { if (self.serverSheet) return; - ServerSheet *d = [ServerSheet new]; + TDCServerSheet *d = [TDCServerSheet new]; d.delegate = self; d.window = self.window; d.config = [[IRCClientConfig alloc] init]; d.uid = -1; - [d startWithIgnoreTab:NSNullObject]; + [d startWithIgnoreTab:NSStringEmptyPlaceholder]; self.serverSheet = d; } -- (void)onCopyServer:(id)sender +- (void)copyServer:(id)sender { IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT) return; + if (_noClient) return; IRCClientConfig *config = u.storedConfig; @@ -835,16 +839,16 @@ - (void)onCopyServer:(id)sender } } -- (void)onDeleteServer:(id)sender +- (void)deleteServer:(id)sender { IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT || CONNECTED) return; + if (_noClient || _connected) return; - BOOL result = [PopupPrompts dialogWindowWithQuestion:TXTLS(@"WANT_SERVER_DELETE_MESSAGE") - title:TXTLS(@"WANT_SERVER_DELETE_TITLE") - defaultButton:TXTLS(@"OK_BUTTON") - alternateButton:TXTLS(@"CANCEL_BUTTON") + BOOL result = [TLOPopupPrompts dialogWindowWithQuestion:TXTLS(@"ServerDeletePromptMessage") + title:TXTLS(@"ServerDeletePromptTitle") + defaultButton:TXTLS(@"OkButton") + alternateButton:TXTLS(@"CancelButton") otherButton:nil suppressionKey:@"delete_server" suppressionText:nil]; @@ -863,10 +867,10 @@ - (void)onDeleteServer:(id)sender - (void)showServerPropertyDialog:(IRCClient *)u ignore:(NSString *)imask { - if (NO_CLIENT) return; + if (_noClient) return; if (self.serverSheet) return; - ServerSheet *d = [ServerSheet new]; + TDCServerSheet *d = [TDCServerSheet new]; d.delegate = self; d.window = self.window; @@ -879,19 +883,19 @@ - (void)showServerPropertyDialog:(IRCClient *)u ignore:(NSString *)imask self.serverSheet = d; } -- (void)onServerProperties:(id)sender +- (void)showServerPropertiesDialog:(id)sender { - [self showServerPropertyDialog:[self.world selectedClient] ignore:NSNullObject]; + [self showServerPropertyDialog:[self.world selectedClient] ignore:NSStringEmptyPlaceholder]; } -- (void)ServerSheetOnOK:(ServerSheet *)sender +- (void)serverSheetOnOK:(TDCServerSheet *)sender { if (sender.uid < 0) { [self.world createClient:sender.config reload:YES]; } else { IRCClient *u = [self.world findClientById:sender.uid]; - if (NO_CLIENT) return; + if (_noClient) return; [u updateConfig:sender.config]; } @@ -899,29 +903,29 @@ - (void)ServerSheetOnOK:(ServerSheet *)sender [self.world save]; } -- (void)ServerSheetWillClose:(ServerSheet *)sender +- (void)serverSheetWillClose:(TDCServerSheet *)sender { self.serverSheet = nil; } -- (void)onJoin:(id)sender +- (void)joinChannel:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY || ACTIVE || NOT_CONNECTED) return; + if (_noClientOrChannel || _isClient || _isQuery || _activate || _notConnected) return; [u joinChannel:c]; } -- (void)onLeave:(id)sender +- (void)leaveChannel:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || NOT_ACTIVE || NOT_CONNECTED) return; + if (_noClientOrChannel || _notActive || _notConnected) return; - if (IS_CHANNEL) { + if (_isChannel) { [u partChannel:c]; } else { [self.world destroyChannel:c]; @@ -934,9 +938,9 @@ - (void)showHighlightSheet:(id)sender IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT) return; + if (_noClient) return; - HighlightSheet *d = [HighlightSheet new]; + TDCHighlightSheet *d = [TDCHighlightSheet new]; d.delegate = self; d.window = self.window; @@ -949,21 +953,21 @@ - (void)showHighlightSheet:(id)sender self.highlightSheet = d; } -- (void)highlightSheetWillClose:(HighlightSheet *)sender +- (void)highlightSheetWillClose:(TDCHighlightSheet *)sender { self.highlightSheet = nil; } -- (void)onTopic:(id)sender +- (void)showChannelTopicDialog:(id)sender { if (self.topicSheet) return; IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; - TopicSheet *t = [TopicSheet new]; + TDCTopicSheet *t = [TDCTopicSheet new]; t.delegate = self; t.window = self.window; @@ -975,33 +979,33 @@ - (void)onTopic:(id)sender self.topicSheet = t; } -- (void)topicSheet:(TopicSheet *)sender onOK:(NSString *)topic +- (void)topicSheet:(TDCTopicSheet *)sender onOK:(NSString *)topic { IRCChannel *c = [self.world findChannelByClientId:sender.uid channelId:sender.cid]; IRCClient *u = c.client; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; if ([u encryptOutgoingMessage:&topic channel:c] == YES) { - [u send:IRCCI_TOPIC, c.name, topic, nil]; + [u send:IRCCommandIndexTopic, c.name, topic, nil]; } } -- (void)topicSheetWillClose:(TopicSheet *)sender +- (void)topicSheetWillClose:(TDCTopicSheet *)sender { self.topicSheet = nil; } -- (void)onMode:(id)sender +- (void)showChannelModeDialog:(id)sender { if (self.modeSheet) return; IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; - ModeSheet *m = [ModeSheet new]; + TDCModeSheet *m = [TDCModeSheet new]; m.delegate = self; m.window = self.window; @@ -1015,34 +1019,34 @@ - (void)onMode:(id)sender self.modeSheet = m; } -- (void)modeSheetOnOK:(ModeSheet *)sender +- (void)modeSheetOnOK:(TDCModeSheet *)sender { IRCChannel *c = [self.world findChannelByClientId:sender.uid channelId:sender.cid]; IRCClient *u = c.client; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; NSString *changeStr = [c.mode getChangeCommand:sender.mode]; if (NSObjectIsNotEmpty(changeStr)) { - [u sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCI_MODE, c.name, changeStr]]; + [u sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCommandIndexMode, c.name, changeStr]]; } } -- (void)modeSheetWillClose:(ModeSheet *)sender +- (void)modeSheetWillClose:(TDCModeSheet *)sender { self.modeSheet = nil; } -- (void)onAddChannel:(id)sender +- (void)addChannel:(id)sender { if (self.channelSheet) return; IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT) return; + if (_noClient) return; - ChannelSheet *d = [ChannelSheet new]; + TDChannelSheet *d = [TDChannelSheet new]; d.delegate = self; d.window = self.window; @@ -1055,17 +1059,17 @@ - (void)onAddChannel:(id)sender self.channelSheet = d; } -- (void)onDeleteChannel:(id)sender +- (void)deleteChannel:(id)sender { IRCChannel *c = [self.world selectedChannel]; - if (NO_CHANNEL || IS_CLIENT) return; + if (_noChannel || _isClient) return; - if (IS_CHANNEL) { - BOOL result = [PopupPrompts dialogWindowWithQuestion:TXTLS(@"WANT_CHANNEL_DELETE_MESSAGE") - title:TXTLS(@"WANT_CHANNEL_DELETE_TITLE") - defaultButton:TXTLS(@"OK_BUTTON") - alternateButton:TXTLS(@"CANCEL_BUTTON") + if (_isChannel) { + BOOL result = [TLOPopupPrompts dialogWindowWithQuestion:TXTLS(@"ChannelDeletePromptMessage") + title:TXTLS(@"ChannelDeletePromptTitle") + defaultButton:TXTLS(@"OkButton") + alternateButton:TXTLS(@"CancelButton") otherButton:nil suppressionKey:@"delete_channel" suppressionText:nil]; @@ -1079,16 +1083,16 @@ - (void)onDeleteChannel:(id)sender [self.world save]; } -- (void)onChannelProperties:(id)sender +- (void)showChannelPropertiesDialog:(id)sender { if (self.channelSheet) return; IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; - ChannelSheet *d = [ChannelSheet new]; + TDChannelSheet *d = [TDChannelSheet new]; d.delegate = self; d.window = self.window; @@ -1101,27 +1105,33 @@ - (void)onChannelProperties:(id)sender self.channelSheet = d; } -- (void)ChannelSheetOnOK:(ChannelSheet *)sender +- (void)channelSheetOnOK:(TDChannelSheet *)sender { if (sender.cid < 0) { IRCClient *u = [self.world findClientById:sender.uid]; - if (NO_CLIENT) return; + if (_noClient) return; [self.world createChannel:sender.config client:u reload:YES adjust:YES]; [self.world expandClient:u]; } else { IRCChannel *c = [self.world findChannelByClientId:sender.uid channelId:sender.cid]; - if (NO_CHANNEL) return; + if (_noChannel) return; - if (NSObjectIsEmpty(c.config.encryptionKey) && NSObjectIsNotEmpty(sender.config.encryptionKey)) { - [c.client printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_STARTED") channel:c]; - } else if (NSObjectIsNotEmpty(c.config.encryptionKey) && NSObjectIsEmpty(sender.config.encryptionKey)) { - [c.client printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_STOPPED") channel:c]; - } else if (NSObjectIsNotEmpty(c.config.encryptionKey) && NSObjectIsNotEmpty(sender.config.encryptionKey)) { + if (NSObjectIsEmpty(c.config.encryptionKey) && + NSObjectIsNotEmpty(sender.config.encryptionKey)) { + + [c.client printDebugInformation:TXTLS(@"BlowfishEncryptionStarted") channel:c]; + } else if (NSObjectIsNotEmpty(c.config.encryptionKey) && + NSObjectIsEmpty(sender.config.encryptionKey)) { + + [c.client printDebugInformation:TXTLS(@"BlowfishEncryptionStopped") channel:c]; + } else if (NSObjectIsNotEmpty(c.config.encryptionKey) && + NSObjectIsNotEmpty(sender.config.encryptionKey)) { + if ([c.config.encryptionKey isEqualToString:sender.config.encryptionKey] == NO) { - [c.client printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_KEY_CHANGED") channel:c]; + [c.client printDebugInformation:TXTLS(@"BlowfishEncryptionKeyChanged") channel:c]; } } @@ -1131,7 +1141,7 @@ - (void)ChannelSheetOnOK:(ChannelSheet *)sender [self.world save]; } -- (void)ChannelSheetWillClose:(ChannelSheet *)sender +- (void)channelSheetWillClose:(TDChannelSheet *)sender { self.channelSheet = nil; } @@ -1141,7 +1151,7 @@ - (void)whoisSelectedMembers:(id)sender deselect:(BOOL)deselect IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { [u sendWhois:m.nick]; @@ -1154,7 +1164,7 @@ - (void)whoisSelectedMembers:(id)sender deselect:(BOOL)deselect - (void)memberListDoubleClicked:(id)sender { - MemberList *view = sender; + TVCMemberList *view = sender; NSPoint pt; NSInteger n; @@ -1169,29 +1179,29 @@ - (void)memberListDoubleClicked:(id)sender [view selectItemAtIndex:n]; } - switch ([Preferences userDoubleClickOption]) { - case USERDC_ACTION_WHOIS: [self whoisSelectedMembers:nil deselect:NO]; break; - case USERDC_ACTION_QUERY: [self onMemberTalk:nil]; break; + switch ([TPCPreferences userDoubleClickOption]) { + case TXUserDoubleClickWhoisAction: [self whoisSelectedMembers:nil deselect:NO]; break; + case TXUserDoubleClickQueryAction: [self memberStartQuery:nil]; break; } } } -- (void)onMemberWhois:(id)sender +- (void)memberSendWhois:(id)sender { [self whoisSelectedMembers:sender deselect:YES]; } -- (void)onMemberTalk:(id)sender +- (void)memberStartQuery:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { IRCChannel *c = [u findChannel:m.nick]; - if (NO_CHANNEL) { + if (_noChannel) { c = [self.world createTalk:m.nick client:u]; } @@ -1201,14 +1211,14 @@ - (void)onMemberTalk:(id)sender [self deselectMembers:sender]; } -- (void)onMemberInvite:(id)sender +- (void)memberSendInvite:(id)sender { if (self.inviteSheet) return; IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || NOT_CONNECTED) return; + if (_noClientOrChannel || _notConnected) return; NSMutableArray *nicks = [NSMutableArray array]; NSMutableArray *channels = [NSMutableArray array]; @@ -1225,7 +1235,7 @@ - (void)onMemberInvite:(id)sender if (NSObjectIsEmpty(channels)) return; - self.inviteSheet = [InviteSheet new]; + self.inviteSheet = [TDCInviteSheet new]; self.inviteSheet.delegate = self; self.inviteSheet.window = self.window; self.inviteSheet.nicks = nicks; @@ -1234,28 +1244,28 @@ - (void)onMemberInvite:(id)sender [self.inviteSheet startWithChannels:channels]; } -- (void)inviteSheet:(InviteSheet *)sender onSelectChannel:(NSString *)channelName +- (void)inviteSheet:(TDCInviteSheet *)sender onSelectChannel:(NSString *)channelName { IRCClient *u = [self.world findClientById:sender.uid]; if (u && NSObjectIsNotEmpty(channelName)) { for (NSString *nick in sender.nicks) { - [u send:IRCCI_INVITE, nick, channelName, nil]; + [u send:IRCCommandIndexInvite, nick, channelName, nil]; } } } -- (void)inviteSheetWillClose:(InviteSheet *)sender +- (void)inviteSheetWillClose:(TDCInviteSheet *)sender { self.inviteSheet = nil; } -- (void)onMemberPing:(id)sender +- (void)memberSendCTCPPing:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { [u sendCTCPPing:m.nick]; @@ -1264,63 +1274,63 @@ - (void)onMemberPing:(id)sender [self deselectMembers:sender]; } -- (void)onMemberTime:(id)sender +- (void)memberSendCTCPTime:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { - [u sendCTCPQuery:m.nick command:IRCCI_TIME text:nil]; + [u sendCTCPQuery:m.nick command:IRCCommandIndexTime text:nil]; } [self deselectMembers:sender]; } -- (void)onMemberVersion:(id)sender +- (void)memberSendCTCPVersion:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { - [u sendCTCPQuery:m.nick command:IRCCI_VERSION text:nil]; + [u sendCTCPQuery:m.nick command:IRCCommandIndexVersion text:nil]; } [self deselectMembers:sender]; } -- (void)onMemberUserInfo:(id)sender +- (void)memberSendCTCPUserinfo:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { - [u sendCTCPQuery:m.nick command:IRCCI_USERINFO text:nil]; + [u sendCTCPQuery:m.nick command:IRCCommandIndexUserinfo text:nil]; } [self deselectMembers:sender]; } -- (void)onMemberClientInfo:(id)sender +- (void)memberSendCTCPClientInfo:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { - [u sendCTCPQuery:m.nick command:IRCCI_CLIENTINFO text:nil]; + [u sendCTCPQuery:m.nick command:IRCCommandIndexClientinfo text:nil]; } [self deselectMembers:sender]; } -- (void)onCopyUrl:(id)sender +- (void)copyUrl:(id)sender { if (NSObjectIsNotEmpty(self.pointedUrl)) { [_NSPasteboard() setStringContent:self.pointedUrl]; @@ -1329,11 +1339,11 @@ - (void)onCopyUrl:(id)sender } } -- (void)onJoinChannel:(id)sender +- (void)joinClickedChannel:(id)sender { IRCClient *u = [self.world selectedClient]; - if (NO_CLIENT || NOT_CONNECTED) return; + if (_noClient || _notConnected) return; if (NSObjectIsNotEmpty(self.pointedChannelName)) { [u joinUnlistedChannel:self.pointedChannelName]; @@ -1342,24 +1352,24 @@ - (void)onJoinChannel:(id)sender } } -- (void)onWantIgnoreListShown:(id)sender +- (void)showChannelIgnoreList:(id)sender { [self showServerPropertyDialog:[self.world selectedClient] ignore:@"-"]; } -- (void)onWantAboutWindowShown:(id)sender +- (void)showAboutWindow:(id)sender { if (self.aboutPanel) { [self.aboutPanel show]; return; } - self.aboutPanel = [AboutPanel new]; + self.aboutPanel = [TDCAboutPanel new]; self.aboutPanel.delegate = self; [self.aboutPanel show]; } -- (void)aboutPanelWillClose:(AboutPanel *)sender +- (void)aboutPanelWillClose:(TDCAboutPanel *)sender { self.aboutPanel = nil; } @@ -1369,9 +1379,9 @@ - (void)processModeChange:(id)sender mode:(NSString *)tmode IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; - NSString *opString = NSNullObject; + NSString *opString = NSStringEmptyPlaceholder; NSInteger currentIndex = 0; @@ -1380,10 +1390,10 @@ - (void)processModeChange:(id)sender mode:(NSString *)tmode currentIndex++; - if (currentIndex == MAXIMUM_SETS_PER_MODE) { + if (currentIndex == TXMaximumNodesPerModeCommand) { [u sendCommand:[NSString stringWithFormat:@"%@ %@", tmode, opString] completeTarget:YES target:c.name]; - opString = NSNullObject; + opString = NSStringEmptyPlaceholder; currentIndex = 0; } @@ -1396,42 +1406,42 @@ - (void)processModeChange:(id)sender mode:(NSString *)tmode [self deselectMembers:sender]; } -- (void)onMemberOp:(id)sender +- (void)memberModeChangeOp:(id)sender { [self processModeChange:sender mode:@"OP"]; } -- (void)onMemberDeOp:(id)sender +- (void)memberModeChangeDeop:(id)sender { [self processModeChange:sender mode:@"DEOP"]; } -- (void)onMemberHalfOp:(id)sender +- (void)memberModeChangeHalfop:(id)sender { [self processModeChange:sender mode:@"HALFOP"]; } -- (void)onMemberDeHalfOp:(id)sender +- (void)memberModeChangeDehalfop:(id)sender { [self processModeChange:sender mode:@"DEHALFOP"]; } -- (void)onMemberVoice:(id)sender +- (void)memberModeChangeVoice:(id)sender { [self processModeChange:sender mode:@"VOICE"]; } -- (void)onMemberDeVoice:(id)sender +- (void)memberModeChangeDevoice:(id)sender { [self processModeChange:sender mode:@"DEVOICE"]; } -- (void)onMemberKick:(id)sender +- (void)memberKickFromChannel:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; for (IRCUser *m in [self selectedMembers:sender]) { [u kick:c target:m.nick]; @@ -1440,12 +1450,12 @@ - (void)onMemberKick:(id)sender [self deselectMembers:sender]; } -- (void)onMemberBan:(id)sender +- (void)memberBanFromServer:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; for (IRCUser *m in [self selectedMembers:sender]) { [u sendCommand:[NSString stringWithFormat:@"BAN %@", m.nick] completeTarget:YES target:c.name]; @@ -1454,77 +1464,77 @@ - (void)onMemberBan:(id)sender [self deselectMembers:sender]; } -- (void)onMemberBanKick:(id)sender +- (void)memberKickbanFromChannel:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noClientOrChannel || _isClient || _isQuery) return; for (IRCUser *m in [self selectedMembers:sender]) { - [u sendCommand:[NSString stringWithFormat:@"KICKBAN %@ %@", m.nick, [Preferences defaultKickMessage]] + [u sendCommand:[NSString stringWithFormat:@"KICKBAN %@ %@", m.nick, [TPCPreferences defaultKickMessage]] completeTarget:YES target:c.name]; } [self deselectMembers:sender]; } -- (void)onMemberKill:(id)sender +- (void)memberKillFromServer:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT) return; + if (_noClientOrChannel || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { - [u sendCommand:[NSString stringWithFormat:@"KILL %@ %@", m.nick, [Preferences IRCopDefaultKillMessage]]]; + [u sendCommand:[NSString stringWithFormat:@"KILL %@ %@", m.nick, [TPCPreferences IRCopDefaultKillMessage]]]; } [self deselectMembers:sender]; } -- (void)onMemberGline:(id)sender +- (void)memberGlineFromServer:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT) return; + if (_noClientOrChannel || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { if ([m.nick isEqualNoCase:u.myNick]) { - [u printDebugInformation:TXTFLS(@"SELF_BAN_DETECTED_MESSAGE", u.serverHostname) channel:c]; + [u printDebugInformation:TXTFLS(@"SelfBanDetectedMessage", u.serverHostname) channel:c]; } else { - [u sendCommand:[NSString stringWithFormat:@"GLINE %@ %@", m.nick, [Preferences IRCopDefaultGlineMessage]]]; + [u sendCommand:[NSString stringWithFormat:@"GLINE %@ %@", m.nick, [TPCPreferences IRCopDefaultGlineMessage]]]; } } [self deselectMembers:sender]; } -- (void)onMemberShun:(id)sender +- (void)memberShunFromServer:(id)sender { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT) return; + if (_noClientOrChannel || _isClient) return; for (IRCUser *m in [self selectedMembers:sender]) { - [u sendCommand:[NSString stringWithFormat:@"SHUN %@ %@", m.nick, [Preferences IRCopDefaultShunMessage]]]; + [u sendCommand:[NSString stringWithFormat:@"SHUN %@ %@", m.nick, [TPCPreferences IRCopDefaultShunMessage]]]; } [self deselectMembers:sender]; } -- (void)onWantToReadTextualLogs:(id)sender +- (void)openLogLocation:(id)sender { - NSString *path = [Preferences transcriptFolder]; + NSString *path = [TPCPreferences transcriptFolder]; if ([_NSFileManager() fileExistsAtPath:path]) { [_NSWorkspace() openURL:[NSURL fileURLWithPath:path]]; } else { - [PopupPrompts dialogWindowWithQuestion:TXTLS(@"LOG_PATH_DOESNT_EXIST_MESSAGE") - title:TXTLS(@"LOG_PATH_DOESNT_EXIST_TITLE") - defaultButton:TXTLS(@"OK_BUTTON") + [TLOPopupPrompts dialogWindowWithQuestion:TXTLS(@"LogPathDoesNotExistMessage") + title:TXTLS(@"LogPathDoesNotExistTitle") + defaultButton:TXTLS(@"OkButton") alternateButton:nil otherButton:nil suppressionKey:nil @@ -1532,21 +1542,21 @@ - (void)onWantToReadTextualLogs:(id)sender } } -- (void)onWantToReadChannelLogs:(id)sender; +- (void)openChannelLogs:(id)sender; { IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT_OR_CHANNEL || IS_CLIENT) return; + if (_noClientOrChannel || _isClient) return; NSString *path = [c.logFile buildPath]; if ([_NSFileManager() fileExistsAtPath:path]) { [_NSWorkspace() openURL:[NSURL fileURLWithPath:path]]; } else { - [PopupPrompts dialogWindowWithQuestion:TXTLS(@"LOG_PATH_DOESNT_EXIST_MESSAGE") - title:TXTLS(@"LOG_PATH_DOESNT_EXIST_TITLE") - defaultButton:TXTLS(@"OK_BUTTON") + [TLOPopupPrompts dialogWindowWithQuestion:TXTLS(@"LogPathDoesNotExistMessage") + title:TXTLS(@"LogPathDoesNotExistTitle") + defaultButton:TXTLS(@"OkButton") alternateButton:nil otherButton:nil suppressionKey:nil @@ -1554,7 +1564,7 @@ - (void)onWantToReadChannelLogs:(id)sender; } } -- (void)onWantTextualConnnectToHelp:(id)sender +- (void)connectToTextualHelpChannel:(id)sender { [self.world createConnection:@"chat.freenode.net +6697" chan:@"#textual"]; } @@ -1565,7 +1575,7 @@ - (void)__onWantHostServVhostSet:(id)sender andVhost:(NSString *)vhost IRCClient *u = [self.world selectedClient]; IRCChannel *c = [self.world selectedChannel]; - if (NO_CLIENT || IS_CLIENT) return; + if (_noClient || _isClient) return; NSArray *nicknames = [self selectedMembers:sender]; @@ -1579,48 +1589,48 @@ - (void)__onWantHostServVhostSet:(id)sender andVhost:(NSString *)vhost - (void)_onWantHostServVhostSet:(id)sender { - NSString *vhost = [PopupPrompts dialogWindowWithInput:TXTLS(@"SET_USER_VHOST_PROMPT_MESSAGE") - title:TXTLS(@"SET_USER_VHOST_PROMPT_TITLE") - defaultButton:TXTLS(@"OK_BUTTON") - alternateButton:TXTLS(@"CANCEL_BUTTON") + NSString *vhost = [TLOPopupPrompts dialogWindowWithInput:TXTLS(@"SetUserVhostPromptMessage") + title:TXTLS(@"SetUserVhostPromptTitle") + defaultButton:TXTLS(@"OkButton") + alternateButton:TXTLS(@"CancelButton") defaultInput:nil]; [[self iomt] __onWantHostServVhostSet:sender andVhost:vhost]; } -- (void)onWantHostServVhostSet:(id)sender +- (void)showSetVhostPrompt:(id)sender { [[self invokeInBackgroundThread] _onWantHostServVhostSet:sender]; } -- (void)onWantChannelBanList:(id)sender +- (void)showChannelBanList:(id)sender { IRCChannel *c = [self.world selectedChannel]; - if (NO_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noChannel || _isClient || _isQuery) return; [[self.world selectedClient] createChanBanListDialog]; - [[self.world selectedClient] send:IRCCI_MODE, [c name], @"+b", nil]; + [[self.world selectedClient] send:IRCCommandIndexMode, [c name], @"+b", nil]; } -- (void)onWantChannelBanExceptionList:(id)sender +- (void)showChannelBanExceptionList:(id)sender { IRCChannel *c = [self.world selectedChannel]; - if (NO_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noChannel || _isClient || _isQuery) return; [[self.world selectedClient] createChanBanExceptionListDialog]; - [[self.world selectedClient] send:IRCCI_MODE, [c name], @"+e", nil]; + [[self.world selectedClient] send:IRCCommandIndexMode, [c name], @"+e", nil]; } -- (void)onWantChannelInviteExceptionList:(id)sender +- (void)showChannelInviteExceptionList:(id)sender { IRCChannel *c = [self.world selectedChannel]; - if (NO_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noChannel || _isClient || _isQuery) return; [[self.world selectedClient] createChanInviteExceptionListDialog]; - [[self.world selectedClient] send:IRCCI_MODE, [c name], @"+I", nil]; + [[self.world selectedClient] send:IRCCommandIndexMode, [c name], @"+I", nil]; } - (void)openHelpMenuLinkItem:(id)sender @@ -1654,20 +1664,22 @@ - (void)processNavigationItem:(NSMenuItem *)sender } } -- (void)onWantMainWindowShown:(id)sender +- (void)showMainWindow:(id)sender { [self.window makeKeyAndOrderFront:nil]; } -- (void)wantsFullScreenModeToggled:(id)sender +- (void)toggleFullscreenMode:(id)sender { -#ifdef _MAC_OS_LION_OR_NEWER - if ([Preferences featureAvailableToOSXLion]) { +#ifdef TXMacOSLionOrNewer + if ([TPCPreferences featureAvailableToOSXLion]) { if (self.isInFullScreenMode) { [self.window toggleFullScreen:sender]; + [self.master loadWindowState]; } else { [self.master saveWindowState]; + [self.window toggleFullScreen:sender]; } } else { @@ -1697,14 +1709,14 @@ - (void)wantsFullScreenModeToggled:(id)sender [NSApp setPresentationOptions:NSApplicationPresentationDefault]; } -#ifdef _MAC_OS_LION_OR_NEWER +#ifdef TXMacOSLionOrNewer } #endif self.isInFullScreenMode = BOOLReverseValue(self.isInFullScreenMode); } -- (void)onWantChannelListSorted:(id)sender +- (void)sortChannelListNames:(id)sender { for (IRCClient *u in [self.world clients]) { NSArray *clientChannels = [u.channels sortedArrayUsingFunction:channelDataSort context:nil]; @@ -1721,25 +1733,25 @@ - (void)onWantChannelListSorted:(id)sender [self.world save]; } -- (void)onWantThemeForceReloaded:(id)sender +- (void)forceReloadTheme:(id)sender { - [_NSNotificationCenter() postNotificationName:ThemeStyleDidChangeNotification object:nil userInfo:nil]; + [_NSNotificationCenter() postNotificationName:TXThemePreferenceChangedNotification object:nil userInfo:nil]; } -- (void)onWantChannelModerated:(id)sender +- (void)toggleChannelModerationMode:(id)sender { IRCChannel *c = [self.world selectedChannel]; - if (NO_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noChannel || _isClient || _isQuery) return; [[self.world selectedClient] sendCommand:[NSString stringWithFormat:@"MODE %@ %@", [c name], (([sender tag] == 1) ? @"-m" : @"+m")]]; } -- (void)onWantChannelVoiceOnly:(id)sender +- (void)toggleChannelInviteMode:(id)sender { IRCChannel *c = [self.world selectedChannel]; - if (NO_CHANNEL || IS_CLIENT || IS_QUERY) return; + if (_noChannel || _isClient || _isQuery) return; [[self.world selectedClient] sendCommand:[NSString stringWithFormat:@"MODE %@ %@", [c name], (([sender tag] == 1) ? @"-i" : @"+i")]]; } @@ -1747,11 +1759,11 @@ - (void)onWantChannelVoiceOnly:(id)sender - (void)toggleDeveloperMode:(id)sender { if ([sender state] == NSOnState) { - [_NSUserDefaults() setBool:NO forKey:DeveloperEnvironmentToken]; + [_NSUserDefaults() setBool:NO forKey:TXDeveloperEnvironmentToken]; [sender setState:NSOffState]; } else { - [_NSUserDefaults() setBool:YES forKey:DeveloperEnvironmentToken]; + [_NSUserDefaults() setBool:YES forKey:TXDeveloperEnvironmentToken]; [sender setState:NSOnState]; } diff --git a/Classes/Dialogs/Preferences/SoundWrapper.m b/Classes/Dialogs/Preferences/SoundWrapper.m deleted file mode 100755 index 77363d25ef..0000000000 --- a/Classes/Dialogs/Preferences/SoundWrapper.m +++ /dev/null @@ -1,92 +0,0 @@ -// Created by Satoshi Nakagawa -// You can redistribute it and/or modify it under the new BSD license. -// Converted to ARC Support on Thursday, June 09, 2012 - -@implementation SoundWrapper - -@synthesize eventType; -@synthesize displayName; -@synthesize sound; -@synthesize growl; -@synthesize growlSticky; -@synthesize disableWhileAway; - -- (id)initWithEventType:(NotificationType)aEventType -{ - if ((self = [super init])) { - self.eventType = aEventType; - } - - return self; -} - -+ (SoundWrapper *)soundWrapperWithEventType:(NotificationType)eventType -{ - return [[SoundWrapper alloc] initWithEventType:eventType]; -} - -- (NSString *)displayName -{ - return [Preferences titleForEvent:self.eventType]; -} - -- (NSString *)sound -{ - NSString *soundd = [Preferences soundForEvent:self.eventType]; - - if (NSObjectIsEmpty(soundd)) { - return EMPTY_SOUND; - } else { - return soundd; - } -} - -- (void)setSound:(NSString *)value -{ - if ([value isEqualToString:EMPTY_SOUND]) { - value = NSNullObject; - } - - if (NSObjectIsNotEmpty(value)) { - [SoundPlayer play:value isMuted:NO]; - } - - [Preferences setSound:value forEvent:self.eventType]; -} - -- (BOOL)growl -{ - return [Preferences growlEnabledForEvent:self.eventType]; -} - -- (void)setGrowl:(BOOL)value -{ - [Preferences setGrowlEnabled:value forEvent:self.eventType]; -} - -- (BOOL)growlSticky -{ - return [Preferences growlStickyForEvent:self.eventType]; -} - -- (void)setGrowlSticky:(BOOL)value -{ - [Preferences setGrowlSticky:value forEvent:self.eventType]; -} - -- (BOOL)disableWhileAway -{ - return [Preferences disableWhileAwayForEvent:self.eventType]; -} - -- (void)setDisableWhileAway:(BOOL)value -{ - [Preferences setDisableWhileAway:value forEvent:self.eventType]; -} - -- (NotificationType)eventType -{ - return self.eventType; -} - -@end diff --git a/Classes/Dialogs/Preferences/PreferencesController.m b/Classes/Dialogs/Preferences/TDCPreferencesController.m similarity index 67% rename from Classes/Dialogs/Preferences/PreferencesController.m rename to Classes/Dialogs/Preferences/TDCPreferencesController.m index 2bb57efe47..075247d8e1 100755 --- a/Classes/Dialogs/Preferences/PreferencesController.m +++ b/Classes/Dialogs/Preferences/TDCPreferencesController.m @@ -3,15 +3,15 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define LINES_MIN 100 -#define LINES_MAX 10000 -#define INLINE_IMAGE_MAX 5000 -#define INLINE_IMAGE_MIN 40 +#define _linesMin 100 +#define _linesMax 10000 +#define _inlineImageMax 5000 +#define _inlineImageMin 40 -#define WINDOW_TOOLBAR_HEIGHT 82 -#define ADDONS_TOOLBAR_ITEM_INDEX 8 +#define _TXWindowToolbarHeight 82 +#define _addonsToolbarItemIndex 8 -@interface PreferencesController (Private) +@interface TDCPreferencesController (Private) - (void)updateTheme; - (void)updateAlert; @@ -21,7 +21,7 @@ - (void)firstPane:(NSView *)view selectedItem:(NSInteger)key; - (void)changeItemFont:(NSFontManager *)sender; @end -@implementation PreferencesController +@implementation TDCPreferencesController @synthesize sounds; @synthesize alertsView; @@ -60,10 +60,10 @@ @implementation PreferencesController - (id)initWithWorldController:(IRCWorld *)word { if ((self = [super init])) { - [NSBundle loadNibNamed:@"Preferences" owner:self]; + [NSBundle loadNibNamed:@"TDCPreferences" owner:self]; self.world = word; - self.scriptsController = [ScriptsWrapper new]; + self.scriptsController = [TDCPreferencesScriptWrapper new]; } return self; @@ -81,11 +81,10 @@ - (void)show [self.installedScriptsTable reloadData]; [self updateTheme]; - [self updateAlert]; [self onChangeAlert:nil]; - [self.scriptLocationField setStringValue:[Preferences whereApplicationSupportPath]]; + [self.scriptLocationField setStringValue:[TPCPreferences whereApplicationSupportPath]]; if ([self.window isVisible] == NO) { [self.window center]; @@ -96,6 +95,7 @@ - (void)show [self updateTranscriptFolder]; [self setUpToolbarItemsAndMenus]; [self onHighlightTypeChanged:nil]; + [self firstPane:self.generalView selectedItem:0]; } @@ -113,7 +113,7 @@ - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar - (void)setUpToolbarItemsAndMenus { if (NSObjectIsNotEmpty(self.world.bundlesWithPreferences)) { - for (TextualPluginItem *plugin in self.world.bundlesWithPreferences) { + for (THOTextualPluginItem *plugin in self.world.bundlesWithPreferences) { NSInteger tagIndex = ([self.world.bundlesWithPreferences indexOfObject:plugin] + 20); NSMenuItem *pluginMenu = [NSMenuItem new]; @@ -146,7 +146,7 @@ - (void)onPrefPaneSelected:(id)sender case 11: [self firstPane:self.experimentalSettingsView selectedItem:11]; break; default: { - TextualPluginItem *plugin = [self.world.bundlesWithPreferences safeObjectAtIndex:([sender tag] - 20)]; + THOTextualPluginItem *plugin = [self.world.bundlesWithPreferences safeObjectAtIndex:([sender tag] - 20)]; if (plugin) { NSView *prefsView = [plugin.pluginPrimaryClass preferencesView]; @@ -168,11 +168,13 @@ - (void)firstPane:(NSView *)view selectedItem:(NSInteger)key NSRect windowFrame = [self.window frame]; windowFrame.size.width = [view frame].size.width; - windowFrame.size.height = ([view frame].size.height + WINDOW_TOOLBAR_HEIGHT); - windowFrame.origin.y = NSMaxY([self.window frame]) - ([view frame].size.height + WINDOW_TOOLBAR_HEIGHT); + windowFrame.size.height = ([view frame].size.height + _TXWindowToolbarHeight); + + windowFrame.origin.y = NSMaxY([self.window frame]) - + ([view frame].size.height + _TXWindowToolbarHeight); if (NSObjectIsNotEmpty([self.contentView subviews])) { - [[[self.contentView subviews] safeObjectAtIndex:0] removeFromSuperview]; + [[self.contentView.subviews safeObjectAtIndex:0] removeFromSuperview]; } [self.window setFrame:windowFrame display:YES animate:YES]; @@ -190,42 +192,42 @@ - (void)firstPane:(NSView *)view selectedItem:(NSInteger)key - (NSInteger)maxLogLines { - return [Preferences maxLogLines]; + return [TPCPreferences maxLogLines]; } - (void)setMaxLogLines:(NSInteger)value { - [Preferences setMaxLogLines:value]; + [TPCPreferences setMaxLogLines:value]; } - (NSString *)completionSuffix { - return [Preferences completionSuffix]; + return [TPCPreferences completionSuffix]; } - (void)setCompletionSuffix:(NSString *)value { - [Preferences setCompletionSuffix:value]; + [TPCPreferences setCompletionSuffix:value]; } - (NSInteger)inlineImageMaxWidth { - return [Preferences inlineImagesMaxWidth]; + return [TPCPreferences inlineImagesMaxWidth]; } - (void)setInlineImageMaxWidth:(NSInteger)value { - [Preferences setInlineImagesMaxWidth:value]; + [TPCPreferences setInlineImagesMaxWidth:value]; } - (NSString *)themeChannelViewFontName { - return [Preferences themeChannelViewFontName]; + return [TPCPreferences themeChannelViewFontName]; } -- (NSDoubleN)themeChannelViewFontSize +- (TXNSDouble)themeChannelViewFontSize { - return [Preferences themeChannelViewFontSize]; + return [TPCPreferences themeChannelViewFontSize]; } - (void)setThemeChannelViewFontName:(id)value { return; } @@ -236,18 +238,18 @@ - (BOOL)validateValue:(id *)value forKey:(NSString *)key error:(NSError **)error if ([key isEqualToString:@"maxLogLines"]) { NSInteger n = [*value integerValue]; - if (n < LINES_MIN) { - *value = NSNumberWithInteger(LINES_MIN); - } else if (n > LINES_MAX) { - *value = NSNumberWithInteger(LINES_MAX); + if (n < _linesMin) { + *value = NSNumberWithInteger(_linesMin); + } else if (n > _linesMax) { + *value = NSNumberWithInteger(_linesMax); } } else if ([key isEqualToString:@"inlineImageMaxWidth"]) { NSInteger n = [*value integerValue]; - if (n < INLINE_IMAGE_MIN) { - *value = NSNumberWithInteger(INLINE_IMAGE_MIN); - } else if (INLINE_IMAGE_MAX < n) { - *value = NSNumberWithInteger(INLINE_IMAGE_MAX); + if (n < _inlineImageMin) { + *value = NSNumberWithInteger(_inlineImageMin); + } else if (_inlineImageMax < n) { + *value = NSNumberWithInteger(_inlineImageMax); } } @@ -276,7 +278,7 @@ - (void)updateAlert NSMutableArray *alerts = [self sounds]; - for (SoundWrapper *alert in alerts) { + for (TDCPreferencesSoundWrapper *alert in alerts) { NSMenuItem *item = [[NSMenuItem alloc] init]; [item setTitle:alert.displayName]; @@ -290,7 +292,7 @@ - (void)updateAlert - (void)onChangeAlert:(id)sender { - SoundWrapper *alert = [SoundWrapper soundWrapperWithEventType:(NotificationType)self.alertButton.selectedItem.tag]; + TDCPreferencesSoundWrapper *alert = [TDCPreferencesSoundWrapper soundWrapperWithEventType:(TXNotificationType)self.alertButton.selectedItem.tag]; [self.useGrowlButton setState:alert.growl]; [self.disableAlertWhenAwayButton setState:alert.disableWhileAway]; @@ -300,21 +302,21 @@ - (void)onChangeAlert:(id)sender - (void)onUseGrowl:(id)sender { - SoundWrapper *alert = [SoundWrapper soundWrapperWithEventType:(NotificationType)self.alertButton.selectedItem.tag]; + TDCPreferencesSoundWrapper *alert = [TDCPreferencesSoundWrapper soundWrapperWithEventType:(TXNotificationType)self.alertButton.selectedItem.tag]; [alert setGrowl:[self.useGrowlButton state]]; } - (void)onAlertWhileAway:(id)sender { - SoundWrapper *alert = [SoundWrapper soundWrapperWithEventType:(NotificationType)self.alertButton.selectedItem.tag]; + TDCPreferencesSoundWrapper *alert = [TDCPreferencesSoundWrapper soundWrapperWithEventType:(TXNotificationType)self.alertButton.selectedItem.tag]; [alert setDisableWhileAway:[self.disableAlertWhenAwayButton state]]; } - (void)onChangeAlertSound:(id)sender { - SoundWrapper *alert = [SoundWrapper soundWrapperWithEventType:(NotificationType)self.alertButton.selectedItem.tag]; + TDCPreferencesSoundWrapper *alert = [TDCPreferencesSoundWrapper soundWrapperWithEventType:(TXNotificationType)self.alertButton.selectedItem.tag]; [alert setSound:[self.alertSoundButton titleOfSelectedItem]]; } @@ -332,7 +334,7 @@ - (NSArray *)availableSounds NSArray *directoryContents = [_NSFileManager() contentsOfDirectoryAtPath:@"/System/Library/Sounds" error:NULL]; NSArray *homeDirectoryContents = [_NSFileManager() contentsOfDirectoryAtPath:[userSoundFolder stringByAppendingPathComponent:@"/Sounds"] error:NULL]; - [sound_list safeAddObject:EMPTY_SOUND]; + [sound_list safeAddObject:TXEmptySoundAlertLabel]; [sound_list safeAddObject:@"Beep"]; if (NSObjectIsNotEmpty(directoryContents)) { @@ -344,7 +346,7 @@ - (NSArray *)availableSounds } if (NSObjectIsNotEmpty(homeDirectoryContents)) { - [sound_list safeAddObject:EMPTY_SOUND]; + [sound_list safeAddObject:TXEmptySoundAlertLabel]; for (NSString *s in homeDirectoryContents) { if ([s contains:@"."]) { @@ -358,25 +360,25 @@ - (NSArray *)availableSounds - (NSMutableArray *)sounds { - if (NSObjectIsEmpty(self.sounds)) { + if (NSObjectIsEmpty(sounds)) { NSMutableArray *ary = [NSMutableArray new]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_LOGIN]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_DISCONNECT]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_HIGHLIGHT]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_KICKED]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_INVITED]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_CHANNEL_MSG]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_CHANNEL_NOTICE]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_TALK_MSG]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_NEW_TALK]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_TALK_NOTICE]]; - [ary safeAddObject:[SoundWrapper soundWrapperWithEventType:NOTIFICATION_ADDRESS_BOOK_MATCH]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationConnectType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationDisconnectType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationHighlightType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationKickType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationInviteType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationChannelMessageType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationChannelNoticeType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationQueryMessageType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationNewQueryType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationQueryNoticeType]]; + [ary safeAddObject:[TDCPreferencesSoundWrapper soundWrapperWithEventType:TXNotificationAddressBookMatchType]]; sounds = ary; } - return self.sounds; + return sounds; } #pragma mark - @@ -384,13 +386,13 @@ - (NSMutableArray *)sounds - (void)updateTranscriptFolder { - if ([Preferences sandboxEnabled]) { + if ([TPCPreferences sandboxEnabled]) { [self.transcriptFolderButton setHidden:YES]; return; } - NSString *path = [[Preferences transcriptFolder] stringByExpandingTildeInPath]; + NSString *path = [[TPCPreferences transcriptFolder] stringByExpandingTildeInPath]; NSImage *icon = [_NSWorkspace() iconForFile:path]; [icon setSize:NSMakeSize(16, 16)]; @@ -407,8 +409,8 @@ - (void)onTranscriptFolderChanged:(id)sender NSOpenPanel *d = [NSOpenPanel openPanel]; [d setCanChooseFiles:NO]; - [d setCanChooseDirectories:YES]; [d setResolvesAliases:YES]; + [d setCanChooseDirectories:YES]; [d setAllowsMultipleSelection:NO]; [d setCanCreateDirectories:YES]; @@ -416,10 +418,11 @@ - (void)onTranscriptFolderChanged:(id)sender [self.transcriptFolderButton selectItem:[self.transcriptFolderButton itemAtIndex:0]]; if (returnCode == NSOKButton) { - NSURL *pathURL = [[d URLs] safeObjectAtIndex:0]; + NSURL *pathURL = [d.URLs safeObjectAtIndex:0]; + NSString *path = [pathURL path]; - [Preferences setTranscriptFolder:[path stringByAbbreviatingWithTildeInPath]]; + [TPCPreferences setTranscriptFolder:[path stringByAbbreviatingWithTildeInPath]]; [self updateTranscriptFolder]; } @@ -436,7 +439,7 @@ - (void)updateTheme NSInteger tag = 0; - NSArray *ary = [NSArray arrayWithObjects:[Preferences whereThemesLocalPath], [Preferences whereThemesPath], nil]; + NSArray *ary = [NSArray arrayWithObjects:[TPCPreferences whereThemesLocalPath], [TPCPreferences whereThemesPath], nil]; for (NSString *path in ary) { NSMutableSet *set = [NSMutableSet set]; @@ -444,8 +447,8 @@ - (void)updateTheme NSArray *files = [_NSFileManager() contentsOfDirectoryAtPath:path error:NULL]; for (NSString *file in files) { - if ([path isEqualToString:[Preferences whereThemesLocalPath]]) { - if ([_NSFileManager() fileExistsAtPath:[[Preferences whereThemesPath] stringByAppendingPathComponent:[file lastPathComponent]]]) { + if ([path isEqualToString:[TPCPreferences whereThemesLocalPath]]) { + if ([_NSFileManager() fileExistsAtPath:[[TPCPreferences whereThemesPath] stringByAppendingPathComponent:[file lastPathComponent]]]) { continue; } } @@ -461,7 +464,7 @@ - (void)updateTheme NSInteger i = 0; for (NSString *f in files) { - NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:f action:nil keyEquivalent:NSNullObject]; + NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:f action:nil keyEquivalent:NSStringEmptyPlaceholder]; [item setTag:tag]; @@ -474,8 +477,8 @@ - (void)updateTheme ++tag; } - NSString *kind = [ViewTheme extractThemeSource:[Preferences themeName]]; - NSString *name = [ViewTheme extractThemeName:[Preferences themeName]]; + NSString *kind = [TPCViewTheme extractThemeSource:[TPCPreferences themeName]]; + NSString *name = [TPCViewTheme extractThemeName:[TPCPreferences themeName]]; NSInteger targetTag = 0; @@ -498,8 +501,8 @@ - (void)updateTheme - (void)onChangedTheme:(id)sender { - NSDoubleN oldRenderVersion = self.world.viewTheme.other.renderingEngineVersion; - NSDoubleN newRenderVersion = 0; + TXNSDouble oldRenderVersion = self.world.viewTheme.other.renderingEngineVersion; + TXNSDouble newRenderVersion = 0; NSMenuItem *item = [self.themeButton selectedItem]; @@ -507,16 +510,16 @@ - (void)onChangedTheme:(id)sender NSString *name = [item title]; if (item.tag == 0) { - newThemeName = [ViewTheme buildResourceFilename:name]; + newThemeName = [TPCViewTheme buildResourceFilename:name]; } else { - newThemeName = [ViewTheme buildUserFilename:name]; + newThemeName = [TPCViewTheme buildUserFilename:name]; } - if ([[Preferences themeName] isEqual:newThemeName]) { + if ([[TPCPreferences themeName] isEqual:newThemeName]) { return; } - [Preferences setThemeName:newThemeName]; + [TPCPreferences setThemeName:newThemeName]; [self onStyleChanged:nil]; @@ -540,12 +543,12 @@ - (void)onSelectFont:(id)sender - (void)changeItemFont:(NSFontManager *)sender { - OtherTheme *theme = self.world.viewTheme.other; + TPCOtherTheme *theme = self.world.viewTheme.other; NSFont *newFont = [sender convertFont:theme.channelViewFont]; - [Preferences setThemeChannelViewFontName:[newFont fontName]]; - [Preferences setThemeChannelViewFontSize:[newFont pointSize]]; + [TPCPreferences setThemeChannelViewFontName:[newFont fontName]]; + [TPCPreferences setThemeChannelViewFontSize:[newFont pointSize]]; [self setValue:[newFont fontName] forKey:@"themeChannelViewFontName"]; [self setValue:NSNumberWithDouble([newFont pointSize]) forKey:@"themeChannelViewFontSize"]; @@ -555,7 +558,7 @@ - (void)changeItemFont:(NSFontManager *)sender - (void)onChangedTransparency:(id)sender { - [_NSNotificationCenter() postNotificationName:TransparencyDidChangeNotification object:nil userInfo:nil]; + [_NSNotificationCenter() postNotificationName:TXTransparencyPreferenceChangedNotification object:nil userInfo:nil]; } #pragma mark - @@ -563,14 +566,14 @@ - (void)onChangedTransparency:(id)sender - (void)onHighlightTypeChanged:(id)sender { - if ([Preferences keywordMatchingMethod] == KEYWORD_MATCH_REGEX) { + if ([TPCPreferences keywordMatchingMethod] == TXNicknameHighlightRegularExpressionMatchType) { [self.highlightNicknameButton setEnabled:NO]; [self.addExcludeWordButton setEnabled:YES]; [self.excludeWordsTable setEnabled:YES]; } else { [self.highlightNicknameButton setEnabled:YES]; - if ([Preferences keywordMatchingMethod] == KEYWORD_MATCH_PARTIAL) { + if ([TPCPreferences keywordMatchingMethod] == TXNicknameHighlightPartialMatchType) { [self.addExcludeWordButton setEnabled:YES]; [self.excludeWordsTable setEnabled:YES]; } else { @@ -604,17 +607,17 @@ - (void)onAddExcludeWord:(id)sender - (void)onInputHistorySchemeChanged:(id)sender { - [_NSNotificationCenter() postNotificationName:InputHistoryGlobalSchemeNotification object:nil userInfo:nil]; + [_NSNotificationCenter() postNotificationName:TXInputHistorySchemePreferenceChangedNotification object:nil userInfo:nil]; } - (void)onStyleChanged:(id)sender { - [_NSNotificationCenter() postNotificationName:ThemeStyleDidChangeNotification object:nil userInfo:nil]; + [_NSNotificationCenter() postNotificationName:TXThemePreferenceChangedNotification object:nil userInfo:nil]; } + (void)openPathToThemesCallback:(NSNumber *)returnCode { - NSString *name = [ViewTheme extractThemeName:[Preferences themeName]]; + NSString *name = [TPCViewTheme extractThemeName:[TPCPreferences themeName]]; NSInteger _returnCode = [returnCode integerValue]; @@ -623,12 +626,12 @@ + (void)openPathToThemesCallback:(NSNumber *)returnCode } if (_returnCode == NSAlertFirstButtonReturn) { - NSString *path = [[Preferences whereThemesLocalPath] stringByAppendingPathComponent:name]; + NSString *path = [[TPCPreferences whereThemesLocalPath] stringByAppendingPathComponent:name]; [_NSWorkspace() openFile:path]; } else { - NSString *newpath = [[Preferences whereThemesPath] stringByAppendingPathComponent:name]; - NSString *oldpath = [[Preferences whereThemesLocalPath] stringByAppendingPathComponent:name]; + NSString *newpath = [[TPCPreferences whereThemesPath] stringByAppendingPathComponent:name]; + NSString *oldpath = [[TPCPreferences whereThemesLocalPath] stringByAppendingPathComponent:name]; [_NSFileManager() copyItemAtPath:oldpath toPath:newpath error:NULL]; @@ -638,22 +641,22 @@ + (void)openPathToThemesCallback:(NSNumber *)returnCode - (void)onOpenPathToThemes:(id)sender { - NSString *kind = [ViewTheme extractThemeSource:[Preferences themeName]]; - NSString *name = [ViewTheme extractThemeName:[Preferences themeName]]; + NSString *kind = [TPCViewTheme extractThemeSource:[TPCPreferences themeName]]; + NSString *name = [TPCViewTheme extractThemeName:[TPCPreferences themeName]]; if ([kind isEqualNoCase:@"resource"]) { - [PopupPrompts sheetWindowWithQuestion:[NSApp keyWindow] - target:[PreferencesController class] + [TLOPopupPrompts sheetWindowWithQuestion:[NSApp keyWindow] + target:[TDCPreferencesController class] action:@selector(openPathToThemesCallback:) - body:TXTFLS(@"OPENING_LOCAL_STYLE_RESOURCES_MESSAGE", name) - title:TXTLS(@"OPENING_LOCAL_STYLE_RESOURCES_TITLE") - defaultButton:TXTLS(@"CONTINUE_BUTTON") - alternateButton:TXTLS(@"CANCEL_BUTTON") - otherButton:TXTLS(@"OPENING_LOCAL_STYLE_RESOURCES_COPY_BUTTON") + body:TXTFLS(@"OpeningLocalStyleResourcesMessage", name) + title:TXTLS(@"OpeningLocalStyleResourcesTitle") + defaultButton:TXTLS(@"ContinueButton") + alternateButton:TXTLS(@"CancelButton") + otherButton:TXTLS(@"OpeningLocalStyleResourcesCopyButton") suppressionKey:@"opening_local_style" suppressionText:nil]; } else { - NSString *path = [[Preferences whereThemesPath] stringByAppendingPathComponent:name]; + NSString *path = [[TPCPreferences whereThemesPath] stringByAppendingPathComponent:name]; [_NSWorkspace() openFile:path]; } @@ -661,12 +664,12 @@ - (void)onOpenPathToThemes:(id)sender - (void)onOpenPathToScripts:(id)sender { - [_NSWorkspace() openFile:[Preferences whereApplicationSupportPath]]; + [_NSWorkspace() openFile:[TPCPreferences whereApplicationSupportPath]]; } - (void)onHighlightLoggingChanged:(id)sender { - if ([Preferences logAllHighlightsToQuery] == NO) { + if ([TPCPreferences logAllHighlightsToQuery] == NO) { for (IRCClient *u in self.world.clients) { [u.highlights removeAllObjects]; } @@ -677,23 +680,23 @@ - (void)onDownloadExtraAddons:(id)sender { NSString *version = @"6"; -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER - if ([Preferences featureAvailableToOSXMountainLion]) { - if ([Preferences sandboxEnabled]) { +#ifdef TXUserScriptsFolderAvailable + if ([TPCPreferences featureAvailableToOSXMountainLion]) { + if ([TPCPreferences sandboxEnabled]) { version = @"8"; } } #endif - if ([Preferences featureAvailableToOSXLion]) { - if ([Preferences sandboxEnabled]) { + if ([TPCPreferences featureAvailableToOSXLion]) { + if ([TPCPreferences sandboxEnabled]) { version = @"7"; } } NSString *base = [NSString stringWithFormat:@"https://raw.github.com/Codeux/Textual/master/Resources/Installers/Textual%20IRC%20Client%20Extras%20(10.%@).pkg", version]; - [URLOpener open:[NSURL URLWithString:base]]; + [TLOpenLink open:[NSURL URLWithString:base]]; } #pragma mark - @@ -701,8 +704,8 @@ - (void)onDownloadExtraAddons:(id)sender - (void)windowWillClose:(NSNotification *)note { - [Preferences cleanUpWords]; - [Preferences sync]; + [TPCPreferences cleanUpWords]; + [TPCPreferences sync]; [_NSUserDefaults() synchronize]; diff --git a/Classes/Dialogs/Preferences/ScriptsWrapper.m b/Classes/Dialogs/Preferences/TDCPreferencesScriptWrapper.m similarity index 79% rename from Classes/Dialogs/Preferences/ScriptsWrapper.m rename to Classes/Dialogs/Preferences/TDCPreferencesScriptWrapper.m index 0e645ba87c..a9052106f1 100755 --- a/Classes/Dialogs/Preferences/ScriptsWrapper.m +++ b/Classes/Dialogs/Preferences/TDCPreferencesScriptWrapper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@implementation ScriptsWrapper +@implementation TDCPreferencesScriptWrapper @synthesize scripts; @synthesize world; @@ -20,12 +20,12 @@ - (void)populateData; { NSArray *scriptPaths = [NSArray arrayWithObjects: -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER - [Preferences whereScriptsUnsupervisedPath], +#ifdef TXUserScriptsFolderAvailable + [TPCPreferences whereScriptsUnsupervisedPath], #endif - [Preferences whereScriptsLocalPath], - [Preferences whereScriptsPath], nil]; + [TPCPreferences whereScriptsLocalPath], + [TPCPreferences whereScriptsPath], nil]; for (NSString *path in scriptPaths) { NSArray *resourceFiles = [_NSFileManager() contentsOfDirectoryAtPath:path error:NULL]; @@ -36,8 +36,8 @@ - (void)populateData; continue; } - NSArray *nameParts = [file componentsSeparatedByString:@"."]; - NSString *script = [[nameParts stringAtIndex:0] lowercaseString]; + NSArray *nameParts = [file componentsSeparatedByString:@"."]; + NSString *script = [nameParts stringAtIndex:0].lowercaseString; if ([self.scripts containsObject:script] == NO) { [self.scripts safeAddObject:script]; diff --git a/Classes/Dialogs/Preferences/TDCPreferencesSoundWrapper.m b/Classes/Dialogs/Preferences/TDCPreferencesSoundWrapper.m new file mode 100755 index 0000000000..53dc9c2dfd --- /dev/null +++ b/Classes/Dialogs/Preferences/TDCPreferencesSoundWrapper.m @@ -0,0 +1,92 @@ +// Created by Satoshi Nakagawa +// You can redistribute it and/or modify it under the new BSD license. +// Converted to ARC Support on Thursday, June 09, 2012 + +@implementation TDCPreferencesSoundWrapper + +@synthesize eventType; +@synthesize displayName; +@synthesize sound; +@synthesize growl; +@synthesize growlSticky; +@synthesize disableWhileAway; + +- (id)initWithEventType:(TXNotificationType)aEventType +{ + if ((self = [super init])) { + self.eventType = aEventType; + } + + return self; +} + ++ (TDCPreferencesSoundWrapper *)soundWrapperWithEventType:(TXNotificationType)eventType +{ + return [[TDCPreferencesSoundWrapper alloc] initWithEventType:eventType]; +} + +- (NSString *)displayName +{ + return [TPCPreferences titleForEvent:self.eventType]; +} + +- (NSString *)sound +{ + NSString *soundd = [TPCPreferences soundForEvent:self.eventType]; + + if (NSObjectIsEmpty(soundd)) { + return TXEmptySoundAlertLabel; + } else { + return soundd; + } +} + +- (void)setSound:(NSString *)value +{ + if ([value isEqualToString:TXEmptySoundAlertLabel]) { + value = NSStringEmptyPlaceholder; + } + + if (NSObjectIsNotEmpty(value)) { + [TLOSoundPlayer play:value isMuted:NO]; + } + + [TPCPreferences setSound:value forEvent:self.eventType]; +} + +- (BOOL)growl +{ + return [TPCPreferences growlEnabledForEvent:self.eventType]; +} + +- (void)setGrowl:(BOOL)value +{ + [TPCPreferences setGrowlEnabled:value forEvent:self.eventType]; +} + +- (BOOL)growlSticky +{ + return [TPCPreferences growlStickyForEvent:self.eventType]; +} + +- (void)setGrowlSticky:(BOOL)value +{ + [TPCPreferences setGrowlSticky:value forEvent:self.eventType]; +} + +- (BOOL)disableWhileAway +{ + return [TPCPreferences disableWhileAwayForEvent:self.eventType]; +} + +- (void)setDisableWhileAway:(BOOL)value +{ + [TPCPreferences setDisableWhileAway:value forEvent:self.eventType]; +} + +- (TXNotificationType)eventType +{ + return eventType; +} + +@end diff --git a/Classes/Dialogs/AboutPanel.m b/Classes/Dialogs/TDCAboutPanel.m similarity index 76% rename from Classes/Dialogs/AboutPanel.m rename to Classes/Dialogs/TDCAboutPanel.m index 6846b36d5d..13e18dab1d 100755 --- a/Classes/Dialogs/AboutPanel.m +++ b/Classes/Dialogs/TDCAboutPanel.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@implementation AboutPanel +@implementation TDCAboutPanel @synthesize delegate; @synthesize versionInfo; @@ -10,7 +10,7 @@ @implementation AboutPanel - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"AboutPanel" owner:self]; + [NSBundle loadNibNamed:@"TDCAboutPanel" owner:self]; } return self; @@ -18,8 +18,8 @@ - (id)init - (void)show { - [self.versionInfo setStringValue:[NSString stringWithFormat:TXTLS(@"ABOUT_WINDOW_BUILD_NUMBER"), - [[Preferences textualInfoPlist] objectForKey:@"CFBundleVersion"]]]; + [self.versionInfo setStringValue:[NSString stringWithFormat:TXTLS(@"AboutWindowBuildNumber"), + [[TPCPreferences textualInfoPlist] objectForKey:@"CFBundleVersion"]]]; [self.window center]; [self.window makeKeyAndOrderFront:nil]; diff --git a/Classes/Dialogs/AddressBookSheet.m b/Classes/Dialogs/TDCAddressBookSheet.m similarity index 90% rename from Classes/Dialogs/AddressBookSheet.m rename to Classes/Dialogs/TDCAddressBookSheet.m index 7d21af9e3f..6616dcf44b 100755 --- a/Classes/Dialogs/AddressBookSheet.m +++ b/Classes/Dialogs/TDCAddressBookSheet.m @@ -2,12 +2,12 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface AddressBookSheet (Private) +@interface TDCAddressBookSheet (Private) - (void)updateButtons; - (void)reloadChannelTable; @end -@implementation AddressBookSheet +@implementation TDCAddressBookSheet @synthesize ignore; @synthesize delegate; @@ -28,7 +28,7 @@ @implementation AddressBookSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"AddressBookSheet" owner:self]; + [NSBundle loadNibNamed:@"TDCAddressBookSheet" owner:self]; } return self; @@ -36,7 +36,7 @@ - (id)init - (void)start { - if (self.ignore.entryType == ADDRESS_BOOK_IGNORE_ENTRY) { + if (self.ignore.entryType == IRCAddressBookIgnoreEntryType) { self.sheet = self.ignoreWindow; if (NSObjectIsNotEmpty(self.ignore.hostmask)) { @@ -64,7 +64,7 @@ - (void)start - (void)ok:(id)sender { - if (self.ignore.entryType == ADDRESS_BOOK_IGNORE_ENTRY) { + if (self.ignore.entryType == IRCAddressBookIgnoreEntryType) { self.ignore.hostmask = [self.hostmask stringValue]; } else { self.ignore.hostmask = [self.nickname stringValue]; diff --git a/Classes/Dialogs/HighlightSheet.m b/Classes/Dialogs/TDCHighlightSheet.m similarity index 81% rename from Classes/Dialogs/HighlightSheet.m rename to Classes/Dialogs/TDCHighlightSheet.m index 0712308386..388cd41b2a 100755 --- a/Classes/Dialogs/HighlightSheet.m +++ b/Classes/Dialogs/TDCHighlightSheet.m @@ -2,13 +2,13 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define ROW_HEIGHT_MULTIPLIER 17 +#define _rowHeightMultiplier 17 -@interface HighlightSheet (Private) +@interface TDCHighlightSheet (Private) - (void)reloadTable; @end -@implementation HighlightSheet +@implementation TDCHighlightSheet @synthesize list; @synthesize table; @@ -18,7 +18,7 @@ @implementation HighlightSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"HighlightSheet" owner:self]; + [NSBundle loadNibNamed:@"TDCHighlightSheet" owner:self]; } return self; @@ -26,12 +26,12 @@ - (id)init - (void)show { - MenuController *menu = self.delegate; + TXMenuController *menu = self.delegate; IRCClient *currentNetwork = [menu.world selectedClient]; - NSString *currentHeader = nil; - - NSString *network = currentNetwork.config.network; + + NSString *currentHeader = nil; + NSString *network = currentNetwork.config.network; if (NSObjectIsEmpty(network)) { network = currentNetwork.config.name; @@ -85,6 +85,10 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)sender - (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row { + if (self.list.count <= 0) { + return _rowHeightMultiplier; + } + NSRect columnRect; columnRect = [tableView rectOfColumn:1]; @@ -95,12 +99,13 @@ - (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row NSInteger pixelHeight = [[data safeObjectAtIndex:2] pixelHeightInWidth:columnRect.size.width]; NSInteger lineCount = (pixelHeight / 14); - return (ROW_HEIGHT_MULTIPLIER * lineCount); + return (_rowHeightMultiplier * lineCount); } - (id)tableView:(NSTableView *)sender objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row { NSArray *item = [self.list safeObjectAtIndex:row]; + NSString *col = [column identifier]; if ([col isEqualToString:@"chan"]) { @@ -108,7 +113,7 @@ - (id)tableView:(NSTableView *)sender objectValueForTableColumn:(NSTableColumn * } else if ([col isEqualToString:@"time"]) { NSInteger time = [item integerAtIndex:1]; - return TXTFLS(@"TIME_AGO", TXSpecialReadableTime([NSDate secondsSinceUnixTimestamp:time], YES, nil)); + return TXTFLS(@"TimeAgo", TXSpecialReadableTime([NSDate secondsSinceUnixTimestamp:time], YES, nil)); } else { return [item safeObjectAtIndex:2]; } diff --git a/Classes/Dialogs/InviteSheet.m b/Classes/Dialogs/TDCInviteSheet.m similarity index 82% rename from Classes/Dialogs/InviteSheet.m rename to Classes/Dialogs/TDCInviteSheet.m index 4b14fac841..793a78c417 100755 --- a/Classes/Dialogs/InviteSheet.m +++ b/Classes/Dialogs/TDCInviteSheet.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@implementation InviteSheet +@implementation TDCInviteSheet @synthesize delegate; @synthesize nicks; @@ -14,7 +14,7 @@ @implementation InviteSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"InviteSheet" owner:self]; + [NSBundle loadNibNamed:@"TDCInviteSheet" owner:self]; } return self; @@ -30,12 +30,12 @@ - (void)startWithChannels:(NSArray *)channels NSString *first = [self.nicks safeObjectAtIndex:0]; NSString *second = [self.nicks safeObjectAtIndex:1]; - target = TXTFLS(@"INVITE_SHEET_TWO_PEOPLE", first, second); + target = TXTFLS(@"InviteSheetTwoPeopleSelected", first, second); } else { - target = TXTFLS(@"INVITE_SHEET_MULTIPLE_PEOPLE", self.nicks.count); + target = TXTFLS(@"InviteSheetMultiplePeopleSelected", self.nicks.count); } - self.titleLabel.stringValue = TXTFLS(@"INVITE_SHEET_TARGET_DESC", target); + self.titleLabel.stringValue = TXTFLS(@"InviteSheetTargetDescription", target); for (NSString *s in channels) { [self.channelPopup addItemWithTitle:s]; diff --git a/Classes/Dialogs/ListDialog.m b/Classes/Dialogs/TDCListDialog.m similarity index 92% rename from Classes/Dialogs/ListDialog.m rename to Classes/Dialogs/TDCListDialog.m index 4c2ca1e042..ff618565e1 100755 --- a/Classes/Dialogs/ListDialog.m +++ b/Classes/Dialogs/TDCListDialog.m @@ -3,13 +3,12 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 - -@interface ListDialog (Private) +@interface TDCListDialog (Private) - (void)sortedInsert:(NSArray *)item inArray:(NSMutableArray *)ary; - (void)reloadTable; @end -@implementation ListDialog +@implementation TDCListDialog @synthesize delegate; @synthesize sortKey; @@ -25,7 +24,7 @@ @implementation ListDialog - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"ListDialog" owner:self]; + [NSBundle loadNibNamed:@"TDCListDialog" owner:self]; self.list = [NSMutableArray new]; @@ -60,7 +59,7 @@ - (void)show network = client.config.name; } - [self.networkName setStringValue:TXTFLS(@"CHANNEL_LIST_NETWORK_NAME", network)]; + [self.networkName setStringValue:TXTFLS(@"ChannelListNetworkName", network)]; [self.window makeKeyAndOrderFront:nil]; } @@ -83,7 +82,7 @@ - (void)addChannel:(NSString *)channel count:(NSInteger)count topic:(NSString *) { if ([channel isChannelName]) { NSArray *item = [NSArray arrayWithObjects:channel, NSNumberWithInteger(count), topic, - [topic attributedStringWithIRCFormatting:DefaultListViewFont], nil]; + [topic attributedStringWithIRCFormatting:TXDefaultListViewControllerFont], nil]; NSString *filter = [self.filterText stringValue]; @@ -108,9 +107,9 @@ - (void)addChannel:(NSString *)channel count:(NSInteger)count topic:(NSString *) - (void)reloadTable { if (NSObjectIsNotEmpty([self.filterText stringValue]) && NSDissimilarObjects([self.list count], [self.filteredList count])) { - [self.channelCount setStringValue:TXTFLS(@"LIST_DIALOG_HAS_SEARCH_RESULTS", [self.list count], [self.filteredList count])]; + [self.channelCount setStringValue:TXTFLS(@"ListDialogHasSearchResults", [self.list count], [self.filteredList count])]; } else { - [self.channelCount setStringValue:TXTFLS(@"LIST_DIALOG_HAS_CHANNELS", [self.list count])]; + [self.channelCount setStringValue:TXTFLS(@"ListDialogHasChannels", [self.list count])]; } [self.table reloadData]; @@ -118,7 +117,7 @@ - (void)reloadTable static NSInteger compareItems(NSArray *self, NSArray *other, void *context) { - ListDialog *dialog = (__bridge ListDialog *)context; + TDCListDialog *dialog = (__bridge TDCListDialog *)context; NSInteger key = dialog.sortKey; NSComparisonResult order = dialog.sortOrder; diff --git a/Classes/Dialogs/ModeSheet.m b/Classes/Dialogs/TDCModeSheet.m similarity index 94% rename from Classes/Dialogs/ModeSheet.m rename to Classes/Dialogs/TDCModeSheet.m index 1cc40390ae..fbff3a1bcd 100755 --- a/Classes/Dialogs/ModeSheet.m +++ b/Classes/Dialogs/TDCModeSheet.m @@ -3,11 +3,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ModeSheet (Private) +@interface TDCModeSheet (Private) - (void)updateTextFields; @end -@implementation ModeSheet +@implementation TDCModeSheet @synthesize mode; @synthesize delegate; @@ -28,7 +28,7 @@ @implementation ModeSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"ModeSheet" owner:self]; + [NSBundle loadNibNamed:@"TDCModeSheet" owner:self]; } return self; @@ -49,7 +49,7 @@ - (void)start if ([self.mode modeInfoFor:@"k"].plus) { [self.kText setStringValue:[self.mode modeInfoFor:@"k"].param]; } else { - [self.kText setStringValue:NSNullObject]; + [self.kText setStringValue:NSStringEmptyPlaceholder]; } NSInteger lCount = [self.mode modeInfoFor:@"l"].param.integerValue; diff --git a/Classes/Dialogs/NickSheet.m b/Classes/Dialogs/TDCNickSheet.m similarity index 93% rename from Classes/Dialogs/NickSheet.m rename to Classes/Dialogs/TDCNickSheet.m index 8ecc6221ad..a7d29148b7 100755 --- a/Classes/Dialogs/NickSheet.m +++ b/Classes/Dialogs/TDCNickSheet.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@implementation NickSheet +@implementation TDCNickSheet @synthesize uid; @synthesize sheet; @@ -14,7 +14,7 @@ @implementation NickSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"NickSheet" owner:self]; + [NSBundle loadNibNamed:@"TDCNickSheet" owner:self]; } return self; diff --git a/Classes/Dialogs/ServerSheet.m b/Classes/Dialogs/TDCServerSheet.m similarity index 81% rename from Classes/Dialogs/ServerSheet.m rename to Classes/Dialogs/TDCServerSheet.m index 3020265ef0..00dfde8225 100755 --- a/Classes/Dialogs/ServerSheet.m +++ b/Classes/Dialogs/TDCServerSheet.m @@ -3,13 +3,13 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define TABLE_ROW_TYPE @"row" -#define TABLE_ROW_TYPES [NSArray arrayWithObject:TABLE_ROW_TYPE] +#define _tableRowType @"row" +#define _tableRowTypes [NSArray arrayWithObject:_tableRowType] -#define TIMEOUT_INT_MIN 0 -#define TIMEOUT_INT_MAX 360 +#define _timeoutIntMin 0 +#define _timeoutIntMax 360 -@interface ServerSheet (Private) +@interface TDCServerSheet (Private) - (void)load; - (void)save; - (void)updateConnectionPage; @@ -20,7 +20,7 @@ - (void)reloadIgnoreTable; - (void)focusView:(NSView *)view atRow:(NSInteger)row; @end -@implementation ServerSheet +@implementation TDCServerSheet @synthesize delegate; @synthesize okButton; @@ -87,20 +87,20 @@ - (id)init if ((self = [super init])) { self.tabViewList = [NSMutableArray new]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"GENERAL", @"1", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"IDENTITY", @"2", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"MESSAGES", @"3", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"ENCODING", @"4", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"AUTOJOIN", @"5", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"IGNORES", @"6", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"COMMANDS", @"7", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:ListSeparatorCellIndex, @"-", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"PROXY", @"8", NSNumberWithBOOL(NO), nil]]; - [self.tabViewList addObject:[NSArray arrayWithObjects:@"FLOODC", @"9", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Geneal", @"1", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Identity", @"2", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Message", @"3", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Encoding", @"4", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Autojoin", @"5", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Ignores", @"6", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Commands", @"7", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:TXDefaultListSeperatorCellIndex, @"-", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"Proxy", @"8", NSNumberWithBOOL(NO), nil]]; + [self.tabViewList addObject:[NSArray arrayWithObjects:@"FloodControl", @"9", NSNumberWithBOOL(NO), nil]]; - [NSBundle loadNibNamed:@"ServerSheet" owner:self]; + [NSBundle loadNibNamed:@"TDCServerSheet" owner:self]; - self.serverList = [NSDictionary dictionaryWithContentsOfFile:[[Preferences whereResourcePath] stringByAppendingPathComponent:@"IRCNetworks.plist"]]; + self.serverList = [NSDictionary dictionaryWithContentsOfFile:[[TPCPreferences whereResourcePath] stringByAppendingPathComponent:@"IRCNetworks.plist"]]; NSArray *sortedKeys = [[self.serverList allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]; @@ -151,11 +151,11 @@ - (void)startWithIgnoreTab:(NSString *)imask { [self.channelTable setTarget:self]; [self.channelTable setDoubleAction:@selector(tableViewDoubleClicked:)]; - [self.channelTable registerForDraggedTypes:TABLE_ROW_TYPES]; + [self.channelTable registerForDraggedTypes:_tableRowTypes]; [self.ignoreTable setTarget:self]; [self.ignoreTable setDoubleAction:@selector(tableViewDoubleClicked:)]; - [self.ignoreTable registerForDraggedTypes:TABLE_ROW_TYPES]; + [self.ignoreTable registerForDraggedTypes:_tableRowTypes]; [self load]; @@ -173,12 +173,12 @@ - (void)startWithIgnoreTab:(NSString *)imask if ([imask isEqualToString:@"-"] == NO) { self.ignoreSheet = nil; - self.ignoreSheet = [AddressBookSheet new]; + self.ignoreSheet = [TDCAddressBookSheet new]; self.ignoreSheet.delegate = self; self.ignoreSheet.window = self.sheet; self.ignoreSheet.newItem = YES; - self.ignoreSheet.ignore = [AddressBook new]; + self.ignoreSheet.ignore = [IRCAddressBook new]; if ([imask isEqualToString:@"--"]) { self.ignoreSheet.ignore.hostmask = @""; @@ -239,34 +239,34 @@ - (void)load /* Identity */ if (NSObjectIsEmpty(self.config.nick)) { - self.nickText.stringValue = [Preferences defaultNickname]; + self.nickText.stringValue = [TPCPreferences defaultNickname]; } else { self.nickText.stringValue = self.config.nick; } if (NSObjectIsEmpty(self.config.username)) { - self.usernameText.stringValue = [Preferences defaultUsername]; + self.usernameText.stringValue = [TPCPreferences defaultUsername]; } else { self.usernameText.stringValue = self.config.username; } if (NSObjectIsEmpty(self.config.realName)) { - self.realNameText.stringValue = [Preferences defaultRealname]; + self.realNameText.stringValue = [TPCPreferences defaultRealname]; } else { self.realNameText.stringValue = self.config.realName; } if (self.config.altNicks.count > 0) { - self.altNicksText.stringValue = [self.config.altNicks componentsJoinedByString:NSWhitespaceCharacter]; + self.altNicksText.stringValue = [self.config.altNicks componentsJoinedByString:NSStringWhitespacePlaceholder]; } else { - self.altNicksText.stringValue = NSNullObject; + self.altNicksText.stringValue = NSStringEmptyPlaceholder; } self.nickPasswordText.stringValue = self.config.nickPassword; /* Messages */ - self.sleepQuitMessageText.string = self.config.sleepQuitMessage; - self.leavingCommentText.string = self.config.leavingComment; + self.sleepQuitMessageText.string = self.config.sleepQuitMessage; + self.leavingCommentText.string = self.config.leavingComment; /* Encoding */ [self.encodingCombo selectItemWithTag:self.config.encoding]; @@ -282,7 +282,7 @@ - (void)load /* Connect Commands */ self.invisibleCheck.state = self.config.invisibleMode; - self.loginCommandsText.string = [self.config.loginCommands componentsJoinedByString:NSNewlineCharacter]; + self.loginCommandsText.string = [self.config.loginCommands componentsJoinedByString:NSStringNewlinePlaceholder]; /* Flood Control */ self.floodControlDelayTimer.integerValue = self.config.floodControlDelayTimerInterval; @@ -317,7 +317,7 @@ - (void)save if (NSObjectIsEmpty(self.nameText.stringValue)) { if (NSObjectIsEmpty(realHost)) { - self.config.name = TXTLS(@"UNTITLED_CONNECTION_NAME"); + self.config.name = TXTLS(@"DefaultNewConnectionName"); } else { self.config.name = realHost; } @@ -351,19 +351,19 @@ - (void)save } /* Messages */ - self.config.sleepQuitMessage = self.sleepQuitMessageText.string; - self.config.leavingComment = self.leavingCommentText.string; + self.config.sleepQuitMessage = self.sleepQuitMessageText.string; + self.config.leavingComment = self.leavingCommentText.string; /* Encoding */ - self.config.encoding = self.encodingCombo.selectedTag; - self.config.fallbackEncoding = self.fallbackEncodingCombo.selectedTag; + self.config.encoding = self.encodingCombo.selectedTag; + self.config.fallbackEncoding = self.fallbackEncodingCombo.selectedTag; /* Proxy Server */ - self.config.proxyType = self.proxyCombo.selectedTag; - self.config.proxyHost = self.proxyHostText.stringValue; - self.config.proxyPort = self.proxyPortText.intValue; - self.config.proxyUser = self.proxyUserText.stringValue; - self.config.proxyPassword = self.proxyPasswordText.stringValue; + self.config.proxyType = self.proxyCombo.selectedTag; + self.config.proxyHost = self.proxyHostText.stringValue; + self.config.proxyPort = self.proxyPortText.intValue; + self.config.proxyUser = self.proxyUserText.stringValue; + self.config.proxyPassword = self.proxyPasswordText.stringValue; /* Connect Commands */ NSArray *commands = [self.loginCommandsText.string componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]]; @@ -449,15 +449,15 @@ - (void)ok:(id)sender NSMutableArray *ignores = self.config.ignores; for (NSInteger i = (ignores.count - 1); i >= 0; --i) { - AddressBook *g = [ignores safeObjectAtIndex:i]; + IRCAddressBook *g = [ignores safeObjectAtIndex:i]; if (NSObjectIsEmpty(g.hostmask)) { [ignores safeRemoveObjectAtIndex:i]; } } - if ([self.delegate respondsToSelector:@selector(ServerSheetOnOK:)]) { - [self.delegate ServerSheetOnOK:self]; + if ([self.delegate respondsToSelector:@selector(serverSheetOnOK:)]) { + [self.delegate serverSheetOnOK:self]; } [self endSheet]; @@ -482,7 +482,7 @@ - (void)proxyChanged:(id)sender { NSInteger tag = [self.proxyCombo selectedTag]; - BOOL enabled = (tag == PROXY_SOCKS4 || tag == PROXY_SOCKS5); + BOOL enabled = (tag == TXConnectionSocks4ProxyType || tag == TXConnectionSocks5ProxyType); [self.proxyHostText setEnabled:enabled]; [self.proxyPortText setEnabled:enabled]; @@ -510,12 +510,12 @@ - (void)addChannel:(id)sender IRCChannelConfig *c = [self.config.channels safeObjectAtIndex:sel]; conf = [c mutableCopy]; - conf.name = NSNullObject; + conf.name = NSStringEmptyPlaceholder; } self.channelSheet = nil; - self.channelSheet = [ChannelSheet new]; + self.channelSheet = [TDChannelSheet new]; self.channelSheet.delegate = self; self.channelSheet.window = self.sheet; self.channelSheet.config = conf; @@ -533,7 +533,7 @@ - (void)editChannel:(id)sender self.channelSheet = nil; - self.channelSheet = [ChannelSheet new]; + self.channelSheet = [TDChannelSheet new]; self.channelSheet.delegate = self; self.channelSheet.window = self.sheet; self.channelSheet.config = c; @@ -542,7 +542,7 @@ - (void)editChannel:(id)sender [self.channelSheet show]; } -- (void)ChannelSheetOnOK:(ChannelSheet *)sender +- (void)channelSheetOnOK:(TDChannelSheet *)sender { IRCChannelConfig *conf = sender.config; @@ -570,7 +570,7 @@ - (void)ChannelSheetOnOK:(ChannelSheet *)sender [self reloadChannelTable]; } -- (void)ChannelSheetWillClose:(ChannelSheet *)sender +- (void)channelSheetWillClose:(TDChannelSheet *)sender { self.channelSheet = nil; } @@ -612,16 +612,16 @@ - (void)addIgnore:(id)sender { self.ignoreSheet = nil; - self.ignoreSheet = [AddressBookSheet new]; + self.ignoreSheet = [TDCAddressBookSheet new]; self.ignoreSheet.delegate = self; self.ignoreSheet.window = self.sheet; - self.ignoreSheet.ignore = [AddressBook new]; + self.ignoreSheet.ignore = [IRCAddressBook new]; self.ignoreSheet.newItem = YES; if ([sender tag] == 4) { - self.ignoreSheet.ignore.entryType = ADDRESS_BOOK_TRACKING_ENTRY; + self.ignoreSheet.ignore.entryType = IRCAddressBookUserTrackingEntryType; } else { - self.ignoreSheet.ignore.entryType = ADDRESS_BOOK_IGNORE_ENTRY; + self.ignoreSheet.ignore.entryType = IRCAddressBookIgnoreEntryType; } [self.ignoreSheet start]; @@ -634,7 +634,7 @@ - (void)editIgnore:(id)sender self.ignoreSheet = nil; - self.ignoreSheet = [AddressBookSheet new]; + self.ignoreSheet = [TDCAddressBookSheet new]; self.ignoreSheet.delegate = self; self.ignoreSheet.window = self.sheet; self.ignoreSheet.ignore = [self.config.ignores safeObjectAtIndex:sel]; @@ -663,7 +663,7 @@ - (void)deleteIgnore:(id)sender [self.client populateISONTrackedUsersList:self.config.ignores]; } -- (void)ignoreItemSheetOnOK:(AddressBookSheet *)sender +- (void)ignoreItemSheetOnOK:(TDCAddressBookSheet *)sender { NSString *hostmask = [sender.ignore.hostmask trim]; @@ -682,7 +682,7 @@ - (void)ignoreItemSheetOnOK:(AddressBookSheet *)sender [self.client populateISONTrackedUsersList:self.config.ignores]; } -- (void)ignoreItemSheetWillClose:(AddressBookSheet *)sender +- (void)ignoreItemSheetWillClose:(TDCAddressBookSheet *)sender { self.ignoreSheet = nil; } @@ -720,21 +720,21 @@ - (id)tableView:(NSTableView *)sender objectValueForTableColumn:(NSTableColumn * NSString *keyhead = [tabInfo safeObjectAtIndex:0]; - if ([keyhead isEqualToString:ListSeparatorCellIndex] == NO) { - NSString *langkey = [NSString stringWithFormat:@"SERVER_SHEET_NAVIGATION_LIST_%@", keyhead]; + if ([keyhead isEqualToString:TXDefaultListSeperatorCellIndex] == NO) { + NSString *langkey = [NSString stringWithFormat:@"ServerSheet%@NavigationTreeItem", keyhead]; return TXTLS(langkey); } else { - return ListSeparatorCellIndex; + return TXDefaultListSeperatorCellIndex; } } else { - AddressBook *g = [self.config.ignores safeObjectAtIndex:row]; + IRCAddressBook *g = [self.config.ignores safeObjectAtIndex:row]; if ([columnId isEqualToString:@"type"]) { - if (g.entryType == ADDRESS_BOOK_IGNORE_ENTRY) { - return TXTLS(@"ADDRESS_BOOK_ENTRY_IGNORE_TYPE"); + if (g.entryType == IRCAddressBookIgnoreEntryType) { + return TXTLS(@"AddressBookIgnoreEntryType"); } else { - return TXTLS(@"ADDRESS_BOOK_EMTRY_TRACKING_TYPE"); + return TXTLS(@"AddressBookUserTrackingEntryType"); } } else { return g.hostmask; @@ -751,7 +751,7 @@ - (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)row NSString *keyhead = [tabInfo safeObjectAtIndex:0]; - if ([keyhead isEqualToString:ListSeparatorCellIndex]) { + if ([keyhead isEqualToString:TXDefaultListSeperatorCellIndex]) { return NO; } } @@ -815,9 +815,9 @@ - (BOOL)tableView:(NSTableView *)sender writeRowsWithIndexes:(NSIndexSet *)rows if (sender == self.channelTable) { NSArray *ary = [NSArray arrayWithObject:NSNumberWithInteger([rows firstIndex])]; - [pboard declareTypes:TABLE_ROW_TYPES owner:self]; + [pboard declareTypes:_tableRowTypes owner:self]; - [pboard setPropertyList:ary forType:TABLE_ROW_TYPE]; + [pboard setPropertyList:ary forType:_tableRowType]; } return YES; @@ -829,7 +829,7 @@ - (NSDragOperation)tableView:(NSTableView *)sender validateDrop:(id < NSDragging if (sender == self.channelTable) { NSPasteboard *pboard = [info draggingPasteboard]; - if (op == NSTableViewDropAbove && [pboard availableTypeFromArray:TABLE_ROW_TYPES]) { + if (op == NSTableViewDropAbove && [pboard availableTypeFromArray:_tableRowTypes]) { return NSDragOperationGeneric; } else { return NSDragOperationNone; @@ -845,10 +845,10 @@ - (BOOL)tableView:(NSTableView *)sender acceptDrop:(id < NSDraggingInfo >)info if (sender == self.channelTable) { NSPasteboard *pboard = [info draggingPasteboard]; - if (op == NSTableViewDropAbove && [pboard availableTypeFromArray:TABLE_ROW_TYPES]) { + if (op == NSTableViewDropAbove && [pboard availableTypeFromArray:_tableRowTypes]) { NSMutableArray *ary = self.config.channels; - NSArray *selectedRows = [pboard propertyListForType:TABLE_ROW_TYPE]; + NSArray *selectedRows = [pboard propertyListForType:_tableRowType]; NSInteger selectedRow = [selectedRows integerAtIndex:0]; IRCChannelConfig *target = [ary safeObjectAtIndex:selectedRow]; @@ -887,8 +887,8 @@ - (void)windowWillClose:(NSNotification *)note { [self.channelTable unregisterDraggedTypes]; - if ([self.delegate respondsToSelector:@selector(ServerSheetWillClose:)]) { - [self.delegate ServerSheetWillClose:self]; + if ([self.delegate respondsToSelector:@selector(serverSheetWillClose:)]) { + [self.delegate serverSheetWillClose:self]; } } diff --git a/Classes/Dialogs/SheetBase.m b/Classes/Dialogs/TDCSheetBase.m similarity index 97% rename from Classes/Dialogs/SheetBase.m rename to Classes/Dialogs/TDCSheetBase.m index 2168cbf2dd..f132035975 100755 --- a/Classes/Dialogs/SheetBase.m +++ b/Classes/Dialogs/TDCSheetBase.m @@ -2,8 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 - -@implementation SheetBase +@implementation TDCSheetBase @synthesize delegate; @synthesize window; diff --git a/Classes/Dialogs/TopicSheet.m b/Classes/Dialogs/TDCTopicSheet.m similarity index 86% rename from Classes/Dialogs/TopicSheet.m rename to Classes/Dialogs/TDCTopicSheet.m index df634c1973..7358397d61 100755 --- a/Classes/Dialogs/TopicSheet.m +++ b/Classes/Dialogs/TDCTopicSheet.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@implementation TopicSheet +@implementation TDCTopicSheet @synthesize uid; @synthesize cid; @@ -13,7 +13,7 @@ @implementation TopicSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"TopicSheet" owner:self]; + [NSBundle loadNibNamed:@"TDCTopicSheet" owner:self]; } return self; @@ -21,7 +21,7 @@ - (id)init - (void)start:(NSString *)topic { - MenuController *menu = self.delegate; + TXMenuController *menu = self.delegate; IRCChannel *c = [menu.world selectedChannel]; @@ -33,7 +33,8 @@ - (void)start:(NSString *)topic [menu.master.formattingMenu enableSheetField:self.text]; [self.header setStringValue:nheader]; - [self.text setAttributedStringValue:[topic attributedStringWithIRCFormatting:DefaultTextFieldFont + + [self.text setAttributedStringValue:[topic attributedStringWithIRCFormatting:TXDefaultTextFieldFont followFormattingPreference:NO]]; [self startSheet]; @@ -47,7 +48,7 @@ - (void)ok:(id)sender topicv = [self.text.attributedStringValue attributedStringToASCIIFormatting]; topicc = [topicv componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]]; - topicv = [topicc componentsJoinedByString:NSWhitespaceCharacter]; + topicv = [topicc componentsJoinedByString:NSStringWhitespacePlaceholder]; [self.delegate topicSheet:self onOK:topicv]; } diff --git a/Classes/Dialogs/WelcomeSheet.m b/Classes/Dialogs/TDCWelcomeSheet.m similarity index 84% rename from Classes/Dialogs/WelcomeSheet.m rename to Classes/Dialogs/TDCWelcomeSheet.m index a38d9f5dba..f245d63dcd 100755 --- a/Classes/Dialogs/WelcomeSheet.m +++ b/Classes/Dialogs/TDCWelcomeSheet.m @@ -3,12 +3,12 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface WelcomeSheet (Private) +@interface TDCWelcomeSheet (Private) - (void)updateOKButton; - (void)tableViewSelectionIsChanging:(NSNotification *)note; @end -@implementation WelcomeSheet +@implementation TDCWelcomeSheet @synthesize delegate; @synthesize okButton; @@ -36,7 +36,7 @@ - (void)show [self tableViewSelectionIsChanging:nil]; [self updateOKButton]; - [self.nickText setStringValue:[Preferences defaultNickname]]; + [self.nickText setStringValue:[TPCPreferences defaultNickname]]; [self startSheet]; } @@ -51,6 +51,7 @@ - (void)close - (void)onOK:(id)sender { NSMutableSet *set = [NSMutableSet set]; + NSMutableArray *chans = [NSMutableArray array]; for (__strong NSString *s in self.channels) { @@ -61,7 +62,7 @@ - (void)onOK:(id)sender if ([set containsObject:s] == NO) { [chans addObject:s]; - [set addObject:s]; + [set addObject:s]; } } } @@ -70,12 +71,12 @@ - (void)onOK:(id)sender [dic setBool:self.autoConnectCheck.state forKey:@"autoConnect"]; - [dic setObject:chans forKey:@"channels"]; - [dic setObject:self.nickText.stringValue forKey:@"nick"]; - [dic setObject:[self.hostCombo.stringValue cleanedServerHostmask] forKey:@"host"]; + [dic setObject:chans forKey:@"channels"]; + [dic setObject:self.nickText.stringValue forKey:@"nick"]; + [dic setObject:[self.hostCombo.stringValue cleanedServerHostmask] forKey:@"host"]; - if ([self.delegate respondsToSelector:@selector(WelcomeSheet:onOK:)]) { - [self.delegate WelcomeSheet:self onOK:dic]; + if ([self.delegate respondsToSelector:@selector(welcomeSheet:onOK:)]) { + [self.delegate welcomeSheet:self onOK:dic]; } [self endSheet]; @@ -88,7 +89,7 @@ - (void)onCancel:(id)sender - (void)onAddChannel:(id)sender { - [self.channels safeAddObject:NSNullObject]; + [self.channels safeAddObject:NSStringEmptyPlaceholder]; [self.channelTable reloadData]; @@ -146,7 +147,7 @@ - (void)textDidEndEditing:(NSNotification *)note NSInteger n = [self.channelTable editedRow]; if (n >= 0) { - NSString *s = [[[[note object] textStorage] string] copy]; + NSString *s = [[note object] textStorage].string.copy; [self.channels replaceObjectAtIndex:n withObject:s]; @@ -177,8 +178,8 @@ - (void)tableViewSelectionIsChanging:(NSNotification *)note - (void)windowWillClose:(NSNotification *)note { - if ([self.delegate respondsToSelector:@selector(WelcomeSheetWillClose:)]) { - [self.delegate WelcomeSheetWillClose:self]; + if ([self.delegate respondsToSelector:@selector(welcomeSheetWillClose:)]) { + [self.delegate welcomeSheetWillClose:self]; } } diff --git a/Classes/Dialogs/ChanBanExceptionSheet.m b/Classes/Dialogs/TDChanBanExceptionSheet.m similarity index 92% rename from Classes/Dialogs/ChanBanExceptionSheet.m rename to Classes/Dialogs/TDChanBanExceptionSheet.m index f517c41666..80c361d74d 100755 --- a/Classes/Dialogs/ChanBanExceptionSheet.m +++ b/Classes/Dialogs/TDChanBanExceptionSheet.m @@ -2,11 +2,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ChanBanExceptionSheet (Private) +@interface TDChanBanExceptionSheet (Private) - (void)reloadTable; @end -@implementation ChanBanExceptionSheet +@implementation TDChanBanExceptionSheet @synthesize list; @synthesize table; @@ -17,7 +17,7 @@ @implementation ChanBanExceptionSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"ChanBanExceptionSheet" owner:self]; + [NSBundle loadNibNamed:@"TDChanBanExceptionSheet" owner:self]; self.list = [NSMutableArray new]; self.modes = [NSMutableArray new]; @@ -100,13 +100,13 @@ - (void)onRemoveExceptions:(id)sender [trail appendFormat:@" %@", [iteml safeObjectAtIndex:0]]; } - if (indexTotal == MAXIMUM_SETS_PER_MODE) { + if (indexTotal == TXMaximumNodesPerModeCommand) { modeString = (id)[str stringByAppendingString:trail]; [self.modes safeAddObject:modeString]; [str setString:@"-"]; - [trail setString:NSNullObject]; + [trail setString:NSStringEmptyPlaceholder]; indexTotal = 0; } @@ -132,6 +132,7 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)sender - (id)tableView:(NSTableView *)sender objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row { NSArray *item = [self.list safeObjectAtIndex:row]; + NSString *col = [column identifier]; if ([col isEqualToString:@"mask"]) { diff --git a/Classes/Dialogs/ChanBanSheet.m b/Classes/Dialogs/TDChanBanSheet.m similarity index 93% rename from Classes/Dialogs/ChanBanSheet.m rename to Classes/Dialogs/TDChanBanSheet.m index d415991d22..a03466d321 100755 --- a/Classes/Dialogs/ChanBanSheet.m +++ b/Classes/Dialogs/TDChanBanSheet.m @@ -2,11 +2,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ChanBanSheet (Private) +@interface TDChanBanSheet (Private) - (void)reloadTable; @end -@implementation ChanBanSheet +@implementation TDChanBanSheet @synthesize list; @synthesize table; @@ -17,7 +17,7 @@ @implementation ChanBanSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"ChanBanSheet" owner:self]; + [NSBundle loadNibNamed:@"TDChanBanSheet" owner:self]; self.list = [NSMutableArray new]; self.modes = [NSMutableArray new]; @@ -100,13 +100,13 @@ - (void)onRemoveBans:(id)sender [trail appendFormat:@" %@", [iteml safeObjectAtIndex:0]]; } - if (indexTotal == MAXIMUM_SETS_PER_MODE) { + if (indexTotal == TXMaximumNodesPerModeCommand) { modeString = (id)[str stringByAppendingString:trail]; [self.modes safeAddObject:modeString]; [str setString:@"-"]; - [trail setString:NSNullObject]; + [trail setString:NSStringEmptyPlaceholder]; indexTotal = 0; } @@ -132,6 +132,7 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)sender - (id)tableView:(NSTableView *)sender objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row { NSArray *item = [self.list safeObjectAtIndex:row]; + NSString *col = [column identifier]; if ([col isEqualToString:@"mask"]) { diff --git a/Classes/Dialogs/ChanInviteExceptionSheet.m b/Classes/Dialogs/TDChanInviteExceptionSheet.m similarity index 92% rename from Classes/Dialogs/ChanInviteExceptionSheet.m rename to Classes/Dialogs/TDChanInviteExceptionSheet.m index e80a1f73ff..bd8d3dcbb7 100755 --- a/Classes/Dialogs/ChanInviteExceptionSheet.m +++ b/Classes/Dialogs/TDChanInviteExceptionSheet.m @@ -2,11 +2,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ChanInviteExceptionSheet (Private) +@interface TDChanInviteExceptionSheet (Private) - (void)reloadTable; @end -@implementation ChanInviteExceptionSheet +@implementation TDChanInviteExceptionSheet @synthesize list; @synthesize table; @@ -17,7 +17,7 @@ @implementation ChanInviteExceptionSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"ChanInviteExceptionSheet" owner:self]; + [NSBundle loadNibNamed:@"TDChanInviteExceptionSheet" owner:self]; self.list = [NSMutableArray new]; self.modes = [NSMutableArray new]; @@ -100,13 +100,13 @@ - (void)onRemoveExceptions:(id)sender [trail appendFormat:@" %@", [iteml safeObjectAtIndex:0]]; } - if (indexTotal == MAXIMUM_SETS_PER_MODE) { + if (indexTotal == TXMaximumNodesPerModeCommand) { modeString = (id)[str stringByAppendingString:trail]; [self.modes safeAddObject:modeString]; [str setString:@"-"]; - [trail setString:NSNullObject]; + [trail setString:NSStringEmptyPlaceholder]; indexTotal = 0; } @@ -132,6 +132,7 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)sender - (id)tableView:(NSTableView *)sender objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row { NSArray *item = [self.list safeObjectAtIndex:row]; + NSString *col = [column identifier]; if ([col isEqualToString:@"mask"]) { diff --git a/Classes/Dialogs/ChannelSheet.m b/Classes/Dialogs/TDChannelSheet.m similarity index 62% rename from Classes/Dialogs/ChannelSheet.m rename to Classes/Dialogs/TDChannelSheet.m index d3c3a63d47..b9ec6dd8fe 100755 --- a/Classes/Dialogs/ChannelSheet.m +++ b/Classes/Dialogs/TDChannelSheet.m @@ -3,9 +3,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define WINDOW_TOOLBAR_HEIGHT 25 +#define _TXWindowToolbarHeight 25 -@interface ChannelSheet (Private) +@interface TDChannelSheet (Private) - (void)load; - (void)save; - (void)update; @@ -13,7 +13,7 @@ - (void)update; - (void)firstPane:(NSView *)view; @end -@implementation ChannelSheet +@implementation TDChannelSheet @synthesize uid; @synthesize cid; @@ -40,7 +40,7 @@ @implementation ChannelSheet - (id)init { if ((self = [super init])) { - [NSBundle loadNibNamed:@"ChannelSheet" owner:self]; + [NSBundle loadNibNamed:@"TDChannelSheet" owner:self]; } return self; @@ -64,11 +64,13 @@ - (void)firstPane:(NSView *)view NSRect windowFrame = [self.sheet frame]; windowFrame.size.width = [view frame].size.width; - windowFrame.size.height = ([view frame].size.height + WINDOW_TOOLBAR_HEIGHT); - windowFrame.origin.y = (NSMaxY([self.sheet frame]) - ([view frame].size.height + WINDOW_TOOLBAR_HEIGHT)); + windowFrame.size.height = ([view frame].size.height + _TXWindowToolbarHeight); + + windowFrame.origin.y = (NSMaxY([self.sheet frame]) - + ([view frame].size.height + _TXWindowToolbarHeight)); if (NSObjectIsNotEmpty([self.contentView subviews])) { - [[[self.contentView subviews] safeObjectAtIndex:0] removeFromSuperview]; + [[self.contentView.subviews safeObjectAtIndex:0] removeFromSuperview]; } [self.sheet setFrame:windowFrame display:YES animate:YES]; @@ -106,32 +108,32 @@ - (void)close - (void)load { - self.nameText.stringValue = self.config.name; - self.modeText.stringValue = self.config.mode; - self.topicText.stringValue = self.config.topic; - self.passwordText.stringValue = self.config.password; + self.nameText.stringValue = self.config.name; + self.modeText.stringValue = self.config.mode; + self.topicText.stringValue = self.config.topic; + self.passwordText.stringValue = self.config.password; self.encryptKeyText.stringValue = self.config.encryptionKey; - self.growlCheck.state = self.config.growl; - self.autoJoinCheck.state = self.config.autoJoin; - self.ihighlights.state = self.config.ihighlights; - self.JPQActivityCheck.state = self.config.iJPQActivity; - self.inlineImagesCheck.state = self.config.inlineImages; + self.growlCheck.state = self.config.growl; + self.autoJoinCheck.state = self.config.autoJoin; + self.ihighlights.state = self.config.ihighlights; + self.JPQActivityCheck.state = self.config.iJPQActivity; + self.inlineImagesCheck.state = self.config.inlineImages; } - (void)save { - self.config.name = self.nameText.stringValue; - self.config.mode = self.modeText.stringValue; - self.config.topic = self.topicText.stringValue; - self.config.password = self.passwordText.stringValue; - self.config.encryptionKey = self.encryptKeyText.stringValue; + self.config.name = self.nameText.stringValue; + self.config.mode = self.modeText.stringValue; + self.config.topic = self.topicText.stringValue; + self.config.password = self.passwordText.stringValue; + self.config.encryptionKey = self.encryptKeyText.stringValue; - self.config.growl = self.growlCheck.state; - self.config.autoJoin = self.autoJoinCheck.state; - self.config.ihighlights = self.ihighlights.state; - self.config.iJPQActivity = self.JPQActivityCheck.state; - self.config.inlineImages = self.inlineImagesCheck.state; + self.config.growl = self.growlCheck.state; + self.config.autoJoin = self.autoJoinCheck.state; + self.config.ihighlights = self.ihighlights.state; + self.config.iJPQActivity = self.JPQActivityCheck.state; + self.config.inlineImages = self.inlineImagesCheck.state; if ([self.config.name isChannelName] == NO) { self.config.name = [@"#" stringByAppendingString:self.config.name]; @@ -161,8 +163,8 @@ - (void)ok:(id)sender { [self save]; - if ([self.delegate respondsToSelector:@selector(ChannelSheetOnOK:)]) { - [self.delegate ChannelSheetOnOK:self]; + if ([self.delegate respondsToSelector:@selector(channelSheetOnOK:)]) { + [self.delegate channelSheetOnOK:self]; } [self cancel:nil]; @@ -178,8 +180,8 @@ - (void)cancel:(id)sender - (void)windowWillClose:(NSNotification *)note { - if ([self.delegate respondsToSelector:@selector(ChannelSheetWillClose:)]) { - [self.delegate ChannelSheetWillClose:self]; + if ([self.delegate respondsToSelector:@selector(channelSheetWillClose:)]) { + [self.delegate channelSheetWillClose:self]; } } diff --git a/Classes/Dialogs/InputPromptDialog.m b/Classes/Dialogs/TVCInputPromptDialog.m similarity index 86% rename from Classes/Dialogs/InputPromptDialog.m rename to Classes/Dialogs/TVCInputPromptDialog.m index 931c6eb8f5..15c8f1c7db 100755 --- a/Classes/Dialogs/InputPromptDialog.m +++ b/Classes/Dialogs/TVCInputPromptDialog.m @@ -4,11 +4,11 @@ // Dirty NSAlert substitution -#define TEXT_CONTAINER_WIDTH 298.0 -#define TEXT_CONTAINER_PADDING 3 -#define TEXT_CONTAINER_HEIGHT_FIX 5 +#define _textContainerWidth 298.0 +#define _textContainerPadding 3 +#define _textContainerHeightFix 5 -@implementation InputPromptDialog +@implementation TVCInputPromptDialog @synthesize finalModalValue; @synthesize buttonClicked; @@ -30,7 +30,7 @@ - (void)alertWithMessageText:(NSString *)messageTitle informativeText:(NSString *)informativeText defaultUserInput:(NSString *)userInputText { - [NSBundle loadNibNamed:@"InputPromptDialog" owner:self]; + [NSBundle loadNibNamed:@"TVCInputPromptDialog" owner:self]; if (NSObjectIsNotEmpty(userInputText)) { [self.userInputField setStringValue:userInputText]; @@ -47,8 +47,9 @@ - (void)runModal NSRect infoTextFrame = [self.informationalText frame]; NSLayoutManager *layoutManager = [NSLayoutManager new]; + NSTextStorage *textStorage = [[NSTextStorage alloc] initWithString:[self.informationalText stringValue]]; - NSTextContainer *textContainer = [[NSTextContainer alloc] initWithContainerSize:NSMakeSize(TEXT_CONTAINER_WIDTH, FLT_MAX)]; + NSTextContainer *textContainer = [[NSTextContainer alloc] initWithContainerSize:NSMakeSize(_textContainerWidth, FLT_MAX)]; [layoutManager addTextContainer:textContainer]; @@ -61,13 +62,13 @@ - (void)runModal [layoutManager glyphRangeForTextContainer:textContainer]; - NSInteger newHeight = ([layoutManager usedRectForTextContainer:textContainer].size.height + TEXT_CONTAINER_HEIGHT_FIX); + NSInteger newHeight = ([layoutManager usedRectForTextContainer:textContainer].size.height + _textContainerHeightFix); NSInteger heightDiff = (infoTextFrame.size.height - newHeight); NSRect windowFrame = [self.dialogWindow frame]; - infoTextFrame.size.height = (newHeight + TEXT_CONTAINER_PADDING); - windowFrame.size.height = ((windowFrame.size.height - heightDiff) + TEXT_CONTAINER_PADDING); + infoTextFrame.size.height = (newHeight + _textContainerPadding); + windowFrame.size.height = ((windowFrame.size.height - heightDiff) + _textContainerPadding); [self.dialogWindow setFrame:windowFrame display:NO animate:NO]; [self.dialogWindow makeKeyAndOrderFront:nil]; diff --git a/Classes/Headers/DDInvocationGrabber.h b/Classes/Headers/DDInvocation.h similarity index 87% rename from Classes/Headers/DDInvocationGrabber.h rename to Classes/Headers/DDInvocation.h index f95388d0de..50de13d29d 100755 --- a/Classes/Headers/DDInvocationGrabber.h +++ b/Classes/Headers/DDInvocation.h @@ -23,17 +23,17 @@ */ typedef enum { - INVOCATION_MAIN_THREAD, - INVOCATION_PARENT_THREAD, - INVOCATION_BACKGROUND_THREAD, -} invocationThreadType; + DDInvocationMainThread, + DDInvocationParentThread, + DDInvocationBackgroundThread, +} DDInvocationThreadType; -@interface DDInvocationGrabber : NSProxy +@interface DDInvocation : NSProxy @property (nonatomic, strong) id target; @property (nonatomic, assign) BOOL waitUntilDone; @property (nonatomic, strong) NSThread *parentThread; @property (nonatomic, strong) NSInvocation *invocation; -@property (nonatomic, assign) invocationThreadType threadType; +@property (nonatomic, assign) DDInvocationThreadType threadType; + (id)invocationGrabber; - (id)prepareWithInvocationTarget:(id)inTarget; diff --git a/Classes/Headers/AsyncSocketExtensions.h b/Classes/Headers/GCDAsyncSocketExtensions.h similarity index 96% rename from Classes/Headers/AsyncSocketExtensions.h rename to Classes/Headers/GCDAsyncSocketExtensions.h index 2dc9d4be13..f9d9702657 100755 --- a/Classes/Headers/AsyncSocketExtensions.h +++ b/Classes/Headers/GCDAsyncSocketExtensions.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@class IRCClient; +#import "RLMAsyncSocket.h" @interface GCDAsyncSocket (GCDsyncSocketExtensions) + (id)socketWithDelegate:(id)aDelegate delegateQueue:(dispatch_queue_t)dq socketQueue:(dispatch_queue_t)sq; diff --git a/Classes/Headers/GTMNSString+HTML.h b/Classes/Headers/GTMEncodeHTML.h similarity index 100% rename from Classes/Headers/GTMNSString+HTML.h rename to Classes/Headers/GTMEncodeHTML.h diff --git a/Classes/Headers/GTMNSString+URLArguments.h b/Classes/Headers/GTMEncodeURL.h similarity index 100% rename from Classes/Headers/GTMNSString+URLArguments.h rename to Classes/Headers/GTMEncodeURL.h diff --git a/Classes/Headers/IRC.h b/Classes/Headers/IRC.h index 8f12dc61cc..612ae2d605 100755 --- a/Classes/Headers/IRC.h +++ b/Classes/Headers/IRC.h @@ -3,107 +3,104 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -// IRCCI stands for IRC Command Index — this prefix is used to differentiate -// the below definitions to avoid clashes because of how common the names are. +#define IRCCommandIndexAction @"ACTION" +#define IRCCommandIndexAdchat @"ADCHAT" +#define IRCCommandIndexAuthenticate @"AUTHENTICATE" +#define IRCCommandIndexAme @"AME" +#define IRCCommandIndexAmsg @"AMSG" +#define IRCCommandIndexAway @"AWAY" +#define IRCCommandIndexBan @"BAN" +#define IRCCommandIndexChatops @"CHATOPS" +#define IRCCommandIndexCap @"CAP" +#define IRCCommandIndexCaps @"CAPS" +#define IRCCommandIndexClear @"CLEAR" +#define IRCCommandIndexClearall @"CLEARALL" +#define IRCCommandIndexClientinfo @"CLIENTINFO" +#define IRCCommandIndexClose @"CLOSE" +#define IRCCommandIndexConn @"CONN" +#define IRCCommandIndexConnect @"CONN" +#define IRCCommandIndexCtcp @"CTCP" +#define IRCCommandIndexCtcpreply @"CTCPREPLY" +#define IRCCommandIndexCycle @"CYCLE" +#define IRCCommandIndexDcc @"DCC" +#define IRCCommandIndexDebug @"DEBUG" +#define IRCCommandIndexDehalfop @"DEHALFOP" +#define IRCCommandIndexDeop @"DEOP" +#define IRCCommandIndexDevoice @"DEVOICE" +#define IRCCommandIndexEcho @"ECHO" +#define IRCCommandIndexError @"ERROR" +#define IRCCommandIndexGline @"GLINE" +#define IRCCommandIndexGzline @"GZLINE" +#define IRCCommandIndexGlobops @"GLOBOPS" +#define IRCCommandIndexHalfop @"HALFOP" +#define IRCCommandIndexHop @"HOP" +#define IRCCommandIndexIcbadge @"ICBADGE" +#define IRCCommandIndexCcbadge @"CCBADGE" +#define IRCCommandIndexIgnore @"IGNORE" +#define IRCCommandIndexInvite @"INVITE" +#define IRCCommandIndexIson @"ISON" +#define IRCCommandIndexJ @"J" +#define IRCCommandIndexJoin @"JOIN" +#define IRCCommandIndexKb @"KB" +#define IRCCommandIndexKick @"KICK" +#define IRCCommandIndexKickban @"KICKBAN" +#define IRCCommandIndexKill @"KILL" +#define IRCCommandIndexLeave @"LEAVE" +#define IRCCommandIndexLagcheck @"LAGCHECK" +#define IRCCommandIndexList @"LIST" +#define IRCCommandIndexLoadPlugins @"LOAD_PLUGINS" +#define IRCCommandIndexLocops @"LOCOPS" +#define IRCCommandIndexM @"M" +#define IRCCommandIndexMe @"ME" +#define IRCCommandIndexMode @"MODE" +#define IRCCommandIndexMsg @"MSG" +#define IRCCommandIndexMute @"MUTE" +#define IRCCommandIndexMylag @"MYLAG" +#define IRCCommandIndexMyversion @"MYVERSION" +#define IRCCommandIndexNachat @"NACHAT" +#define IRCCommandIndexNames @"NAMES" +#define IRCCommandIndexNick @"NICK" +#define IRCCommandIndexNotice @"NOTICE" +#define IRCCommandIndexOmsg @"OMSG" +#define IRCCommandIndexOnotice @"ONOTICE" +#define IRCCommandIndexOp @"OP" +#define IRCCommandIndexPart @"PART" +#define IRCCommandIndexPass @"PASS" +#define IRCCommandIndexPing @"PING" +#define IRCCommandIndexPong @"PONG" +#define IRCCommandIndexPrivmsg @"PRIVMSG" +#define IRCCommandIndexQuery @"QUERY" +#define IRCCommandIndexQuit @"QUIT" +#define IRCCommandIndexQuote @"QUOTE" +#define IRCCommandIndexRaw @"RAW" +#define IRCCommandIndexRejoin @"REJOIN" +#define IRCCommandIndexRemove @"REMOVE" +#define IRCCommandIndexSend @"SEND" +#define IRCCommandIndexServer @"SERVER" +#define IRCCommandIndexShun @"SHUN" +#define IRCCommandIndexT @"T" +#define IRCCommandIndexTempshun @"TEMPSHUN" +#define IRCCommandIndexTime @"TIME" +#define IRCCommandIndexTimer @"TIMER" +#define IRCCommandIndexTopic @"TOPIC" +#define IRCCommandIndexUmode @"UMODE" +#define IRCCommandIndexUnban @"UNBAN" +#define IRCCommandIndexUnignore @"UNIGNORE" +#define IRCCommandIndexUnloadPlugins @"UNLOAD_PLUGINS" +#define IRCCommandIndexUnmute @"UNMUTE" +#define IRCCommandIndexUser @"USER" +#define IRCCommandIndexUserinfo @"USERINFO" +#define IRCCommandIndexVersion @"VERSION" +#define IRCCommandIndexVoice @"VOICE" +#define IRCCommandIndexWallops @"WALLOPS" +#define IRCCommandIndexWatch @"WATCH" +#define IRCCommandIndexWeights @"WEIGHTS" +#define IRCCommandIndexWho @"WHO" +#define IRCCommandIndexWhois @"WHOIS" +#define IRCCommandIndexWhowas @"WHOWAS" +#define IRCCommandIndexZline @"ZLINE" +#define IRCCommandIndexSme @"SME" +#define IRCCommandIndexSmsg @"SMSG" -#define IRCCI_ACTION @"ACTION" -#define IRCCI_ADCHAT @"ADCHAT" -#define IRCCI_AUTHENTICATE @"AUTHENTICATE" -#define IRCCI_AME @"AME" -#define IRCCI_AMSG @"AMSG" -#define IRCCI_AWAY @"AWAY" -#define IRCCI_BAN @"BAN" -#define IRCCI_CHATOPS @"CHATOPS" -#define IRCCI_CAP @"CAP" -#define IRCCI_CAPS @"CAPS" -#define IRCCI_CLEAR @"CLEAR" -#define IRCCI_CLEARALL @"CLEARALL" -#define IRCCI_CLIENTINFO @"CLIENTINFO" -#define IRCCI_CLOSE @"CLOSE" -#define IRCCI_CONN @"CONN" -#define IRCCI_CONNECT @"CONN" -#define IRCCI_CTCP @"CTCP" -#define IRCCI_CTCPREPLY @"CTCPREPLY" -#define IRCCI_CYCLE @"CYCLE" -#define IRCCI_DCC @"DCC" -#define IRCCI_DEBUG @"DEBUG" -#define IRCCI_DEHALFOP @"DEHALFOP" -#define IRCCI_DEOP @"DEOP" -#define IRCCI_DEVOICE @"DEVOICE" -#define IRCCI_ECHO @"ECHO" -#define IRCCI_ERROR @"ERROR" -#define IRCCI_GLINE @"GLINE" -#define IRCCI_GZLINE @"GZLINE" -#define IRCCI_GLOBOPS @"GLOBOPS" -#define IRCCI_HALFOP @"HALFOP" -#define IRCCI_HOP @"HOP" -#define IRCCI_ICBADGE @"ICBADGE" -#define IRCCI_CCBADGE @"CCBADGE" -#define IRCCI_IGNORE @"IGNORE" -#define IRCCI_INVITE @"INVITE" -#define IRCCI_ISON @"ISON" -#define IRCCI_J @"J" -#define IRCCI_JOIN @"JOIN" -#define IRCCI_KB @"KB" -#define IRCCI_KICK @"KICK" -#define IRCCI_KICKBAN @"KICKBAN" -#define IRCCI_KILL @"KILL" -#define IRCCI_LEAVE @"LEAVE" -#define IRCCI_LAGCHECK @"LAGCHECK" -#define IRCCI_LIST @"LIST" -#define IRCCI_LOAD_PLUGINS @"LOAD_PLUGINS" -#define IRCCI_LOCOPS @"LOCOPS" -#define IRCCI_M @"M" -#define IRCCI_ME @"ME" -#define IRCCI_MODE @"MODE" -#define IRCCI_MSG @"MSG" -#define IRCCI_MUTE @"MUTE" -#define IRCCI_MYLAG @"MYLAG" -#define IRCCI_MYVERSION @"MYVERSION" -#define IRCCI_NACHAT @"NACHAT" -#define IRCCI_NAMES @"NAMES" -#define IRCCI_NICK @"NICK" -#define IRCCI_NOTICE @"NOTICE" -#define IRCCI_OMSG @"OMSG" -#define IRCCI_ONOTICE @"ONOTICE" -#define IRCCI_OP @"OP" -#define IRCCI_PART @"PART" -#define IRCCI_PASS @"PASS" -#define IRCCI_PING @"PING" -#define IRCCI_PONG @"PONG" -#define IRCCI_PRIVMSG @"PRIVMSG" -#define IRCCI_QUERY @"QUERY" -#define IRCCI_QUIT @"QUIT" -#define IRCCI_QUOTE @"QUOTE" -#define IRCCI_RAW @"RAW" -#define IRCCI_REJOIN @"REJOIN" -#define IRCCI_REMOVE @"REMOVE" -#define IRCCI_SEND @"SEND" -#define IRCCI_SERVER @"SERVER" -#define IRCCI_SHUN @"SHUN" -#define IRCCI_T @"T" -#define IRCCI_TEMPSHUN @"TEMPSHUN" -#define IRCCI_TIME @"TIME" -#define IRCCI_TIMER @"TIMER" -#define IRCCI_TOPIC @"TOPIC" -#define IRCCI_UMODE @"UMODE" -#define IRCCI_UNBAN @"UNBAN" -#define IRCCI_UNIGNORE @"UNIGNORE" -#define IRCCI_UNLOAD_PLUGINS @"UNLOAD_PLUGINS" -#define IRCCI_UNMUTE @"UNMUTE" -#define IRCCI_USER @"USER" -#define IRCCI_USERINFO @"USERINFO" -#define IRCCI_VERSION @"VERSION" -#define IRCCI_VOICE @"VOICE" -#define IRCCI_WALLOPS @"WALLOPS" -#define IRCCI_WATCH @"WATCH" -#define IRCCI_WEIGHTS @"WEIGHTS" -#define IRCCI_WHO @"WHO" -#define IRCCI_WHOIS @"WHOIS" -#define IRCCI_WHOWAS @"WHOWAS" -#define IRCCI_ZLINE @"ZLINE" -#define IRCCI_SME @"SME" -#define IRCCI_SMSG @"SMSG" - -#define MAXIMUM_IRC_BODY_LEN 520 -#define MAXIMUM_SETS_PER_MODE 4 +#define TXMaximumIRCBodyLength 520 +#define TXMaximumNodesPerModeCommand 4 diff --git a/Classes/Headers/AddressBook.h b/Classes/Headers/IRCAddressBook.h similarity index 83% rename from Classes/Headers/AddressBook.h rename to Classes/Headers/IRCAddressBook.h index f0584a54e4..1c84383c0f 100755 --- a/Classes/Headers/AddressBook.h +++ b/Classes/Headers/IRCAddressBook.h @@ -3,11 +3,11 @@ // Converted to ARC Support on Thursday, June 09, 2012 typedef enum { - ADDRESS_BOOK_IGNORE_ENTRY, - ADDRESS_BOOK_TRACKING_ENTRY -} AddressBookEntryType; + IRCAddressBookIgnoreEntryType, + IRCAddressBookUserTrackingEntryType +} IRCAddressBookEntryType; -@interface AddressBook : NSObject +@interface IRCAddressBook : NSObject @property (nonatomic, assign) NSInteger cid; @property (nonatomic, strong) NSString *hostmask; @property (nonatomic, assign) BOOL ignorePublicMsg; @@ -19,7 +19,7 @@ typedef enum { @property (nonatomic, assign) BOOL notifyJoins; @property (nonatomic, strong) NSString *hostmaskRegex; @property (nonatomic, assign) BOOL ignorePMHighlights; -@property (nonatomic, assign) AddressBookEntryType entryType; +@property (nonatomic, assign) IRCAddressBookEntryType entryType; - (id)initWithDictionary:(NSDictionary *)dic; - (NSDictionary *)dictionaryValue; diff --git a/Classes/Headers/IRCChannel.h b/Classes/Headers/IRCChannel.h index 89d3beb4b3..641a436ba3 100755 --- a/Classes/Headers/IRCChannel.h +++ b/Classes/Headers/IRCChannel.h @@ -3,14 +3,17 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@class IRCClient; +#import "IRCTreeItem.h" + +@class IRCUser, TVCLogLine, TLOFileLogger; +@class IRCClient, IRCChannelConfig, IRCChannelMode; typedef enum { IRCChannelParted, IRCChannelJoining, IRCChannelJoined, IRCChannelTerminated, -} ChannelStatus; +} IRCChannelStatus; @interface IRCChannel : IRCTreeItem @property (nonatomic, weak) IRCClient *client; @@ -26,10 +29,10 @@ typedef enum { @property (nonatomic, assign) BOOL isModeInit; @property (nonatomic, assign) BOOL isActive; @property (nonatomic, assign) BOOL errLastJoin; -@property (nonatomic, assign) ChannelStatus status; +@property (nonatomic, assign) IRCChannelStatus status; @property (nonatomic, assign) BOOL isChannel; @property (nonatomic, assign) BOOL isTalk; -@property (nonatomic, strong) FileLogger *logFile; +@property (nonatomic, strong) TLOFileLogger *logFile; @property (nonatomic, weak) NSString *name; @property (nonatomic, weak) NSString *password; @@ -45,8 +48,8 @@ typedef enum { - (void)deactivate; - (void)detectOutgoingConversation:(NSString *)text; -- (BOOL)print:(LogLine *)line; -- (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML; +- (BOOL)print:(TVCLogLine *)line; +- (BOOL)print:(TVCLogLine *)line withHTML:(BOOL)rawHTML; - (void)addMember:(IRCUser *)user; - (void)addMember:(IRCUser *)user reload:(BOOL)reload; diff --git a/Classes/Headers/IRCChannelConfig.h b/Classes/Headers/IRCChannelConfig.h index 5cc2a60e00..f583b3657b 100755 --- a/Classes/Headers/IRCChannelConfig.h +++ b/Classes/Headers/IRCChannelConfig.h @@ -4,12 +4,12 @@ // Converted to ARC Support on Thursday, June 09, 2012 typedef enum { - CHANNEL_TYPE_CHANNEL, - CHANNEL_TYPE_TALK, -} ChannelType; + IRCChannelNormalType, + IRCChannelPrivateMessageType, +} IRCChannelType; @interface IRCChannelConfig : NSObject -@property (nonatomic, assign) ChannelType type; +@property (nonatomic, assign) IRCChannelType type; @property (nonatomic, strong) NSString *name; @property (nonatomic, strong) NSString *password; @property (nonatomic, assign) BOOL autoJoin; diff --git a/Classes/Headers/IRCChannelMode.h b/Classes/Headers/IRCChannelMode.h index 61c417b95e..779f49b5c6 100755 --- a/Classes/Headers/IRCChannelMode.h +++ b/Classes/Headers/IRCChannelMode.h @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@class IRCModeInfo; +@class IRCModeInfo, IRCISupportInfo; @interface IRCChannelMode : NSObject @property (nonatomic, weak) IRCISupportInfo *isupport; diff --git a/Classes/Headers/IRCClient.h b/Classes/Headers/IRCClient.h index 9cac58e4e1..304b3d2e38 100755 --- a/Classes/Headers/IRCClient.h +++ b/Classes/Headers/IRCClient.h @@ -2,115 +2,39 @@ // Modifications by Codeux Software // You can redistribute it and/or modify it under the new BSD license. -@class IRCWorld; +#import "IRCTreeItem.h" +#import "TVCLogLine.h" +#import "TLOGrowlController.h" + +@class IRCMessage; +@class IRCChannel, IRCClientConfig, IRCConnection; +@class IRCISupportInfo, IRCWorld, TLOFileLogger; +@class TLOTimer, TDCListDialog, TDChanBanSheet; +@class TDChanBanExceptionSheet, TDChanInviteExceptionSheet; typedef enum { - CONNECT_NORMAL, - CONNECT_RETRY, - CONNECT_RECONNECT, - CONNECT_BADSSL_CRT_RECONNECT, -} ConnectMode; + IRCConnectNormalMode, + IRCConnectionRetryMode, + IRCNormalReconnectionMode, + IRCBadSSLCertificateReconnectMode, +} IRCConnectMode; typedef enum { - DISCONNECT_NORMAL, - DISCONNECT_TRIAL_PERIOD, - DISCONNECT_BAD_SSL_CERT, - DISCONNECT_SLEEP_MODE, -} DisconnectType; + IRCDisconnectNormalMode, + IRCTrialPeriodDisconnectMode, + IRCBadSSLCertificateDisconnectMode, + IRCSleepModeDisconnectMode, +} IRCDisconnectType; @interface IRCClient : IRCTreeItem -{ - IRCWorld *world; - IRCConnection *conn; - IRCClientConfig *config; - IRCISupportInfo *isupport; - - IRCChannel *whoisChannel; - IRCChannel *lastSelectedChannel; - - NSMutableArray *channels; - NSMutableArray *highlights; - NSMutableArray *commandQueue; - - NSMutableDictionary *trackedUsers; - - NSInteger connectDelay; - NSInteger tryingNickNumber; - - NSMutableArray *pendingCaps; - NSMutableArray *acceptedCaps; - - NSUInteger capPaused; - - BOOL isAway; - BOOL hasIRCopAccess; - - BOOL sendLagcheckToChannel; - - BOOL isIdentifiedWithSASL; - BOOL reconnectEnabled; - BOOL rawModeEnabled; - BOOL retryEnabled; - BOOL isConnecting; - BOOL isConnected; - BOOL isLoggedIn; - BOOL isQuitting; - - BOOL serverHasNickServ; - BOOL autojoinInitialized; - - BOOL userhostInNames; - BOOL multiPrefix; - BOOL identifyMsg; - BOOL identifyCTCP; - BOOL inWhoInfoRun; - BOOL inSASLRequest; - BOOL inWhoWasRun; - BOOL inFirstISONRun; - - CFAbsoluteTime lastLagCheck; - - NSStringEncoding encoding; - - NSString *logDate; - - NSString *inputNick; - NSString *sentNick; - NSString *myNick; - NSString *myHost; - - NSString *serverHostname; - - Timer *isonTimer; - Timer *pongTimer; - Timer *retryTimer; - Timer *autoJoinTimer; - Timer *reconnectTimer; - Timer *commandQueueTimer; - - ConnectMode connectType; - DisconnectType disconnectType; - - ListDialog *channelListDialog; - ChanBanSheet *chanBanListSheet; - ChanBanExceptionSheet *banExceptionSheet; - ChanInviteExceptionSheet *inviteExceptionSheet; - - NSInteger lastMessageReceived; - - FileLogger *logFile; - -#ifdef IS_TRIAL_BINARY - Timer *trialPeriodTimer; -#endif -} - @property (nonatomic, strong) IRCWorld *world; @property (nonatomic, strong) IRCConnection *conn; @property (nonatomic, strong) IRCClientConfig *config; @property (nonatomic, strong) IRCISupportInfo *isupport; @property (nonatomic, strong) IRCChannel *whoisChannel; @property (nonatomic, strong) IRCChannel *lastSelectedChannel; +@property (nonatomic, assign) IRCConnectMode connectType; +@property (nonatomic, assign) IRCDisconnectType disconnectType; @property (nonatomic, strong) NSMutableArray *channels; @property (nonatomic, strong) NSMutableArray *highlights; @property (nonatomic, strong) NSMutableArray *commandQueue; @@ -118,8 +42,9 @@ typedef enum { @property (nonatomic, strong) NSMutableArray *pendingCaps; @property (nonatomic, strong) NSMutableArray *acceptedCaps; @property (nonatomic, assign) CFAbsoluteTime lastLagCheck; -@property (nonatomic, assign, setter=autoConnect:, getter=connectDelay) NSInteger connectDelay; +@property (nonatomic, assign, setter=autoConnect:) NSInteger connectDelay; @property (nonatomic, assign) NSInteger tryingNickNumber; +@property (nonatomic, assign) NSUInteger capPaused; @property (nonatomic, assign) BOOL isAway; @property (nonatomic, assign) BOOL inWhoInfoRun; @property (nonatomic, assign) BOOL inWhoWasRun; @@ -141,7 +66,7 @@ typedef enum { @property (nonatomic, assign) BOOL autojoinInitialized; @property (nonatomic, assign) BOOL sendLagcheckToChannel; @property (nonatomic, assign) BOOL isIdentifiedWithSASL; -@property (nonatomic, strong) FileLogger *logFile; +@property (nonatomic, strong) TLOFileLogger *logFile; @property (nonatomic, assign) NSStringEncoding encoding; @property (nonatomic, strong) NSString *logDate; @property (nonatomic, strong) NSString *inputNick; @@ -149,19 +74,22 @@ typedef enum { @property (nonatomic, strong) NSString *myNick; @property (nonatomic, strong) NSString *myHost; @property (nonatomic, strong) NSString *serverHostname; -@property (nonatomic, strong) Timer *isonTimer; -@property (nonatomic, strong) Timer *pongTimer; -@property (nonatomic, strong) Timer *retryTimer; -@property (nonatomic, strong) Timer *autoJoinTimer; -@property (nonatomic, strong) Timer *reconnectTimer; -@property (nonatomic, strong) Timer *commandQueueTimer; +@property (nonatomic, strong) TLOTimer *isonTimer; +@property (nonatomic, strong) TLOTimer *pongTimer; +@property (nonatomic, strong) TLOTimer *retryTimer; +@property (nonatomic, strong) TLOTimer *autoJoinTimer; +@property (nonatomic, strong) TLOTimer *reconnectTimer; +@property (nonatomic, strong) TLOTimer *commandQueueTimer; + +#ifdef IS_TRIAL_BINARY +@property (nonatomic, strong) Timer *trialPeriodTimer; +#endif + @property (nonatomic, assign) NSInteger lastMessageReceived; -@property (nonatomic, assign) ConnectMode connectType; -@property (nonatomic, assign) DisconnectType disconnectType; -@property (nonatomic, strong) ListDialog *channelListDialog; -@property (nonatomic, strong) ChanBanSheet *chanBanListSheet; -@property (nonatomic, strong) ChanBanExceptionSheet *banExceptionSheet; -@property (nonatomic, strong) ChanInviteExceptionSheet *inviteExceptionSheet; +@property (nonatomic, strong) TDCListDialog *channelListDialog; +@property (nonatomic, strong) TDChanBanSheet *chanBanListSheet; +@property (nonatomic, strong) TDChanBanExceptionSheet *banExceptionSheet; +@property (nonatomic, strong) TDChanInviteExceptionSheet *inviteExceptionSheet; - (void)setup:(IRCClientConfig *)seed; - (void)updateConfig:(IRCClientConfig *)seed; @@ -175,13 +103,13 @@ typedef enum { - (BOOL)isReconnecting; -- (AddressBook *)checkIgnoreAgainstHostmask:(NSString *)host withMatches:(NSArray *)matches; +- (IRCAddressBook *)checkIgnoreAgainstHostmask:(NSString *)host withMatches:(NSArray *)matches; - (BOOL)encryptOutgoingMessage:(NSString **)message channel:(IRCChannel *)chan; - (void)decryptIncomingMessage:(NSString **)message channel:(IRCChannel *)chan; - (void)connect; -- (void)connect:(ConnectMode)mode; +- (void)connect:(IRCConnectMode)mode; - (void)disconnect; - (void)quit; - (void)quit:(NSString *)comment; @@ -239,13 +167,13 @@ typedef enum { - (BOOL)printRawHTMLToCurrentChannelWithoutTime:(NSString *)text receivedAt:(NSDate*)receivedAt; - (BOOL)printRawHTMLToCurrentChannel:(NSString *)text withTimestamp:(BOOL)showTime receivedAt:(NSDate*)receivedAt; -- (BOOL)printBoth:(id)chan type:(LogLineType)type text:(NSString *)text; -- (BOOL)printBoth:(id)chan type:(LogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt; -- (BOOL)printBoth:(id)chan type:(LogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified; -- (BOOL)printBoth:(id)chan type:(LogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate*)receivedAt; -- (BOOL)printChannel:(IRCChannel *)channel type:(LogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt; -- (BOOL)printAndLog:(LogLine *)line withHTML:(BOOL)rawHTML; -- (BOOL)printChannel:(IRCChannel *)channel type:(LogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate*)receivedAt; +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type text:(NSString *)text; +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt; +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified; +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate *)receivedAt; +- (BOOL)printChannel:(IRCChannel *)channel type:(TVCLogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt; +- (BOOL)printAndLog:(TVCLogLine *)line withHTML:(BOOL)rawHTML; +- (BOOL)printChannel:(IRCChannel *)channel type:(TVCLogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate *)receivedAt; - (void)printSystem:(id)channel text:(NSString *)text; - (void)printSystem:(id)channel text:(NSString *)text receivedAt:(NSDate*)receivedAt; - (void)printSystemBoth:(id)channel text:(NSString *)text; @@ -259,12 +187,11 @@ typedef enum { - (void)printErrorReply:(IRCMessage *)m channel:(IRCChannel *)channel; - (void)printError:(NSString *)error; -- (BOOL)notifyEvent:(NotificationType)type lineType:(LogLineType)ltype; -- (BOOL)notifyEvent:(NotificationType)type lineType:(LogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text; -- (BOOL)notifyText:(NotificationType)type lineType:(LogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text; +- (BOOL)notifyEvent:(TXNotificationType)type lineType:(TVCLogLineType)ltype; +- (BOOL)notifyEvent:(TXNotificationType)type lineType:(TVCLogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text; +- (BOOL)notifyText:(TXNotificationType)type lineType:(TVCLogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text; - (void)populateISONTrackedUsersList:(NSMutableArray *)ignores; -- (BOOL)outputRuleMatchedInMessage:(NSString *)raw inChannel:(IRCChannel *)chan withLineType:(LogLineType)type; - -@end +- (BOOL)outputRuleMatchedInMessage:(NSString *)raw inChannel:(IRCChannel *)chan withLineType:(TVCLogLineType)type; +@end \ No newline at end of file diff --git a/Classes/Headers/IRCClientConfig.h b/Classes/Headers/IRCClientConfig.h index 2324d43f88..969755384a 100755 --- a/Classes/Headers/IRCClientConfig.h +++ b/Classes/Headers/IRCClientConfig.h @@ -3,15 +3,15 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define FLOOD_CONTROL_DEFAULT_DELAY_TIMER 2 -#define FLOOD_CONTROL_DEFAULT_MESSAGE_COUNT 2 +#define TXFloodControlDefaultDelayTimer 2 +#define TXFloodControlDefaultMessageCount 2 typedef enum { - PROXY_NONE = 0, - PROXY_SOCKS_SYSTEM = 1, - PROXY_SOCKS4 = 4, - PROXY_SOCKS5 = 5, -} ProxyType; + TXConnectionNoProxyType = 0, + TXConnectionSystemSocksProxyType = 1, + TXConnectionSocks4ProxyType = 4, + TXConnectionSocks5ProxyType = 5, +} TXConnectionProxyType; NSComparisonResult channelDataSort(IRCChannel *s1, IRCChannel *s2, void *context); @@ -28,7 +28,7 @@ NSComparisonResult channelDataSort(IRCChannel *s1, IRCChannel *s2, void *context @property (nonatomic, strong) NSString *realName; @property (nonatomic, strong) NSString *nickPassword; @property (nonatomic, strong) NSMutableArray *altNicks; -@property (nonatomic, assign) ProxyType proxyType; +@property (nonatomic, assign) TXConnectionProxyType proxyType; @property (nonatomic, strong) NSString *proxyHost; @property (nonatomic, assign) NSInteger proxyPort; @property (nonatomic, strong) NSString *proxyUser; diff --git a/Classes/Headers/IRCColorFormat.h b/Classes/Headers/IRCColorFormat.h index bed06a4a89..5a9c6556eb 100755 --- a/Classes/Headers/IRCColorFormat.h +++ b/Classes/Headers/IRCColorFormat.h @@ -2,6 +2,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 +#import "TVCTextField.h" + typedef enum { IRCTextFormatterBoldEffect, IRCTextFormatterItalicEffect, @@ -10,17 +12,17 @@ typedef enum { IRCTextFormatterBackgroundColorEffect, } IRCTextFormatterEffectType; -#define MAXIMUM_FORMATTING_LENGTH 300 +#define TXMaximumRainbowTextFormattingLength 300 @interface NSAttributedString (IRCTextFormatter) - (NSString *)attributedStringToASCIIFormatting; - (NSString *)attributedStringToASCIIFormatting:(NSMutableAttributedString **)string - lineType:(LogLineType)type + lineType:(TVCLogLineType)type channel:(NSString *)chan hostmask:(NSString *)host; @end -@interface TextField (TextFieldFormattingHelper) +@interface TVCTextField (TextFieldFormattingHelper) - (void)sanitizeIRCCompatibleAttributedString:(BOOL)clearAttributes; - (BOOL)IRCFormatterAttributeSetInRange:(IRCTextFormatterEffectType)effect diff --git a/Classes/Headers/IRCConnection.h b/Classes/Headers/IRCConnection.h index 62a339fef6..15672d6110 100755 --- a/Classes/Headers/IRCConnection.h +++ b/Classes/Headers/IRCConnection.h @@ -3,9 +3,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 +@class TLOSocketClient; + @interface IRCConnection : NSObject @property (nonatomic, unsafe_unretained) id delegate; -@property (nonatomic, strong) Timer *timer; +@property (nonatomic, strong) TLOTimer *timer; @property (nonatomic, strong) NSString *host; @property (nonatomic, assign) NSInteger port; @property (nonatomic, assign) BOOL useSSL; @@ -23,7 +25,7 @@ @property (nonatomic, readonly) BOOL connected; @property (nonatomic, readonly) BOOL readyToSend; @property (nonatomic, assign) BOOL loggedIn; -@property (nonatomic, strong) TCPClient *conn; +@property (nonatomic, strong) TLOSocketClient *conn; @property (nonatomic, strong) NSMutableArray *sendQueue; @property (nonatomic, assign) BOOL sending; diff --git a/Classes/Headers/IRCExtras.h b/Classes/Headers/IRCExtras.h index 24d44c8988..aa2141057b 100755 --- a/Classes/Headers/IRCExtras.h +++ b/Classes/Headers/IRCExtras.h @@ -2,8 +2,6 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@class IRCWorld; - @interface IRCExtras : NSObject @property (nonatomic, weak) IRCWorld *world; diff --git a/Classes/Headers/IRCISupportInfo.h b/Classes/Headers/IRCISupportInfo.h index 52dccc77c1..acffd28b8b 100755 --- a/Classes/Headers/IRCISupportInfo.h +++ b/Classes/Headers/IRCISupportInfo.h @@ -3,11 +3,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define MODES_SIZE 52 +#define TXModesSize 52 @interface IRCISupportInfo : NSObject { - unsigned char modes[MODES_SIZE]; + unsigned char modes[TXModesSize]; } @property (nonatomic, assign) NSInteger nickLen; diff --git a/Classes/Headers/IRCMessage.h b/Classes/Headers/IRCMessage.h index b7a147ea54..53f7c4d6fe 100755 --- a/Classes/Headers/IRCMessage.h +++ b/Classes/Headers/IRCMessage.h @@ -2,6 +2,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 +@class IRCPrefix; + @interface IRCMessage : NSObject @property (nonatomic, strong) NSDate *receivedAt; @property (nonatomic, strong) IRCPrefix *sender; diff --git a/Classes/Headers/IRCTreeItem.h b/Classes/Headers/IRCTreeItem.h index c23e40eaf4..5c66d26ef3 100755 --- a/Classes/Headers/IRCTreeItem.h +++ b/Classes/Headers/IRCTreeItem.h @@ -3,11 +3,12 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@class IRCWorld, IRCClient, IRCChannel, InputHistory, LogController; +@class TVCLogController, IRCClient, IRCChannel; +@class TLOInputHistory, IRCWorld; @interface IRCTreeItem : NSObject @property (nonatomic, assign) NSInteger uid; -@property (nonatomic, strong) LogController *log; +@property (nonatomic, strong) TVCLogController *log; @property (nonatomic, assign) BOOL isKeyword; @property (nonatomic, assign) BOOL isUnread; @property (nonatomic, assign) BOOL isNewTalk; @@ -20,7 +21,7 @@ @property (nonatomic, weak) IRCClient *client; @property (nonatomic, weak) NSString *label; @property (nonatomic, weak) NSString *name; -@property (nonatomic, strong) InputHistory *inputHistory; +@property (nonatomic, strong) TLOInputHistory *inputHistory; @property (nonatomic, strong) NSAttributedString *currentInputHistory; - (void)resetState; diff --git a/Classes/Headers/IRCUser.h b/Classes/Headers/IRCUser.h index fb405ce3ca..980e9375ae 100755 --- a/Classes/Headers/IRCUser.h +++ b/Classes/Headers/IRCUser.h @@ -3,8 +3,6 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@class IRCISupportInfo; - @interface IRCUser : NSObject @property (nonatomic, weak) IRCISupportInfo *supportInfo; @property (nonatomic, strong) NSString *nick; @@ -18,7 +16,8 @@ @property (nonatomic, assign) BOOL isMyself; @property (nonatomic, assign) char mark; @property (nonatomic, assign) BOOL isOp; -@property (nonatomic, assign) BOOL isHalfOp; +@property (nonatomic, assign) BOOL isHalfOp; +@property (nonatomic, assign) BOOL isIRCOp; @property (nonatomic, assign) NSInteger colorNumber; @property (nonatomic, assign) CGFloat totalWeight; @property (nonatomic, assign) CGFloat incomingWeight; diff --git a/Classes/Headers/IRCWorld.h b/Classes/Headers/IRCWorld.h index ca9d97576c..06c1ce965b 100755 --- a/Classes/Headers/IRCWorld.h +++ b/Classes/Headers/IRCWorld.h @@ -3,19 +3,20 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@class MasterController; -@class IRCClient, IRCChannel, IRCChannelConfig, IRCClientConfig; +@class TVCMainWindow, TPCViewTheme; +@class TVCServerList, TVCMemberList, TVCInputTextField; +@class TXMasterController, TXMenuController, IRCWorldConfig; @interface IRCWorld : NSObject -@property (nonatomic, weak) ServerList *serverList; -@property (nonatomic, weak) MemberList *memberList; -@property (nonatomic, unsafe_unretained) MainWindow *window; -@property (nonatomic, unsafe_unretained) InputTextField *text; -@property (nonatomic, weak) ViewTheme *viewTheme; -@property (nonatomic, weak) GrowlController *growl; -@property (nonatomic, weak) MasterController *master; -@property (nonatomic, strong) LogController *dummyLog; -@property (nonatomic, weak) MenuController *menuController; +@property (nonatomic, weak) TVCServerList *serverList; +@property (nonatomic, weak) TVCMemberList *memberList; +@property (nonatomic, unsafe_unretained) TVCMainWindow *window; +@property (nonatomic, unsafe_unretained) TVCInputTextField *text; +@property (nonatomic, weak) TPCViewTheme *viewTheme; +@property (nonatomic, weak) TLOGrowlController *growl; +@property (nonatomic, weak) TXMasterController *master; +@property (nonatomic, strong) TVCLogController *dummyLog; +@property (nonatomic, weak) TXMenuController *menuController; @property (nonatomic, weak) NSBox *logBase; @property (nonatomic, weak) NSMenu *logMenu; @property (nonatomic, weak) NSMenu *urlMenu; @@ -90,7 +91,7 @@ - (void)updateChannelTitle:(IRCChannel *)channel; - (void)addHighlightInChannel:(IRCChannel *)channel withMessage:(NSString *)message; -- (void)notifyOnGrowl:(NotificationType)type title:(NSString *)title desc:(NSString *)desc userInfo:(NSDictionary *)info; +- (void)notifyOnGrowl:(TXNotificationType)type title:(NSString *)title desc:(NSString *)desc userInfo:(NSDictionary *)info; - (void)preferencesChanged; - (void)reloadTheme; @@ -112,5 +113,5 @@ - (void)clearContentsOfClient:(IRCClient *)u; - (void)clearContentsOfChannel:(IRCChannel *)c inClient:(IRCClient *)u; -- (LogController *)createLogWithClient:(IRCClient *)client channel:(IRCChannel *)channel; +- (TVCLogController *)createLogWithClient:(IRCClient *)client channel:(IRCChannel *)channel; @end \ No newline at end of file diff --git a/Classes/Headers/LogLine.h b/Classes/Headers/LogLine.h deleted file mode 100755 index bd87a1762d..0000000000 --- a/Classes/Headers/LogLine.h +++ /dev/null @@ -1,52 +0,0 @@ -// Created by Satoshi Nakagawa -// Modifications by Codeux Software -// You can redistribute it and/or modify it under the new BSD license. -// Converted to ARC Support on Thursday, June 07, 2012 - -typedef enum { - LINE_TYPE_SYSTEM, - LINE_TYPE_ERROR, - LINE_TYPE_CTCP, - LINE_TYPE_REPLY, - LINE_TYPE_ERROR_REPLY, - LINE_TYPE_PRIVMSG, - LINE_TYPE_PRIVMSG_NH, - LINE_TYPE_NOTICE, - LINE_TYPE_ACTION, - LINE_TYPE_ACTION_NH, - LINE_TYPE_JOIN, - LINE_TYPE_PART, - LINE_TYPE_KICK, - LINE_TYPE_QUIT, - LINE_TYPE_KILL, - LINE_TYPE_NICK, - LINE_TYPE_MODE, - LINE_TYPE_TOPIC, - LINE_TYPE_INVITE, - LINE_TYPE_WEBSITE, - LINE_TYPE_DEBUG, -} LogLineType; - -typedef enum { - MEMBER_TYPE_NORMAL, - MEMBER_TYPE_MYSELF, -} LogMemberType; - -#define IRCCommandFromLineType(t) [LogLine lineTypeString:t] - -@interface LogLine : NSObject -@property (nonatomic, strong) NSDate *receivedAt; -@property (nonatomic, strong) NSString *time; -@property (nonatomic, strong) NSString *nick; -@property (nonatomic, strong) NSString *body; -@property (nonatomic, assign) LogLineType lineType; -@property (nonatomic, assign) LogMemberType memberType; -@property (nonatomic, strong) NSString *nickInfo; -@property (nonatomic, assign) BOOL identified; -@property (nonatomic, assign) NSInteger nickColorNumber; -@property (nonatomic, strong) NSArray *keywords; -@property (nonatomic, strong) NSArray *excludeWords; - -+ (NSString *)lineTypeString:(LogLineType)type; -+ (NSString *)memberTypeString:(LogMemberType)type; -@end \ No newline at end of file diff --git a/Classes/Headers/MenuController.h b/Classes/Headers/MenuController.h deleted file mode 100755 index a8f72f89fd..0000000000 --- a/Classes/Headers/MenuController.h +++ /dev/null @@ -1,127 +0,0 @@ -// Created by Satoshi Nakagawa -// Modifications by Codeux Software -// You can redistribute it and/or modify it under the new BSD license. -// Converted to ARC Support on Thursday, June 08, 2012 - -@class MasterController; - -@interface MenuController : NSObject -@property (nonatomic, weak) IRCWorld *world; -@property (nonatomic, unsafe_unretained ) MainWindow *window; -@property (nonatomic, unsafe_unretained) InputTextField *text; -@property (nonatomic, weak) MasterController *master; -@property (nonatomic, weak) ServerList *serverList; -@property (nonatomic, weak) MemberList *memberList; -@property (nonatomic, strong) NSString *pointedUrl; -@property (nonatomic, strong) NSString *pointedNick; -@property (nonatomic, strong) NSString *pointedChannelName; -@property (nonatomic, strong) NSString *currentSearchPhrase; -@property (nonatomic, strong) NSMenuItem *closeWindowItem; -@property (nonatomic, strong) PreferencesController *preferencesController; -@property (nonatomic, strong) ChannelSheet *channelSheet; -@property (nonatomic, strong) NickSheet *nickSheet; -@property (nonatomic, strong) ModeSheet *modeSheet; -@property (nonatomic, strong) TopicSheet *topicSheet; -@property (nonatomic, strong) ServerSheet *serverSheet; -@property (nonatomic, strong) InviteSheet *inviteSheet; -@property (nonatomic, strong) AboutPanel *aboutPanel; -@property (nonatomic, strong) HighlightSheet *highlightSheet; -@property (nonatomic, assign) BOOL isInFullScreenMode; - -- (void)terminate; - -- (NSArray *)selectedMembers:(NSMenuItem *)sender; -- (BOOL)checkSelectedMembers:(NSMenuItem *)item; -- (void)deselectMembers:(NSMenuItem *)sender; - -- (void)onPreferences:(id)sender; -- (void)onCloseWindow:(id)sender; - -- (void)onPaste:(id)sender; -- (void)onSearchWeb:(id)sender; -- (void)onCopyLogAsHtml:(id)sender; - -- (void)toggleDeveloperMode:(id)sender; - -- (void)showHighlightSheet:(id)sender; -- (void)showServerPropertyDialog:(IRCClient *)u ignore:(NSString *)imask; - -- (void)onMarkScrollback:(id)sender; -- (void)onClearScrollback:(id)sender; -- (void)onGotoScrollbackMark:(id)sender; -- (void)onMarkAllAsRead:(id)sender; -- (void)onIncreaseFontSize:(id)sender; -- (void)onDecreaseFontSize:(id)sender; - -- (void)onConnect:(id)sender; -- (void)onDisconnect:(id)sender; -- (void)onCancelReconnecting:(id)sender; -- (void)onNick:(id)sender; -- (void)onChannelList:(id)sender; -- (void)onAddServer:(id)sender; -- (void)onCopyServer:(id)sender; -- (void)onDeleteServer:(id)sender; -- (void)onServerProperties:(id)sender; - -- (void)onNextHighlight:(id)sender; -- (void)onPreviousHighlight:(id)sender; - -- (void)onJoin:(id)sender; -- (void)onLeave:(id)sender; -- (void)onTopic:(id)sender; -- (void)onMode:(id)sender; -- (void)onAddChannel:(id)sender; -- (void)onDeleteChannel:(id)sender; -- (void)onChannelProperties:(id)sender; - -- (void)memberListDoubleClicked:(id)sender; -- (void)onMemberWhois:(id)sender; -- (void)onMemberTalk:(id)sender; -- (void)onMemberInvite:(id)sender; -- (void)onMemberPing:(id)sender; -- (void)onMemberTime:(id)sender; -- (void)onMemberVersion:(id)sender; -- (void)onMemberUserInfo:(id)sender; -- (void)onMemberClientInfo:(id)sender; -- (void)onMemberOp:(id)sender; -- (void)onMemberDeOp:(id)sender; -- (void)onMemberHalfOp:(id)sender; -- (void)onMemberDeHalfOp:(id)sender; -- (void)onMemberVoice:(id)sender; -- (void)onMemberDeVoice:(id)sender; -- (void)onMemberKick:(id)sender; -- (void)onMemberBan:(id)sender; -- (void)onMemberBanKick:(id)sender; -- (void)onMemberKill:(id)sender; -- (void)onMemberGline:(id)sender; -- (void)onMemberShun:(id)sender; - -- (void)onCopyUrl:(id)sender; -- (void)onJoinChannel:(id)sender; - -- (void)onWantChannelModerated:(id)sender; -- (void)onWantChannelVoiceOnly:(id)sender; - -- (void)onWantChannelListSorted:(id)sender; -- (void)onWantMainWindowShown:(id)sender; -- (void)onWantIgnoreListShown:(id)sender; -- (void)onWantAboutWindowShown:(id)sender; -- (void)onWantToReadTextualLogs:(id)sender; -- (void)onWantToReadChannelLogs:(id)sender; -- (void)onWantTextualConnnectToHelp:(id)sender; -- (void)onWantHostServVhostSet:(id)sender; -- (void)onWantFindPanel:(id)sender; -- (void)onWantChannelBanList:(id)sender; -- (void)onWantChannelBanExceptionList:(id)sender; -- (void)onWantChannelInviteExceptionList:(id)sender; - -- (void)commandWShortcutUsed:(id)sender; -- (void)openHelpMenuLinkItem:(id)sender; -- (void)onShowContributors:(id)sender; -- (void)onShowAcknowledgments:(id)sender; -- (void)processNavigationItem:(id)sender; -- (void)wantsFullScreenModeToggled:(id)sender; -- (void)onWantMainWindowCentered:(id)sender; - -- (void)onWantThemeForceReloaded:(id)sender; -@end \ No newline at end of file diff --git a/Classes/Headers/NSArrayHelper.h b/Classes/Headers/NSArrayHelper.h index 5afa3e7460..f91265e07f 100755 --- a/Classes/Headers/NSArrayHelper.h +++ b/Classes/Headers/NSArrayHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSArray (NSArrayHelper) +@interface NSArray (TXArrayHelper) - (id)safeObjectAtIndex:(NSInteger)n; - (BOOL)boolAtIndex:(NSInteger)n; - (NSArray *)arrayAtIndex:(NSInteger)n; @@ -10,30 +10,30 @@ - (NSDictionary *)dictionaryAtIndex:(NSInteger)n; - (NSInteger)integerAtIndex:(NSInteger)n; - (long long)longLongAtIndex:(NSInteger)n; -- (NSDoubleN)doubleAtIndex:(NSInteger)n; +- (TXNSDouble)doubleAtIndex:(NSInteger)n; - (void *)pointerAtIndex:(NSInteger)n; - (BOOL)containsObjectIgnoringCase:(id)anObject; @end -@interface NSMutableArray (NSMutableArrayHelper) +@interface NSMutableArray (TXMutableArrayHelper) - (void)safeRemoveObjectAtIndex:(NSInteger)n; - (void)safeAddObject:(id)anObject; - (void)addBool:(BOOL)value; - (void)addInteger:(NSInteger)value; - (void)addLongLong:(long long)value; -- (void)addDouble:(NSDoubleN)value; +- (void)addDouble:(TXNSDouble)value; - (void)addPointer:(void *)value; - (void)safeInsertObject:(id)anObject atIndex:(NSUInteger)index; - (void)insertBool:(BOOL)value atIndex:(NSUInteger)index; - (void)insertInteger:(NSInteger)value atIndex:(NSUInteger)index; - (void)insertLongLong:(long long)value atIndex:(NSUInteger)index; -- (void)insertDouble:(NSDoubleN)value atIndex:(NSUInteger)index; +- (void)insertDouble:(TXNSDouble)value atIndex:(NSUInteger)index; - (void)insertPointer:(void *)value atIndex:(NSUInteger)index; @end -@interface NSIndexSet (NSIndexSetHelper) +@interface NSIndexSet (TXIndexSetHelper) - (NSArray *)arrayFromIndexSet; @end \ No newline at end of file diff --git a/Classes/Headers/NSBundleHelper.h b/Classes/Headers/NSBundleHelper.h index fa275287af..b663896103 100755 --- a/Classes/Headers/NSBundleHelper.h +++ b/Classes/Headers/NSBundleHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSBundle (NSBundleHelper) +@interface NSBundle (TXBundleHelper) + (void)reloadBundles:(IRCWorld *)world; + (void)loadBundlesIntoMemory:(IRCWorld *)world; + (void)deallocBundlesFromMemory:(IRCWorld *)world; diff --git a/Classes/Headers/NSColorHelper.h b/Classes/Headers/NSColorHelper.h index 4ff4f6a847..3037d32480 100755 --- a/Classes/Headers/NSColorHelper.h +++ b/Classes/Headers/NSColorHelper.h @@ -2,9 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define NSCalibratedRBGColor(r, b, g) ([NSColor _colorWithCalibratedRed:r green:g blue:b alpha:1.0]) +#define TXCalibratedRBGColor(r, b, g) ([NSColor internalCalibratedRed:r green:g blue:b alpha:1.0]) -@interface NSColor (NSColorHelper) +@interface NSColor (TXColorHelper) + (NSColor *)formatterWhiteColor; + (NSColor *)formatterBlackColor; + (NSColor *)formatterNavyBlueColor; @@ -30,6 +30,6 @@ + (NSColor *)outlineViewHeaderTextColor; + (NSColor *)outlineViewHeaderDisabledTextColor; -+ (NSColor *)_colorWithSRGBRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha; -+ (NSColor *)_colorWithCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha; ++ (NSColor *)internalColorWithSRGBRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha; ++ (NSColor *)internalCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha; @end \ No newline at end of file diff --git a/Classes/Headers/NSDataHelper.h b/Classes/Headers/NSDataHelper.h index c58a391b3d..eee2f83914 100755 --- a/Classes/Headers/NSDataHelper.h +++ b/Classes/Headers/NSDataHelper.h @@ -2,9 +2,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSData (NSDataHelper) +@interface NSData (TXDataHelper) - (BOOL)isValidUTF8; + - (NSString *)validateUTF8; - (NSString *)validateUTF8WithCharacter:(UniChar)malformChar; + - (NSString *)base64EncodingWithLineLength:(NSUInteger)lineLength; @end \ No newline at end of file diff --git a/Classes/Headers/NSDateHelper.h b/Classes/Headers/NSDateHelper.h index af23fc2ac4..28ba9c0b9e 100755 --- a/Classes/Headers/NSDateHelper.h +++ b/Classes/Headers/NSDateHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSDate (NSDateHelper) +@interface NSDate (TXDateHelper) + (NSInteger)epochTime; + (NSInteger)secondsSinceUnixTimestamp:(NSInteger)stamp; @end \ No newline at end of file diff --git a/Classes/Headers/NSDictionaryHelper.h b/Classes/Headers/NSDictionaryHelper.h index e04c3f4821..e1aa0de41e 100755 --- a/Classes/Headers/NSDictionaryHelper.h +++ b/Classes/Headers/NSDictionaryHelper.h @@ -2,14 +2,14 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSDictionary (NSDictionaryHelper) +@interface NSDictionary (TXDictionaryHelper) - (BOOL)boolForKey:(NSString *)key; - (NSArray *)arrayForKey:(NSString *)key; - (NSString *)stringForKey:(NSString *)key; - (NSDictionary *)dictionaryForKey:(NSString *)key; - (NSInteger)integerForKey:(NSString *)key; - (long long)longLongForKey:(NSString *)key; -- (NSDoubleN)doubleForKey:(NSString *)key; +- (TXNSDouble)doubleForKey:(NSString *)key; - (void *)pointerForKey:(NSString *)key; - (BOOL)containsKey:(NSString *)baseKey; @@ -18,10 +18,10 @@ - (NSString *)keyIgnoringCase:(NSString *)baseKey; @end -@interface NSMutableDictionary (NSMutableDictionaryHelper) +@interface NSMutableDictionary (TXMutableDictionaryHelper) - (void)setBool:(BOOL)value forKey:(NSString *)key; - (void)setInteger:(NSInteger)value forKey:(NSString *)key; - (void)setLongLong:(long long)value forKey:(NSString *)key; -- (void)setDouble:(NSDoubleN)value forKey:(NSString *)key; +- (void)setDouble:(TXNSDouble)value forKey:(NSString *)key; - (void)setPointer:(void *)value forKey:(NSString *)key; @end \ No newline at end of file diff --git a/Classes/Headers/NSFontHelper.h b/Classes/Headers/NSFontHelper.h index f0eed57ff2..9396ba4249 100755 --- a/Classes/Headers/NSFontHelper.h +++ b/Classes/Headers/NSFontHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSFont (NSFontHelper) +@interface NSFont (TXFontHelper) - (NSFont *)convertToItalics; - (BOOL)fontMatchesFont:(NSFont *)otherFont; diff --git a/Classes/Headers/NSNumberHelper.h b/Classes/Headers/NSNumberHelper.h index 315f012ae2..e1a76c1692 100755 --- a/Classes/Headers/NSNumberHelper.h +++ b/Classes/Headers/NSNumberHelper.h @@ -2,9 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define DirtyCGFloatsMatch(s, r) [NSNumber compareCGFloat:s toFloat:r] +#define TXDirtyCGFloatsMatch(s, r) [NSNumber compareCGFloat:s toFloat:r] -@interface NSNumber (NSNumberHelper) +@interface NSNumber (TXNumberHelper) + (BOOL)compareIRCColor:(UniChar)c against:(NSInteger)firstNumber; + (BOOL)compareCGFloat:(CGFloat)num1 toFloat:(CGFloat)num2; diff --git a/Classes/Headers/NSOutlineViewHelper.h b/Classes/Headers/NSOutlineViewHelper.h index dd532bc674..18131dc385 100755 --- a/Classes/Headers/NSOutlineViewHelper.h +++ b/Classes/Headers/NSOutlineViewHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSOutlineView (NSOutlineViewHelper) +@interface NSOutlineView (TXOutlineViewHelper) - (NSArray *)groupItems; - (BOOL)isGroupItem:(id)item; diff --git a/Classes/Headers/NSPasteboardHelper.h b/Classes/Headers/NSPasteboardHelper.h index 55431b2690..2784a1ae88 100755 --- a/Classes/Headers/NSPasteboardHelper.h +++ b/Classes/Headers/NSPasteboardHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSPasteboard (NSPasteboardHelper) +@interface NSPasteboard (TXPasteboardHelper) - (NSString *)stringContent; - (void)setStringContent:(NSString *)s; @end \ No newline at end of file diff --git a/Classes/Headers/NSRectHelper.h b/Classes/Headers/NSRectHelper.h index c779b27db8..2f17dfee38 100755 --- a/Classes/Headers/NSRectHelper.h +++ b/Classes/Headers/NSRectHelper.h @@ -3,4 +3,4 @@ // Converted to ARC Support on Thursday, June 08, 2012 TEXTUAL_EXTERN NSPoint NSRectCenter(NSRect rect); -TEXTUAL_EXTERN NSRect NSRectAdjustInRect(NSRect r, NSRect bounds); \ No newline at end of file +TEXTUAL_EXTERN NSRect NSRectAdjustInRect(NSRect r, NSRect bounds); diff --git a/Classes/Headers/NSSplitViewHelper.h b/Classes/Headers/NSSplitViewHelper.h index 5d8aa661d7..39e300193d 100755 --- a/Classes/Headers/NSSplitViewHelper.h +++ b/Classes/Headers/NSSplitViewHelper.h @@ -2,6 +2,6 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSSplitView (NSSplitViewHelper) +@interface NSSplitView (TXSplitViewHelper) - (BOOL)hasHiddenView; @end \ No newline at end of file diff --git a/Classes/Headers/NSStringHelper.h b/Classes/Headers/NSStringHelper.h index 5b097921df..b220afae12 100755 --- a/Classes/Headers/NSStringHelper.h +++ b/Classes/Headers/NSStringHelper.h @@ -3,14 +3,17 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define IsAlpha(c) ('a' <= (c) && (c) <= 'z' || 'A' <= (c) && (c) <= 'Z') -#define IsNumeric(c) ('0' <= (c) && (c) <= '9' && IsAlpha(c) == NO) -#define IsAlphaNum(c) (IsAlpha(c) || IsNumeric(c)) -#define IsWordLetter(c) (IsAlphaNum(c) || (c) == '_') -#define IsIRCColor(c,f) ([NSNumber compareIRCColor:c against:f]) -#define IsAlphaWithDiacriticalMark(c) (0xc0 <= c && c <= 0xff && c != 0xd7 && c != 0xf7) - -@interface NSString (NSStringHelper) +#define TXIsAlpha(c) ('a' <= (c) && (c) <= 'z' || 'A' <= (c) && (c) <= 'Z') +#define TXIsNumeric(c) ('0' <= (c) && (c) <= '9' && TXIsAlpha(c) == NO) +#define TXTXIsAlphaNumeric(c) (TXIsAlpha(c) || TXIsNumeric(c)) +#define TXIsWordLetter(c) (TXTXIsAlphaNumeric(c) || (c) == '_') +#define TXIsIRCColor(c,f) ([NSNumber compareIRCColor:c against:f]) +#define TXTXIsAlphaWithDiacriticalMark(c) (0xc0 <= c && c <= 0xff && c != 0xd7 && c != 0xf7) + +#pragma mark +#pragma mark String Helpers + +@interface NSString (TXStringHelper) + (id)stringWithBytes:(const void *)bytes length:(NSUInteger)length encoding:(NSStringEncoding)encoding; + (id)stringWithData:(NSData *)data encoding:(NSStringEncoding)encoding; @@ -80,7 +83,10 @@ - (NSInteger)pixelHeightInWidth:(NSInteger)width; @end -@interface NSString (NSStringNumberHelper) +#pragma mark +#pragma mark String Number Helpers + +@interface NSString (TXStringNumberHelper) + (NSString *)stringWithChar:(char)value; + (NSString *)stringWithUniChar:(UniChar)value; + (NSString *)stringWithUnsignedChar:(unsigned char)value; @@ -93,17 +99,23 @@ + (NSString *)stringWithLongLong:(long long)value; + (NSString *)stringWithUnsignedLongLong:(unsigned long long)value; + (NSString *)stringWithFloat:(float)value; -+ (NSString *)stringWithDouble:(NSDoubleN)value; ++ (NSString *)stringWithDouble:(TXNSDouble)value; + (NSString *)stringWithInteger:(NSInteger)value; + (NSString *)stringWithUnsignedInteger:(NSUInteger)value; @end -@interface NSMutableString (NSMutableStringHelper) +#pragma mark +#pragma mark Mutable String Helpers + +@interface NSMutableString (TXMutableStringHelper) - (NSString *)getToken; - (void)safeDeleteCharactersInRange:(NSRange)range; @end -@interface NSAttributedString (NSAttributedStringHelper) +#pragma mark +#pragma mark Attributed String Helpers + +@interface NSAttributedString (TXAttributedStringHelper) - (NSDictionary *)attributes; + (NSAttributedString *)emptyString; @@ -122,6 +134,9 @@ - (NSInteger)pixelHeightInWidth:(NSInteger)width; @end -@interface NSMutableAttributedString (NSMutableAttributedStringHelper) +#pragma mark +#pragma mark Mutable Attributed String Helpers + +@interface NSMutableAttributedString (TXMutableAttributedStringHelper) - (NSAttributedString *)getToken; @end diff --git a/Classes/Headers/NSTextFieldHelper.h b/Classes/Headers/NSTextFieldHelper.h index bf0bec95e0..cd29a50b06 100755 --- a/Classes/Headers/NSTextFieldHelper.h +++ b/Classes/Headers/NSTextFieldHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSTextView (NSTextViewHelper) +@interface NSTextView (TXTextViewHelper) - (void)focus; - (BOOL)isFocused; diff --git a/Classes/Headers/NSWindowHelper.h b/Classes/Headers/NSWindowHelper.h index 9461ade8ce..091dac83c9 100755 --- a/Classes/Headers/NSWindowHelper.h +++ b/Classes/Headers/NSWindowHelper.h @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NSWindow (NSWindowHelper) +@interface NSWindow (TXWindowHelper) - (void)exactlyCenterWindow; - (void)centerOfWindow:(NSWindow *)window; diff --git a/Classes/Headers/StaticDefinitions.h b/Classes/Headers/StaticDefinitions.h index 0d35bd6dc8..e8d01cc56a 100755 --- a/Classes/Headers/StaticDefinitions.h +++ b/Classes/Headers/StaticDefinitions.h @@ -3,15 +3,15 @@ // Converted to ARC Support on Thursday, June 08, 2012 /* Availability Macros */ -#define _LOAD_MAC_OS_LIBRARIES 1 +#define TXLoadMacOSLibraries 1 -#if _LOAD_MAC_OS_LIBRARIES +#if TXLoadMacOSLibraries #if defined(AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER) - #define _MAC_OS_MOUNTAIN_LION_OR_NEWER + #define TXMacOSMountainLionOrNewer #endif #if defined(AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER) - #define _MAC_OS_LION_OR_NEWER + #define TXMacOSLionOrNewer #endif #endif @@ -19,14 +19,17 @@ #define NSAppKitVersionNumber10_7 1138 #define NSAppKitVersionNumber10_7_2 1138.23 -#ifdef _MAC_OS_LION_OR_NEWER - #define _USES_MODERN_REGULAR_EXPRESSION +#define PointerIsEmpty(s) (s == NULL || s == nil) +#define PointerIsNotEmpty(s) (s != NULL && s != nil) + +#ifdef TXMacOSLionOrNewer + #define TXNativeRegularExpressionAvailable #endif -#ifdef _MAC_OS_MOUNTAIN_LION_OR_NEWER - #define _USES_NATIVE_NOTIFICATION_CENTER - #define _USES_APPLICATION_SCRIPTS_FOLDER - #define _USES_FOUNDATION_BASED_NSUUID +#ifdef TXMacOSMountainLionOrNewer + #define TXNativeNotificationCenterAvailable + #define TXUserScriptsFolderAvailable + #define TXFoundationBasedUUIDAvailable #endif /* Textual Specific Frameworks */ @@ -36,23 +39,24 @@ #endif /* Establish Common Pointers */ -#define _NSWorkspace() [NSWorkspace sharedWorkspace] -#define _NSPasteboard() [NSPasteboard generalPasteboard] #define _NSFileManager() [NSFileManager defaultManager] +#define _NSPasteboard() [NSPasteboard generalPasteboard] #define _NSFontManager() [NSFontManager sharedFontManager] -#define _NSUserDefaults() [NSUserDefaults standardUserDefaults] -#define _NSAppleEventManager() [NSAppleEventManager sharedAppleEventManager] -#define _NSNotificationCenter() [NSNotificationCenter defaultCenter] #define _NSGraphicsCurrentContext() [NSGraphicsContext currentContext] -#define _NSUserNotificationCenter() [NSUserNotificationCenter defaultUserNotificationCenter] -#define _NSUserDefaultsController() [NSUserDefaultsController sharedUserDefaultsController] +#define _NSNotificationCenter() [NSNotificationCenter defaultCenter] +#define _NSWorkspace() [NSWorkspace sharedWorkspace] #define _NSWorkspaceNotificationCenter() [_NSWorkspace() notificationCenter] #define _NSDistributedNotificationCenter() [NSDistributedNotificationCenter defaultCenter] +#define _NSAppleEventManager() [NSAppleEventManager sharedAppleEventManager] +#define _NSUserDefaults() [NSUserDefaults standardUserDefaults] +#define _NSUserDefaultsController() [NSUserDefaultsController sharedUserDefaultsController] + +#ifdef TXNativeNotificationCenterAvailable + #define _NSUserNotificationCenter() [NSUserNotificationCenter defaultUserNotificationCenter] +#endif -/* Miscellaneous functions to handle small tasks */ +/* Miscellaneous functions to handle small tasks. */ #define CFItemRefToID(s) (id)s -#define PointerIsEmpty(s) (s == NULL || s == nil) -#define PointerIsNotEmpty(s) BOOLReverseValue(PointerIsEmpty(s)) #define BOOLReverseValue(b) ((b == YES) ? NO : YES) #define BOOLValueFromObject(b) BOOLReverseValue(PointerIsEmpty(b)) #define NSDissimilarObjects(o,n) (o != n) @@ -60,7 +64,7 @@ #define TEXTUAL_EXTERN __attribute__((visibility("default"))) /* Item types */ -typedef double NSDoubleN; +typedef double TXNSDouble; typedef unsigned long long TXFSLongInt; // filesizes /* Number Handling */ @@ -72,8 +76,8 @@ typedef unsigned long long TXFSLongInt; // filesizes #define NSNumberInRange(n,s,e) (n >= s && n <= e) /* Everything Else */ -#define NSNullObject @"" -#define NSWhitespaceCharacter @" " -#define NSNewlineCharacter @"\n" +#define NSStringEmptyPlaceholder @"" +#define NSStringNewlinePlaceholder @"\n" +#define NSStringWhitespacePlaceholder @" " -#define DeveloperEnvironmentToken @"TextualDeveloperEnvironment" +#define TXDeveloperEnvironmentToken @"TextualDeveloperEnvironment" diff --git a/Classes/Headers/AboutPanel.h b/Classes/Headers/TDCAboutPanel.h similarity index 71% rename from Classes/Headers/AboutPanel.h rename to Classes/Headers/TDCAboutPanel.h index 407fef2c1d..a17d13c2c5 100755 --- a/Classes/Headers/AboutPanel.h +++ b/Classes/Headers/TDCAboutPanel.h @@ -2,13 +2,13 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface AboutPanel : NSWindowController +@interface TDCAboutPanel : NSWindowController @property (nonatomic, unsafe_unretained) id delegate; @property (nonatomic, strong) NSTextField *versionInfo; - (void)show; @end -@interface NSObject (AboutPanelDelegate) -- (void)aboutPanelWillClose:(AboutPanel *)sender; +@interface NSObject (TXAboutPanelDelegate) +- (void)aboutPanelWillClose:(TDCAboutPanel *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/AddressBookSheet.h b/Classes/Headers/TDCAddressBookSheet.h similarity index 77% rename from Classes/Headers/AddressBookSheet.h rename to Classes/Headers/TDCAddressBookSheet.h index 5b469f6d38..53b6a1cfa7 100755 --- a/Classes/Headers/AddressBookSheet.h +++ b/Classes/Headers/TDCAddressBookSheet.h @@ -2,9 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface AddressBookSheet : SheetBase +@interface TDCAddressBookSheet : TDCSheetBase @property (nonatomic, assign) BOOL newItem; -@property (nonatomic, strong) AddressBook *ignore; +@property (nonatomic, strong) IRCAddressBook *ignore; @property (nonatomic, strong) NSTextField *hostmask; @property (nonatomic, strong) NSTextField *nickname; @property (nonatomic, strong) NSButton *ignorePublicMsg; @@ -21,7 +21,7 @@ - (void)start; @end -@interface NSObject (IgnoreItemSheetDelegate) -- (void)ignoreItemSheetOnOK:(AddressBookSheet *)sender; -- (void)ignoreItemSheetWillClose:(AddressBookSheet *)sender; +@interface NSObject (TXIgnoreItemSheetDelegate) +- (void)ignoreItemSheetOnOK:(TDCAddressBookSheet *)sender; +- (void)ignoreItemSheetWillClose:(TDCAddressBookSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/HighlightSheet.h b/Classes/Headers/TDCHighlightSheet.h similarity index 62% rename from Classes/Headers/HighlightSheet.h rename to Classes/Headers/TDCHighlightSheet.h index 8126e86432..7842eeba44 100755 --- a/Classes/Headers/HighlightSheet.h +++ b/Classes/Headers/TDCHighlightSheet.h @@ -2,8 +2,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface HighlightSheet : SheetBase -@property (nonatomic, strong) ListView *table; +@class TVCListView; + +@interface TDCHighlightSheet : TDCSheetBase +@property (nonatomic, strong) TVCListView *table; @property (nonatomic, strong) NSTextField *header; @property (nonatomic, weak) NSMutableArray *list; @@ -11,6 +13,6 @@ - (void)onClearList:(id)sender; @end -@interface NSObject (highlightSheetDelegate) -- (void)highlightSheetWillClose:(HighlightSheet *)sender; +@interface NSObject (TXHighlightSheetDelegate) +- (void)highlightSheetWillClose:(TDCHighlightSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/InviteSheet.h b/Classes/Headers/TDCInviteSheet.h similarity index 73% rename from Classes/Headers/InviteSheet.h rename to Classes/Headers/TDCInviteSheet.h index ebece57306..d7e41c94a1 100755 --- a/Classes/Headers/InviteSheet.h +++ b/Classes/Headers/TDCInviteSheet.h @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface InviteSheet : SheetBase +@interface TDCInviteSheet : TDCSheetBase @property (nonatomic, strong) NSArray *nicks; @property (nonatomic, assign) NSInteger uid; @property (nonatomic, strong) NSTextField *titleLabel; @@ -13,7 +13,7 @@ - (void)invite:(id)sender; @end -@interface NSObject (InviteSheetDelegate) -- (void)inviteSheet:(InviteSheet *)sender onSelectChannel:(NSString *)channelName; -- (void)inviteSheetWillClose:(InviteSheet *)sender; +@interface NSObject (TXInviteSheetDelegate) +- (void)inviteSheet:(TDCInviteSheet *)sender onSelectChannel:(NSString *)channelName; +- (void)inviteSheetWillClose:(TDCInviteSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/ListDialog.h b/Classes/Headers/TDCListDialog.h similarity index 77% rename from Classes/Headers/ListDialog.h rename to Classes/Headers/TDCListDialog.h index a191b8c5ea..b328c7c736 100755 --- a/Classes/Headers/ListDialog.h +++ b/Classes/Headers/TDCListDialog.h @@ -3,13 +3,13 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ListDialog : NSWindowController +@interface TDCListDialog : NSWindowController @property (nonatomic, unsafe_unretained) id delegate; @property (nonatomic, assign) NSInteger sortKey; @property (nonatomic, assign) NSComparisonResult sortOrder; @property (nonatomic, strong) NSMutableArray *list; @property (nonatomic, strong) NSMutableArray *filteredList; -@property (nonatomic, strong) ListView *table; +@property (nonatomic, strong) TVCListView *table; @property (nonatomic, strong) NSSearchField *filterText; @property (nonatomic, strong) NSButton *updateButton; @property (nonatomic, strong) NSTextField *channelCount; @@ -28,8 +28,8 @@ - (void)onSearchFieldChange:(id)sender; @end -@interface NSObject (ListDialogDelegate) -- (void)listDialogOnUpdate:(ListDialog *)sender; -- (void)listDialogOnJoin:(ListDialog *)sender channel:(NSString *)channel; -- (void)listDialogWillClose:(ListDialog *)sender; +@interface NSObject (TXListDialogDelegate) +- (void)listDialogOnUpdate:(TDCListDialog *)sender; +- (void)listDialogOnJoin:(TDCListDialog *)sender channel:(NSString *)channel; +- (void)listDialogWillClose:(TDCListDialog *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/ModeSheet.h b/Classes/Headers/TDCModeSheet.h similarity index 85% rename from Classes/Headers/ModeSheet.h rename to Classes/Headers/TDCModeSheet.h index 3869fbfb01..aef3a5c07f 100755 --- a/Classes/Headers/ModeSheet.h +++ b/Classes/Headers/TDCModeSheet.h @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ModeSheet : SheetBase +@interface TDCModeSheet : TDCSheetBase @property (nonatomic, weak) IRCChannelMode *mode; @property (nonatomic, strong) NSString *channelName; @property (nonatomic, assign) NSInteger uid; @@ -23,7 +23,7 @@ - (void)onChangeCheck:(id)sender; @end -@interface NSObject (ModeSheetDelegate) -- (void)modeSheetOnOK:(ModeSheet *)sender; -- (void)modeSheetWillClose:(ModeSheet *)sender; +@interface NSObject (TXModeSheetDelegate) +- (void)modeSheetOnOK:(TDCModeSheet *)sender; +- (void)modeSheetWillClose:(TDCModeSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/NickSheet.h b/Classes/Headers/TDCNickSheet.h similarity index 72% rename from Classes/Headers/NickSheet.h rename to Classes/Headers/TDCNickSheet.h index f78444a890..4c82f34671 100755 --- a/Classes/Headers/NickSheet.h +++ b/Classes/Headers/TDCNickSheet.h @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface NickSheet : SheetBase +@interface TDCNickSheet : TDCSheetBase @property (nonatomic, assign) NSInteger uid; @property (nonatomic, strong) NSTextField *currentText; @property (nonatomic, strong) NSTextField *nicknameNewInfo; @@ -11,7 +11,7 @@ - (void)start:(NSString *)nick; @end -@interface NSObject (NickSheetDelegate) -- (void)nickSheet:(NickSheet *)sender didInputNick:(NSString *)nick; -- (void)nickSheetWillClose:(NickSheet *)sender; +@interface NSObject (TXNickSheetDelegate) +- (void)nickSheet:(TDCNickSheet *)sender didInputNick:(NSString *)nick; +- (void)nickSheetWillClose:(TDCNickSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/PreferencesController.h b/Classes/Headers/TDCPreferencesController.h similarity index 82% rename from Classes/Headers/PreferencesController.h rename to Classes/Headers/TDCPreferencesController.h index 47b2998c59..2ab0b32b32 100755 --- a/Classes/Headers/PreferencesController.h +++ b/Classes/Headers/TDCPreferencesController.h @@ -3,14 +3,15 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define TransparencyDidChangeNotification @"TransparencyDidChangeNotification" -#define ThemeStyleDidChangeNotification @"ThemeStyleDidChangeNotification" -#define InputHistoryGlobalSchemeNotification @"InputHistoryGlobalSchemeNotification" +@class TDCPreferencesScriptWrapper; -@interface PreferencesController : NSWindowController -@property (nonatomic, unsafe_unretained) id delegate; +#define TXThemePreferenceChangedNotification @"TXThemePreferenceChangedNotification" +#define TXTransparencyPreferenceChangedNotification @"TXTransparencyPreferenceChangedNotification" +#define TXInputHistorySchemePreferenceChangedNotification @"TXInputHistorySchemePreferenceChangedNotification" + +@interface TDCPreferencesController : NSWindowController @property (nonatomic, weak) IRCWorld *world; -@property (nonatomic, strong) ScriptsWrapper *scriptsController; +@property (nonatomic, unsafe_unretained) id delegate; @property (nonatomic, weak) NSArray *availableSounds; @property (nonatomic, weak) NSMutableArray *sounds; @property (nonatomic, strong) NSView *contentView; @@ -42,6 +43,7 @@ @property (nonatomic, strong) NSMenu *installedScriptsMenu; @property (nonatomic, strong) NSTextField *scriptLocationField; @property (nonatomic, strong) NSToolbar *preferenceSelectToolbar; +@property (nonatomic, strong) TDCPreferencesScriptWrapper *scriptsController; - (id)initWithWorldController:(IRCWorld *)word; @@ -53,24 +55,24 @@ - (void)onHighlightTypeChanged:(id)sender; - (void)onSelectFont:(id)sender; -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER +#ifdef TXUserScriptsFolderAvailable - (void)onDownloadExtraAddons:(id)sender; #endif +- (void)onUseGrowl:(id)sender; - (void)onStyleChanged:(id)sender; - (void)onChangedTheme:(id)sender; -- (void)onPrefPaneSelected:(id)sender; -- (void)onOpenPathToThemes:(id)sender; -- (void)onOpenPathToScripts:(id)sender; -- (void)onChangedTransparency:(id)sender; -- (void)onHighlightLoggingChanged:(id)sender; - (void)onChangeAlert:(id)sender; -- (void)onUseGrowl:(id)sender; - (void)onAlertWhileAway:(id)sender; - (void)onChangeAlertSound:(id)sender; - (void)onTranscriptFolderChanged:(id)sender; +- (void)onHighlightLoggingChanged:(id)sender; +- (void)onChangedTransparency:(id)sender; +- (void)onPrefPaneSelected:(id)sender; +- (void)onOpenPathToThemes:(id)sender; +- (void)onOpenPathToScripts:(id)sender; @end -@interface NSObject (PreferencesControllerDelegate) -- (void)preferencesDialogWillClose:(PreferencesController *)sender; +@interface NSObject (TXPreferencesControllerDelegate) +- (void)preferencesDialogWillClose:(TDCPreferencesController *)sender; @end diff --git a/Classes/Headers/ScriptsWrapper.h b/Classes/Headers/TDCPreferencesScriptWrapper.h similarity index 78% rename from Classes/Headers/ScriptsWrapper.h rename to Classes/Headers/TDCPreferencesScriptWrapper.h index 4ef8c38856..c6f3d04c7f 100755 --- a/Classes/Headers/ScriptsWrapper.h +++ b/Classes/Headers/TDCPreferencesScriptWrapper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ScriptsWrapper : NSObject +@interface TDCPreferencesScriptWrapper : NSObject @property (nonatomic, weak) IRCWorld *world; @property (nonatomic, strong) NSMutableArray *scripts; diff --git a/Classes/Headers/SoundWrapper.h b/Classes/Headers/TDCPreferencesSoundWrapper.h similarity index 61% rename from Classes/Headers/SoundWrapper.h rename to Classes/Headers/TDCPreferencesSoundWrapper.h index ac136e024d..7b4a23ad17 100755 --- a/Classes/Headers/SoundWrapper.h +++ b/Classes/Headers/TDCPreferencesSoundWrapper.h @@ -2,16 +2,16 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define EMPTY_SOUND TXTLS(@"EMPTY_SOUND") +#define TXEmptySoundAlertLabel TXTLS(@"TXEmptySoundAlertLabel") -@interface SoundWrapper : NSObject -@property (nonatomic, assign) NotificationType eventType; +@interface TDCPreferencesSoundWrapper : NSObject +@property (nonatomic, assign) TXNotificationType eventType; @property (nonatomic, weak) NSString *displayName; @property (nonatomic, weak) NSString *sound; @property (nonatomic, assign) BOOL growl; @property (nonatomic, assign) BOOL growlSticky; @property (nonatomic, assign) BOOL disableWhileAway; -+ (SoundWrapper *)soundWrapperWithEventType:(NotificationType)eventType; -- (NotificationType)eventType; ++ (TDCPreferencesSoundWrapper *)soundWrapperWithEventType:(TXNotificationType)eventType; +- (TXNotificationType)eventType; @end diff --git a/Classes/Headers/ServerSheet.h b/Classes/Headers/TDCServerSheet.h similarity index 88% rename from Classes/Headers/ServerSheet.h rename to Classes/Headers/TDCServerSheet.h index 19e15f1320..629e36f7e3 100755 --- a/Classes/Headers/ServerSheet.h +++ b/Classes/Headers/TDCServerSheet.h @@ -3,10 +3,12 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ServerSheet : SheetBase +@class TDChannelSheet; + +@interface TDCServerSheet : TDCSheetBase @property (nonatomic, assign) NSInteger uid; -@property (nonatomic, strong) IRCClientConfig *config; @property (nonatomic, weak) IRCClient *client; +@property (nonatomic, strong) IRCClientConfig *config; @property (nonatomic, strong) NSDictionary *serverList; @property (nonatomic, strong) NSMutableArray *tabViewList; @property (nonatomic, strong) NSView *contentView; @@ -23,7 +25,7 @@ @property (nonatomic, strong) NSButton *outgoingFloodControl; @property (nonatomic, strong) NSSlider *floodControlMessageCount; @property (nonatomic, strong) NSSlider *floodControlDelayTimer; -@property (nonatomic, strong) ListView *tabView; +@property (nonatomic, strong) TVCListView *tabView; @property (nonatomic, strong) NSTextField *nameText; @property (nonatomic, strong) NSButton *prefersIPv6Check; @property (nonatomic, strong) NSButton *autoReconnectCheck; @@ -47,19 +49,19 @@ @property (nonatomic, strong) NSTextField *proxyPortText; @property (nonatomic, strong) NSTextField *proxyUserText; @property (nonatomic, strong) NSTextField *proxyPasswordText; -@property (nonatomic, strong) ListView *channelTable; +@property (nonatomic, strong) TVCListView *channelTable; @property (nonatomic, strong) NSButton *addChannelButton; @property (nonatomic, strong) NSButton *editChannelButton; @property (nonatomic, strong) NSButton *deleteChannelButton; @property (nonatomic, strong) NSTextView *loginCommandsText; @property (nonatomic, strong) NSButton *invisibleCheck; -@property (nonatomic, strong) ListView *ignoreTable; +@property (nonatomic, strong) TVCListView *ignoreTable; @property (nonatomic, strong) NSButton *addIgnoreButton; @property (nonatomic, strong) NSButton *editIgnoreButton; @property (nonatomic, strong) NSButton *deleteIgnoreButton; @property (nonatomic, strong) NSMenu *addIgnoreMenu; -@property (nonatomic, strong) ChannelSheet *channelSheet; -@property (nonatomic, strong) AddressBookSheet *ignoreSheet; +@property (nonatomic, strong) TDChannelSheet *channelSheet; +@property (nonatomic, strong) TDCAddressBookSheet *ignoreSheet; - (void)startWithIgnoreTab:(NSString *)imask; @@ -87,7 +89,7 @@ - (void)showAddIgnoreMenu:(id)sender; @end -@interface NSObject (ServerSheetDelegate) -- (void)ServerSheetOnOK:(ServerSheet *)sender; -- (void)ServerSheetWillClose:(ServerSheet *)sender; +@interface NSObject (TXServerSheetDelegate) +- (void)serverSheetOnOK:(TDCServerSheet *)sender; +- (void)serverSheetWillClose:(TDCServerSheet *)sender; @end diff --git a/Classes/Headers/SheetBase.h b/Classes/Headers/TDCSheetBase.h similarity index 94% rename from Classes/Headers/SheetBase.h rename to Classes/Headers/TDCSheetBase.h index 4f5f035276..d415cb0088 100755 --- a/Classes/Headers/SheetBase.h +++ b/Classes/Headers/TDCSheetBase.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface SheetBase : NSObject +@interface TDCSheetBase : NSObject @property (nonatomic, unsafe_unretained) id delegate; @property (nonatomic, unsafe_unretained) NSWindow *window; @property (nonatomic, strong) NSWindow *sheet; diff --git a/Classes/Headers/TopicSheet.h b/Classes/Headers/TDCTopicSheet.h similarity index 61% rename from Classes/Headers/TopicSheet.h rename to Classes/Headers/TDCTopicSheet.h index 813bc003cf..e1870033dd 100755 --- a/Classes/Headers/TopicSheet.h +++ b/Classes/Headers/TDCTopicSheet.h @@ -2,16 +2,16 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface TopicSheet : SheetBase +@interface TDCTopicSheet : TDCSheetBase @property (nonatomic, assign) NSInteger uid; @property (nonatomic, assign) NSInteger cid; -@property (nonatomic, strong) TextField *text; +@property (nonatomic, strong) TVCTextField *text; @property (nonatomic, strong) NSTextField *header; - (void)start:(NSString *)topic; @end -@interface NSObject (TopicSheetDelegate) -- (void)topicSheet:(TopicSheet *)sender onOK:(NSString *)topic; -- (void)topicSheetWillClose:(TopicSheet *)sender; +@interface NSObject (TXTopicSheetDelegate) +- (void)topicSheet:(TDCTopicSheet *)sender onOK:(NSString *)topic; +- (void)topicSheetWillClose:(TDCTopicSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/WelcomeSheet.h b/Classes/Headers/TDCWelcomeSheet.h similarity index 75% rename from Classes/Headers/WelcomeSheet.h rename to Classes/Headers/TDCWelcomeSheet.h index 951c04e392..9ca830d1c0 100755 --- a/Classes/Headers/WelcomeSheet.h +++ b/Classes/Headers/TDCWelcomeSheet.h @@ -3,11 +3,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface WelcomeSheet : SheetBase +@interface TDCWelcomeSheet : TDCSheetBase @property (nonatomic, strong) NSMutableArray *channels; @property (nonatomic, strong) NSTextField *nickText; @property (nonatomic, strong) NSTextField *hostCombo; -@property (nonatomic, strong) ListView *channelTable; +@property (nonatomic, strong) TVCListView *channelTable; @property (nonatomic, strong) NSButton *autoConnectCheck; @property (nonatomic, strong) NSButton *addChannelButton; @property (nonatomic, strong) NSButton *deleteChannelButton; @@ -23,7 +23,7 @@ - (void)onHostComboChanged:(id)sender; @end -@interface NSObject (WelcomeSheetDelegate) -- (void)WelcomeSheet:(WelcomeSheet *)sender onOK:(NSDictionary *)config; -- (void)WelcomeSheetWillClose:(WelcomeSheet *)sender; +@interface NSObject (TXWelcomeSheetDelegate) +- (void)welcomeSheet:(TDCWelcomeSheet *)sender onOK:(NSDictionary *)config; +- (void)welcomeSheetWillClose:(TDCWelcomeSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/ChanBanExceptionSheet.h b/Classes/Headers/TDChanBanExceptionSheet.h similarity index 65% rename from Classes/Headers/ChanBanExceptionSheet.h rename to Classes/Headers/TDChanBanExceptionSheet.h index c12f6989d8..a5261ab812 100755 --- a/Classes/Headers/ChanBanExceptionSheet.h +++ b/Classes/Headers/TDChanBanExceptionSheet.h @@ -2,8 +2,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ChanBanExceptionSheet : SheetBase -@property (nonatomic, strong) ListView *table; +@interface TDChanBanExceptionSheet : TDCSheetBase +@property (nonatomic, strong) TVCListView *table; @property (nonatomic, strong) NSTextField *header; @property (nonatomic, strong) NSMutableArray *list; @property (nonatomic, strong) NSMutableArray *modes; @@ -17,7 +17,7 @@ - (void)onRemoveExceptions:(id)sender; @end -@interface NSObject (ChanBanExceptionSheetDelegate) -- (void)chanBanExceptionDialogOnUpdate:(ChanBanExceptionSheet *)sender; -- (void)chanBanExceptionDialogWillClose:(ChanBanExceptionSheet *)sender; +@interface NSObject (TXChanBanExceptionSheetDelegate) +- (void)chanBanExceptionDialogOnUpdate:(TDChanBanExceptionSheet *)sender; +- (void)chanBanExceptionDialogWillClose:(TDChanBanExceptionSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/ChanBanSheet.h b/Classes/Headers/TDChanBanSheet.h similarity index 69% rename from Classes/Headers/ChanBanSheet.h rename to Classes/Headers/TDChanBanSheet.h index 0808a251be..0d9b8eac43 100755 --- a/Classes/Headers/ChanBanSheet.h +++ b/Classes/Headers/TDChanBanSheet.h @@ -2,8 +2,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ChanBanSheet : SheetBase -@property (nonatomic, strong) ListView *table; +@interface TDChanBanSheet : TDCSheetBase +@property (nonatomic, strong) TVCListView *table; @property (nonatomic, strong) NSTextField *header; @property (nonatomic, strong) NSMutableArray *list; @property (nonatomic, strong) NSMutableArray *modes; @@ -17,7 +17,7 @@ - (void)onRemoveBans:(id)sender; @end -@interface NSObject (ChanBanDialogDelegate) -- (void)chanBanDialogOnUpdate:(ChanBanSheet *)sender; -- (void)chanBanDialogWillClose:(ChanBanSheet *)sender; +@interface NSObject (TXChanBanDialogDelegate) +- (void)chanBanDialogOnUpdate:(TDChanBanSheet *)sender; +- (void)chanBanDialogWillClose:(TDChanBanSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/ChanInviteExceptionSheet.h b/Classes/Headers/TDChanInviteExceptionSheet.h similarity index 64% rename from Classes/Headers/ChanInviteExceptionSheet.h rename to Classes/Headers/TDChanInviteExceptionSheet.h index 25d59c3c25..12710495a0 100755 --- a/Classes/Headers/ChanInviteExceptionSheet.h +++ b/Classes/Headers/TDChanInviteExceptionSheet.h @@ -2,8 +2,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ChanInviteExceptionSheet : SheetBase -@property (nonatomic, strong) ListView *table; +@interface TDChanInviteExceptionSheet : TDCSheetBase +@property (nonatomic, strong) TVCListView *table; @property (nonatomic, strong) NSTextField *header; @property (nonatomic, strong) NSMutableArray *list; @property (nonatomic, strong) NSMutableArray *modes; @@ -17,7 +17,7 @@ - (void)onRemoveExceptions:(id)sender; @end -@interface NSObject (ChanInviteExceptionSheetDelegate) -- (void)chanInviteExceptionDialogOnUpdate:(ChanInviteExceptionSheet *)sender; -- (void)chanInviteExceptionDialogWillClose:(ChanInviteExceptionSheet *)sender; +@interface NSObject (TXChanInviteExceptionSheetDelegate) +- (void)chanInviteExceptionDialogOnUpdate:(TDChanInviteExceptionSheet *)sender; +- (void)chanInviteExceptionDialogWillClose:(TDChanInviteExceptionSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/ChannelSheet.h b/Classes/Headers/TDChannelSheet.h similarity index 88% rename from Classes/Headers/ChannelSheet.h rename to Classes/Headers/TDChannelSheet.h index 95ef384b01..5471b89d7f 100755 --- a/Classes/Headers/ChannelSheet.h +++ b/Classes/Headers/TDChannelSheet.h @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface ChannelSheet : SheetBase +@interface TDChannelSheet : TDCSheetBase @property (nonatomic, assign) NSInteger uid; @property (nonatomic, assign) NSInteger cid; @property (nonatomic, strong) NSView *contentView; @@ -33,7 +33,7 @@ - (void)onMenuBarItemChanged:(id)sender; @end -@interface NSObject (ChannelSheetDelegate) -- (void)ChannelSheetOnOK:(ChannelSheet *)sender; -- (void)ChannelSheetWillClose:(ChannelSheet *)sender; +@interface NSObject (TXChannelSheetDelegate) +- (void)channelSheetOnOK:(TDChannelSheet *)sender; +- (void)channelSheetWillClose:(TDChannelSheet *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/TextualPluginItem.h b/Classes/Headers/THOPluginItem.h similarity index 80% rename from Classes/Headers/TextualPluginItem.h rename to Classes/Headers/THOPluginItem.h index dc155b2873..d8e8cdedcd 100755 --- a/Classes/Headers/TextualPluginItem.h +++ b/Classes/Headers/THOPluginItem.h @@ -2,9 +2,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface TextualPluginItem : NSObject +@class THOPluginProtocol; + +@interface THOTextualPluginItem : NSObject @property (nonatomic, strong) NSBundle *pluginBundle; -@property (nonatomic, strong) PluginProtocol *pluginPrimaryClass; +@property (nonatomic, strong) THOPluginProtocol *pluginPrimaryClass; - (void)initWithPluginClass:(Class)primaryClass andBundle:(NSBundle *)bundle diff --git a/Classes/Headers/PluginProtocol.h b/Classes/Headers/THOPluginProtocol.h similarity index 95% rename from Classes/Headers/PluginProtocol.h rename to Classes/Headers/THOPluginProtocol.h index 7b2e32f6cc..def2fb5900 100755 --- a/Classes/Headers/PluginProtocol.h +++ b/Classes/Headers/THOPluginProtocol.h @@ -4,7 +4,7 @@ /* Model for Textual plugins */ -@interface PluginProtocol : NSObject +@interface THOPluginProtocol : NSObject /* Supported Commands */ - (NSArray *)pluginSupportsUserInputCommands; @@ -29,5 +29,4 @@ /* Preference Pane */ - (NSView *)preferencesView; - (NSString *)preferencesMenuItemName; - @end \ No newline at end of file diff --git a/Classes/Headers/UnicodeHelper.h b/Classes/Headers/THOUnicodeHelper.h similarity index 90% rename from Classes/Headers/UnicodeHelper.h rename to Classes/Headers/THOUnicodeHelper.h index 191b108b0f..b4303786d7 100755 --- a/Classes/Headers/UnicodeHelper.h +++ b/Classes/Headers/THOUnicodeHelper.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface UnicodeHelper : NSObject +@interface THOUnicodeHelper : NSObject + (BOOL)isPrivate:(UniChar)c; + (BOOL)isIdeographic:(UniChar)c; + (BOOL)isIdeographicOrPrivate:(UniChar)c; diff --git a/Classes/Headers/FileLogger.h b/Classes/Headers/TLOFileLogger.h similarity index 91% rename from Classes/Headers/FileLogger.h rename to Classes/Headers/TLOFileLogger.h index 44e7f6de05..056ba4db4a 100755 --- a/Classes/Headers/FileLogger.h +++ b/Classes/Headers/TLOFileLogger.h @@ -3,9 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@class IRCClient, IRCChannel; - -@interface FileLogger : NSObject +@interface TLOFileLogger : NSObject @property (nonatomic, weak) IRCClient *client; @property (nonatomic, weak) IRCChannel *channel; @property (nonatomic, strong) NSString *filename; diff --git a/Classes/Headers/FileWithContent.h b/Classes/Headers/TLOFileWithContent.h similarity index 91% rename from Classes/Headers/FileWithContent.h rename to Classes/Headers/TLOFileWithContent.h index 7c651e8e20..d6a50bf79e 100755 --- a/Classes/Headers/FileWithContent.h +++ b/Classes/Headers/TLOFileWithContent.h @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface FileWithContent : NSObject +@interface TLOFileWithContent : NSObject @property (nonatomic, strong) NSString *filename; @property (nonatomic, weak) NSString *content; @end \ No newline at end of file diff --git a/Classes/Headers/GrowlController.h b/Classes/Headers/TLOGrowlController.h similarity index 51% rename from Classes/Headers/GrowlController.h rename to Classes/Headers/TLOGrowlController.h index 3cd37bef22..1379c9736a 100755 --- a/Classes/Headers/GrowlController.h +++ b/Classes/Headers/TLOGrowlController.h @@ -8,29 +8,29 @@ @class IRCWorld; typedef enum { - NOTIFICATION_HIGHLIGHT = 1000, - NOTIFICATION_NEW_TALK = 1001, - NOTIFICATION_CHANNEL_MSG = 1002, - NOTIFICATION_CHANNEL_NOTICE = 1003, - NOTIFICATION_TALK_MSG = 1004, - NOTIFICATION_TALK_NOTICE = 1005, - NOTIFICATION_KICKED = 1006, - NOTIFICATION_INVITED = 1007, - NOTIFICATION_LOGIN = 1008, - NOTIFICATION_DISCONNECT = 1009, - NOTIFICATION_ADDRESS_BOOK_MATCH = 1010, -} NotificationType; + TXNotificationHighlightType = 1000, + TXNotificationNewQueryType = 1001, + TXNotificationChannelMessageType = 1002, + TXNotificationChannelNoticeType = 1003, + TXNotificationQueryMessageType = 1004, + TXNotificationQueryNoticeType = 1005, + TXNotificationKickType = 1006, + TXNotificationInviteType = 1007, + TXNotificationConnectType = 1008, + TXNotificationDisconnectType = 1009, + TXNotificationAddressBookMatchType = 1010, +} TXNotificationType; -#ifdef _USES_NATIVE_NOTIFICATION_CENTER +#ifdef TXNativeNotificationCenterAvailable #define GrowlControllerDelegate GrowlApplicationBridgeDelegate,NSUserNotificationCenterDelegate #else #define GrowlControllerDelegate GrowlApplicationBridgeDelegate #endif -@interface GrowlController : NSObject +@interface TLOGrowlController : NSObject @property (nonatomic, weak) IRCWorld *owner; @property (nonatomic, strong) id lastClickedContext; @property (nonatomic, assign) CFAbsoluteTime lastClickedTime; -- (void)notify:(NotificationType)type title:(NSString *)title desc:(NSString *)desc userInfo:(NSDictionary *)info; +- (void)notify:(TXNotificationType)type title:(NSString *)title desc:(NSString *)desc userInfo:(NSDictionary *)info; @end \ No newline at end of file diff --git a/Classes/Headers/InputHistory.h b/Classes/Headers/TLOInputHistory.h similarity index 93% rename from Classes/Headers/InputHistory.h rename to Classes/Headers/TLOInputHistory.h index ee5f988614..98df1d1a80 100755 --- a/Classes/Headers/InputHistory.h +++ b/Classes/Headers/TLOInputHistory.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface InputHistory : NSObject +@interface TLOInputHistory : NSObject @property (nonatomic, strong) id lastHistoryItem; @property (nonatomic, strong) NSMutableArray *buf; @property (nonatomic, assign) NSInteger pos; diff --git a/Classes/Headers/KeyEventHandler.h b/Classes/Headers/TLOKeyEventHandler.h similarity index 59% rename from Classes/Headers/KeyEventHandler.h rename to Classes/Headers/TLOKeyEventHandler.h index 0c961410e3..b7a5012465 100755 --- a/Classes/Headers/KeyEventHandler.h +++ b/Classes/Headers/TLOKeyEventHandler.h @@ -2,23 +2,23 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define KEY_RETURN 0x24 -#define KEY_TAB 0x30 -#define KEY_SPACE 0x31 -#define KEY_BACKSPACE 0x33 -#define KEY_ESCAPE 0x35 -#define KEY_ENTER 0x4C -#define KEY_HOME 0x73 -#define KEY_PAGE_UP 0x74 -#define KEY_DELETE 0x75 -#define KEY_END 0x77 -#define KEY_PAGE_DOWN 0x79 -#define KEY_LEFT 0x7B -#define KEY_RIGHT 0x7C -#define KEY_DOWN 0x7D -#define KEY_UP 0x7E +#define TXKeyReturnCode 0x24 +#define TXKeyTabCode 0x30 +#define TXKeySpacebarCode 0x31 +#define TXKeyBackspaceCode 0x33 +#define TXKeyEscapeCode 0x35 +#define TXKeyEnterCode 0x4C +#define TXKeyHomeCode 0x73 +#define TXKeyPageUpCode 0x74 +#define TXKeyDeleteCode 0x75 +#define TXKeyEndCode 0x77 +#define TXKeyPageDownCode 0x79 +#define TXKeyLeftArrowCode 0x7B +#define TXKeyRightArrowCode 0x7C +#define TXKeyDownArrowCode 0x7D +#define TXKeyUpArrowCode 0x7E -@interface KeyEventHandler : NSObject +@interface TLOKeyEventHandler : NSObject @property (nonatomic, unsafe_unretained) id target; @property (nonatomic, strong) NSMutableDictionary *codeHandlerMap; @property (nonatomic, strong) NSMutableDictionary *characterHandlerMap; diff --git a/Classes/Headers/LanguagePreferences.h b/Classes/Headers/TLOLanguagePreferences.h similarity index 87% rename from Classes/Headers/LanguagePreferences.h rename to Classes/Headers/TLOLanguagePreferences.h index af85fb88eb..8fb8662982 100755 --- a/Classes/Headers/LanguagePreferences.h +++ b/Classes/Headers/TLOLanguagePreferences.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface LanguagePreferences : NSObject +@interface TLOLanguagePreferences : NSObject + (void)setThemeForLocalization:(NSString *)path; + (NSString *)localizedStringWithKey:(NSString *)key; @end \ No newline at end of file diff --git a/Classes/Headers/URLParser.h b/Classes/Headers/TLOLinkParser.h similarity index 89% rename from Classes/Headers/URLParser.h rename to Classes/Headers/TLOLinkParser.h index 70346d6cd6..f3f4a9fafa 100755 --- a/Classes/Headers/URLParser.h +++ b/Classes/Headers/TLOLinkParser.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface URLParser : NSObject +@interface TLOLinkParser : NSObject + (NSArray *)locatedLinksForString:(NSString *)body; + (NSArray *)bannedURLRegexLineTypes; @end \ No newline at end of file diff --git a/Classes/Headers/NickCompletionStatus.h b/Classes/Headers/TLONickCompletionStatus.h similarity index 87% rename from Classes/Headers/NickCompletionStatus.h rename to Classes/Headers/TLONickCompletionStatus.h index 429a6c11e3..a6dbaa1dcc 100755 --- a/Classes/Headers/NickCompletionStatus.h +++ b/Classes/Headers/TLONickCompletionStatus.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface NickCompletionStatus : NSObject +@interface TLONickCompletionStatus : NSObject @property (nonatomic, strong) NSString *text; @property (nonatomic, assign) NSRange range; diff --git a/Classes/Headers/PopupPrompts.h b/Classes/Headers/TLOPopupPrompts.h similarity index 86% rename from Classes/Headers/PopupPrompts.h rename to Classes/Headers/TLOPopupPrompts.h index e7e2457a50..2d4159c822 100755 --- a/Classes/Headers/PopupPrompts.h +++ b/Classes/Headers/TLOPopupPrompts.h @@ -2,12 +2,12 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define PopupPromptSuppressionPrefix @"Preferences.prompts." +#define TXPopupPromptSuppressionPrefix @"Preferences.prompts." -@interface PopupPrompts : NSObject -@property (nonatomic, unsafe_unretained) id _targetClass; +@interface TLOPopupPrompts : NSObject +@property (nonatomic, unsafe_unretained) id target; +@property (nonatomic, unsafe_unretained) SEL selector; @property (nonatomic, assign) id _suppressionKey; -@property (nonatomic, assign) SEL _actionSelector; + (void)popupPromptNULLSelector:(NSInteger)returnCode; diff --git a/Classes/Headers/TXRegularExpression.h b/Classes/Headers/TLORegularExpression.h similarity index 95% rename from Classes/Headers/TXRegularExpression.h rename to Classes/Headers/TLORegularExpression.h index fa6f4cd84a..5c5f6c5382 100755 --- a/Classes/Headers/TXRegularExpression.h +++ b/Classes/Headers/TLORegularExpression.h @@ -4,7 +4,7 @@ @class NSRegularExpression; -@interface TXRegularExpression : NSObject +@interface TLORegularExpression : NSObject + (NSArray *)matchesInString:(NSString *)haystack withRegex:(NSString *)needle; + (NSArray *)matchesInString:(NSString *)haystack withRegex:(NSString *)needle withoutCase:(BOOL)caseless; diff --git a/Classes/Headers/TCPClient.h b/Classes/Headers/TLOSocketClient.h similarity index 79% rename from Classes/Headers/TCPClient.h rename to Classes/Headers/TLOSocketClient.h index 9102810dfc..c8a6462d06 100755 --- a/Classes/Headers/TCPClient.h +++ b/Classes/Headers/TLOSocketClient.h @@ -2,12 +2,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@class IRCClient; - -@interface TCPClient : NSObject +@interface TLOSocketClient : NSObject +@property (nonatomic, unsafe_unretained) id delegate; @property (nonatomic, strong) NSMutableData *buffer; @property (nonatomic, strong) id conn; -@property (nonatomic, unsafe_unretained) id delegate; @property (nonatomic, strong) NSString *host; @property (nonatomic, assign) NSInteger port; @property (nonatomic, assign) BOOL useSSL; @@ -33,9 +31,9 @@ @end @interface NSObject (TCPClientDelegate) -- (void)tcpClientDidConnect:(TCPClient *)sender; -- (void)tcpClientDidDisconnect:(TCPClient *)sender; -- (void)tcpClient:(TCPClient *)sender error:(NSString *)error; -- (void)tcpClientDidReceiveData:(TCPClient *)sender; -- (void)tcpClientDidSendData:(TCPClient *)sender; +- (void)tcpClientDidConnect:(TLOSocketClient *)sender; +- (void)tcpClientDidDisconnect:(TLOSocketClient *)sender; +- (void)tcpClient:(TLOSocketClient *)sender error:(NSString *)error; +- (void)tcpClientDidReceiveData:(TLOSocketClient *)sender; +- (void)tcpClientDidSendData:(TLOSocketClient *)sender; @end diff --git a/Classes/Headers/SoundPlayer.h b/Classes/Headers/TLOSoundPlayer.h similarity index 88% rename from Classes/Headers/SoundPlayer.h rename to Classes/Headers/TLOSoundPlayer.h index 09a621e537..271f463352 100755 --- a/Classes/Headers/SoundPlayer.h +++ b/Classes/Headers/TLOSoundPlayer.h @@ -2,6 +2,6 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface SoundPlayer : NSObject +@interface TLOSoundPlayer : NSObject + (void)play:(NSString *)name isMuted:(BOOL)muted; @end \ No newline at end of file diff --git a/Classes/Headers/Timer.h b/Classes/Headers/TLOTimer.h similarity index 80% rename from Classes/Headers/Timer.h rename to Classes/Headers/TLOTimer.h index 2c1a755c5d..20f9b5fbfb 100755 --- a/Classes/Headers/Timer.h +++ b/Classes/Headers/TLOTimer.h @@ -2,10 +2,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface Timer : NSObject +@interface TLOTimer : NSObject @property (nonatomic, unsafe_unretained) id delegate; +@property (nonatomic, unsafe_unretained) SEL selector; @property (nonatomic, assign) BOOL reqeat; -@property (nonatomic, assign) SEL selector; @property (nonatomic, readonly) BOOL isActive; @property (nonatomic, strong) NSTimer *timer; @@ -14,5 +14,5 @@ @end @interface NSObject (TimerDelegate) -- (void)timerOnTimer:(Timer *)sender; +- (void)timerOnTimer:(TLOTimer *)sender; @end \ No newline at end of file diff --git a/Classes/Headers/TimerCommand.h b/Classes/Headers/TLOTimerCommand.h similarity index 90% rename from Classes/Headers/TimerCommand.h rename to Classes/Headers/TLOTimerCommand.h index c93517f5c3..539169ea20 100755 --- a/Classes/Headers/TimerCommand.h +++ b/Classes/Headers/TLOTimerCommand.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface TimerCommand : NSObject +@interface TLOTimerCommand : NSObject @property (nonatomic, assign) CFAbsoluteTime time; @property (nonatomic, assign) NSInteger cid; @property (nonatomic, copy) NSString *input; diff --git a/Classes/Headers/URLOpener.h b/Classes/Headers/TLOpenLink.h similarity index 89% rename from Classes/Headers/URLOpener.h rename to Classes/Headers/TLOpenLink.h index ffc836d61c..a352054d5a 100755 --- a/Classes/Headers/URLOpener.h +++ b/Classes/Headers/TLOpenLink.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface URLOpener : NSObject +@interface TLOpenLink : NSObject + (void)open:(NSURL *)url; + (void)openAndActivate:(NSURL *)url; @end \ No newline at end of file diff --git a/Classes/Headers/OtherTheme.h b/Classes/Headers/TPCOtherTheme.h similarity index 76% rename from Classes/Headers/OtherTheme.h rename to Classes/Headers/TPCOtherTheme.h index 84c1791cb7..e38938831f 100755 --- a/Classes/Headers/OtherTheme.h +++ b/Classes/Headers/TPCOtherTheme.h @@ -3,17 +3,17 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define THEME_DISABLED_INDENTATION_OFFSET -99 +#define TXThemeDisabledIndentationOffset -99 -@interface OtherTheme : NSObject +@interface TPCOtherTheme : NSObject @property (nonatomic, strong) NSString *path; @property (nonatomic, strong) NSFont *channelViewFont; @property (nonatomic, strong) NSString *nicknameFormat; @property (nonatomic, strong) NSString *timestampFormat; @property (nonatomic, assign) BOOL channelViewFontOverrode; @property (nonatomic, strong) NSColor *underlyingWindowColor; -@property (nonatomic, assign) NSDoubleN indentationOffset; -@property (nonatomic, assign) NSDoubleN renderingEngineVersion; +@property (nonatomic, assign) TXNSDouble indentationOffset; +@property (nonatomic, assign) TXNSDouble renderingEngineVersion; - (void)reload; @end \ No newline at end of file diff --git a/Classes/Headers/Preferences.h b/Classes/Headers/TPCPreferences.h similarity index 61% rename from Classes/Headers/Preferences.h rename to Classes/Headers/TPCPreferences.h index 8501ff0e23..0a3d73d568 100755 --- a/Classes/Headers/Preferences.h +++ b/Classes/Headers/TPCPreferences.h @@ -3,46 +3,48 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define DEFAULT_TEXTUAL_STYLE @"resource:Simplified Light" -#define DEFAULT_TEXTUAL_FONT @"Lucida Grande" +#define TXDefaultTextualLogStyle @"resource:Simplified Light" +#define TXDefaultTextualLogFont @"Lucida Grande" +#define TXDefaultTextualTimestampFormat @"[%H:%M:%S]" +#define TXDefaultTextualNicknameFormat @"<%@%n>" typedef enum { - KEYWORD_MATCH_PARTIAL = 0, - KEYWORD_MATCH_EXACT, - KEYWORD_MATCH_REGEX, -} KeywordMatchType; + TXNicknameHighlightPartialMatchType = 0, + TXNicknameHighlightExactMatchType, + TXNicknameHighlightRegularExpressionMatchType, +} TXNicknameHighlightMatchType; typedef enum { - TAB_COMPLETE_NICK = 0, - TAB_UNREAD, - TAB_NONE = 100, -} TabActionType; + TXTabKeyActionNickCompleteType = 0, + TXTabKeyActionUnreadChannelType, + TXTabKeyActionNoneType = 100, +} TXTabKeyActionType; typedef enum { - USERDC_ACTION_WHOIS = 100, - USERDC_ACTION_QUERY = 200, -} UserDoubleClickAction; + TXUserDoubleClickWhoisAction = 100, + TXUserDoubleClickQueryAction = 200, +} TXUserDoubleClickAction; typedef enum { - NOTICES_SENDTO_CONSOLE = 0, - NOTICES_SENDTO_CURCHAN = 1, -} NoticesSendToLocation; + TXNoticeSendServerConsoleType = 0, + TXNoticeSendCurrentChannelType = 1, +} TXNoticeSendLocationType; typedef enum { - CMDWKEY_SHORTCUT_CLOSE = 0, - CMDWKEY_SHORTCUT_PARTC = 1, - CMDWKEY_SHORTCUT_DISCT = 2, - CMDWKEY_SHORTCUT_QUITA = 3, -} CmdWShortcutResponseType; + TXCmdWShortcutCloseWindowType = 0, + TXCmdWShortcutPartChannelType = 1, + TXCmdWShortcutDisconnectType = 2, + TXCmdWShortcutTerminateType = 3, +} TXCmdWShortcutResponseType; typedef enum { - HMBAN_FORMAT_WHNIN = 0, // With Hostmask, No Username/Nickname - HMBAN_FORMAT_WHAINN = 1, // With Hostmask and Username, No Nickname - HMBAN_FORMAT_WHANNI = 2, // With Hostmask and Nickname, No Username - HMBAN_FORMAT_EXACT = 3, // Exact Match -} HostmaskBanFormat; + TXHostmaskBanWHNINFormat = 0, // With Hostmask, No Username/Nickname + TXHostmaskBanWHAINNFormat = 1, // With Hostmask and Username, No Nickname + TXHostmaskBanWHANNIFormat = 2, // With Hostmask and Nickname, No Username + TXHostmaskBanExactFormat = 3, // Exact Match +} TXHostmaskBanFormat; -@interface Preferences : NSObject +@interface TPCPreferences : NSObject + (BOOL)sandboxEnabled; + (NSInteger)startTime; @@ -59,8 +61,8 @@ typedef enum { + (NSString *)gitBuildReference; -+ (NSDoubleN)viewLoopConsoleDelay; -+ (NSDoubleN)viewLoopChannelDelay; ++ (TXNSDouble)viewLoopConsoleDelay; ++ (TXNSDouble)viewLoopChannelDelay; + (NSDictionary *)textualInfoPlist; + (NSDictionary *)systemInfoPlist; @@ -70,7 +72,7 @@ typedef enum { + (NSString *)whereThemesPath; + (NSString *)whereScriptsLocalPath; -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER +#ifdef TXUserScriptsFolderAvailable + (NSString *)whereScriptsUnsupervisedPath; #endif @@ -106,7 +108,7 @@ typedef enum { + (BOOL)nickAllConnections; + (BOOL)clearAllOnlyOnActiveServer; -+ (NoticesSendToLocation)locationToSendNotices; ++ (TXNoticeSendLocationType)locationToSendNotices; + (BOOL)trackConversations; + (BOOL)disableNicknameColors; @@ -114,7 +116,7 @@ typedef enum { + (BOOL)logAllHighlightsToQuery; + (BOOL)keywordCurrentNick; -+ (KeywordMatchType)keywordMatchingMethod; ++ (TXNicknameHighlightMatchType)keywordMatchingMethod; + (BOOL)displayDockBadge; + (BOOL)countPublicMessagesInIconBadge; @@ -137,7 +139,7 @@ typedef enum { + (BOOL)autojoinWaitForNickServ; + (BOOL)inputHistoryIsChannelSpecific; -+ (CmdWShortcutResponseType)cmdWResponseType; ++ (TXCmdWShortcutResponseType)cmdWResponseType; + (BOOL)logTranscript; @@ -148,10 +150,10 @@ typedef enum { + (BOOL)joinOnDoubleclick; + (BOOL)leaveOnDoubleclick; -+ (UserDoubleClickAction)userDoubleClickOption; ++ (TXUserDoubleClickAction)userDoubleClickOption; + (NSInteger)autojoinMaxChannelJoins; -+ (HostmaskBanFormat)banFormat; ++ (TXHostmaskBanFormat)banFormat; + (NSInteger)inlineImagesMaxWidth; + (void)setInlineImagesMaxWidth:(NSInteger)value; @@ -160,31 +162,31 @@ typedef enum { + (NSString *)themeChannelViewFontName; + (NSString *)themeNickFormat; + (NSString *)themeTimestampFormat; -+ (NSDoubleN)themeTransparency; -+ (NSDoubleN)themeChannelViewFontSize; ++ (TXNSDouble)themeTransparency; ++ (TXNSDouble)themeChannelViewFontSize; + (void)setThemeName:(NSString *)value; + (void)setThemeChannelViewFontName:(NSString *)value; -+ (void)setThemeChannelViewFontSize:(NSDoubleN)value; ++ (void)setThemeChannelViewFontSize:(TXNSDouble)value; + (NSInteger)maxLogLines; + (void)setMaxLogLines:(NSInteger)value; + (BOOL)stopGrowlOnActive; -+ (NSString *)titleForEvent:(NotificationType)event; -+ (NSString *)soundForEvent:(NotificationType)event; ++ (NSString *)titleForEvent:(TXNotificationType)event; ++ (NSString *)soundForEvent:(TXNotificationType)event; -+ (BOOL)growlEnabledForEvent:(NotificationType)event; -+ (BOOL)growlStickyForEvent:(NotificationType)event; -+ (BOOL)disableWhileAwayForEvent:(NotificationType)event; ++ (BOOL)growlEnabledForEvent:(TXNotificationType)event; ++ (BOOL)growlStickyForEvent:(TXNotificationType)event; ++ (BOOL)disableWhileAwayForEvent:(TXNotificationType)event; -+ (void)setSound:(NSString *)value forEvent:(NotificationType)event; -+ (void)setGrowlEnabled:(BOOL)value forEvent:(NotificationType)event; -+ (void)setGrowlSticky:(BOOL)value forEvent:(NotificationType)event; -+ (void)setDisableWhileAway:(BOOL)value forEvent:(NotificationType)event; ++ (void)setSound:(NSString *)value forEvent:(TXNotificationType)event; ++ (void)setGrowlEnabled:(BOOL)value forEvent:(TXNotificationType)event; ++ (void)setGrowlSticky:(BOOL)value forEvent:(TXNotificationType)event; ++ (void)setDisableWhileAway:(BOOL)value forEvent:(TXNotificationType)event; -+ (TabActionType)tabAction; ++ (TXTabKeyActionType)tabAction; + (NSString *)completionSuffix; + (void)setCompletionSuffix:(NSString *)value; diff --git a/Classes/Headers/ViewTheme.h b/Classes/Headers/TPCViewTheme.h similarity index 83% rename from Classes/Headers/ViewTheme.h rename to Classes/Headers/TPCViewTheme.h index 3306377f13..a5127bb038 100755 --- a/Classes/Headers/ViewTheme.h +++ b/Classes/Headers/TPCViewTheme.h @@ -3,12 +3,12 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface ViewTheme : NSObject +@interface TPCViewTheme : NSObject @property (nonatomic, strong) NSURL *baseUrl; @property (nonatomic, strong) NSString *path; @property (nonatomic, strong) NSString *name; -@property (nonatomic, strong) OtherTheme *other; -@property (nonatomic, strong) FileWithContent *core_js; +@property (nonatomic, strong) TPCOtherTheme *other; +@property (nonatomic, strong) TLOFileWithContent *core_js; - (void)reload; - (void)validateFilePathExistanceAndReload:(BOOL)reload; diff --git a/Classes/Headers/DockIcon.h b/Classes/Headers/TVCDockIcon.h similarity index 66% rename from Classes/Headers/DockIcon.h rename to Classes/Headers/TVCDockIcon.h index ccdd46a544..e5e2de8a88 100755 --- a/Classes/Headers/DockIcon.h +++ b/Classes/Headers/TVCDockIcon.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface DockIcon : NSObject +@interface TVCDockIcon : NSObject + (void)drawWithoutCounts; -+ (void)drawWithHilightCount:(NSInteger)hilight_count messageCount:(NSInteger)message_count; ++ (void)drawWithHilightCount:(NSInteger)highlightCount messageCount:(NSInteger)messageCount; @end \ No newline at end of file diff --git a/Classes/Headers/ImageURLParser.h b/Classes/Headers/TVCImageURLParser.h similarity index 72% rename from Classes/Headers/ImageURLParser.h rename to Classes/Headers/TVCImageURLParser.h index fbbf5249db..7b27f80f00 100755 --- a/Classes/Headers/ImageURLParser.h +++ b/Classes/Headers/TVCImageURLParser.h @@ -2,6 +2,6 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface ImageURLParser : NSObject -+ (NSString *)imageURLForURL:(NSString *)url; +@interface TVCImageURLParser : NSObject ++ (NSString *)imageURLFromBase:(NSString *)url; @end \ No newline at end of file diff --git a/Classes/Headers/InputPromptDialog.h b/Classes/Headers/TVCInputPromptDialog.h similarity index 96% rename from Classes/Headers/InputPromptDialog.h rename to Classes/Headers/TVCInputPromptDialog.h index db44491485..4223209b71 100755 --- a/Classes/Headers/InputPromptDialog.h +++ b/Classes/Headers/TVCInputPromptDialog.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@interface InputPromptDialog : NSObject +@interface TVCInputPromptDialog : NSObject @property (nonatomic, assign) NSInteger buttonClicked; @property (nonatomic, strong) NSString *finalModalValue; @property (nonatomic, strong) NSWindow *dialogWindow; @@ -25,5 +25,4 @@ - (void)modalDidCloseWithDefaultButton:(id)sender; - (void)modalDidCloseWithAlternateButton:(id)sender; - @end \ No newline at end of file diff --git a/Classes/Headers/InputTextField.h b/Classes/Headers/TVCInputTextField.h similarity index 52% rename from Classes/Headers/InputTextField.h rename to Classes/Headers/TVCInputTextField.h index 2a94777be3..0d4b6b90ca 100755 --- a/Classes/Headers/InputTextField.h +++ b/Classes/Headers/TVCInputTextField.h @@ -2,16 +2,14 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@class TextField; - -@interface InputTextField : TextField -@property (nonatomic, assign) id _actionTarget; -@property (nonatomic, assign) SEL _actionSelector; -@property (nonatomic, strong) NSAttributedString *_placeholderString; +@interface TVCInputTextField : TVCTextField +@property (nonatomic, unsafe_unretained) id actionTarget; +@property (nonatomic, unsafe_unretained) SEL actionSelector; +@property (nonatomic, strong) NSAttributedString *placeholderString; - (void)resetTextFieldCellSize; - (void)setReturnActionWithSelector:(SEL)selector owner:(id)owner; @end -@interface InputTextFieldScroller : NSScrollView +@interface TVCInputTextFieldScroller : NSScrollView @end \ No newline at end of file diff --git a/Classes/Headers/ListSeparatorCell.h b/Classes/Headers/TVCListSeparatorCell.h similarity index 69% rename from Classes/Headers/ListSeparatorCell.h rename to Classes/Headers/TVCListSeparatorCell.h index 6bf2192464..2dc40bf432 100755 --- a/Classes/Headers/ListSeparatorCell.h +++ b/Classes/Headers/TVCListSeparatorCell.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define ListSeparatorCellIndex @"----" +#define TXDefaultListSeperatorCellIndex @"----" -@interface ListSeparatorCell : NSTextFieldCell +@interface TVCListSeparatorCell : NSTextFieldCell @end \ No newline at end of file diff --git a/Classes/Headers/ListView.h b/Classes/Headers/TVCListView.h similarity index 84% rename from Classes/Headers/ListView.h rename to Classes/Headers/TVCListView.h index bfce519bff..57d4c4c602 100755 --- a/Classes/Headers/ListView.h +++ b/Classes/Headers/TVCListView.h @@ -2,15 +2,17 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define DefaultListViewFont [NSFont fontWithName:@"Lucida Grande" size:12.0] +#define TXDefaultListViewControllerFont [NSFont fontWithName:@"Lucida Grande" size:12.0] -@interface ListView : NSTableView +@interface TVCListView : NSTableView @property (nonatomic, unsafe_unretained) id keyDelegate; @property (nonatomic, unsafe_unretained) id textDelegate; - (NSInteger)countSelectedRows; - (NSArray *)selectedRows; + - (void)selectItemAtIndex:(NSInteger)index; + - (void)selectRows:(NSArray *)indices; - (void)selectRows:(NSArray *)indices extendSelection:(BOOL)extend; @end diff --git a/Classes/Headers/LogController.h b/Classes/Headers/TVCLogController.h similarity index 80% rename from Classes/Headers/LogController.h rename to Classes/Headers/TVCLogController.h index 74f53fc019..7edad0799e 100755 --- a/Classes/Headers/LogController.h +++ b/Classes/Headers/TVCLogController.h @@ -3,42 +3,43 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@class IRCWorld, IRCClient, IRCChannel; +@class TVCWebViewAutoScroll; +@class TVCLogView, TVCLogPolicy, TVCLogScriptEventSink; -typedef BOOL (^MessageBlock)(void); +typedef BOOL (^TVCLogMessageBlock)(void); -@interface LogController : NSObject -@property (nonatomic, assign) NSInteger lastVisitedHighlight; -@property (nonatomic, assign) BOOL queueInProgress; -@property (nonatomic, assign) dispatch_queue_t messageQueueDispatch; -@property (nonatomic, strong) LogView *view; +@interface TVCLogController : NSObject +@property (nonatomic, strong) NSString *html; @property (nonatomic, weak) IRCWorld *world; @property (nonatomic, weak) IRCClient *client; @property (nonatomic, weak) IRCChannel *channel; -@property (nonatomic, assign) BOOL bottom; -@property (nonatomic, assign) BOOL loaded; @property (nonatomic, strong) NSMenu *menu; @property (nonatomic, strong) NSMenu *urlMenu; @property (nonatomic, strong) NSMenu *chanMenu; @property (nonatomic, strong) NSMenu *memberMenu; -@property (nonatomic, strong) ViewTheme *theme; -@property (nonatomic, assign) NSInteger maxLines; -@property (nonatomic, assign) BOOL viewingBottom; -@property (nonatomic, strong) LogPolicy *policy; +@property (nonatomic, strong) TPCViewTheme *theme; +@property (nonatomic, strong) TVCLogView *view; +@property (nonatomic, strong) TVCLogPolicy *policy; +@property (nonatomic, strong) TVCLogScriptEventSink *sink; +@property (nonatomic, strong) TVCWebViewAutoScroll *autoScroller; @property (nonatomic, strong) WebScriptObject *js; -@property (nonatomic, strong) LogScriptEventSink *sink; -@property (nonatomic, strong) WebViewAutoScroll *autoScroller; +@property (nonatomic, assign) BOOL bottom; +@property (nonatomic, assign) BOOL loaded; +@property (nonatomic, assign) BOOL queueInProgress; +@property (nonatomic, assign) BOOL viewingBottom; +@property (nonatomic, assign) BOOL scrollBottom; @property (nonatomic, assign) BOOL becameVisible; @property (nonatomic, assign) BOOL movingToBottom; -@property (nonatomic, assign) NSInteger lineNumber; -@property (nonatomic, assign) NSInteger count; @property (nonatomic, assign) BOOL needsLimitNumberOfLines; -@property (nonatomic, assign) NSInteger loadingImages; -@property (nonatomic, strong) NSString *html; -@property (nonatomic, assign) BOOL scrollBottom; +@property (nonatomic, assign) NSInteger count; @property (nonatomic, assign) NSInteger scrollTop; +@property (nonatomic, assign) NSInteger maxLines; +@property (nonatomic, assign) NSInteger lineNumber; +@property (nonatomic, assign) NSInteger loadingImages; +@property (nonatomic, assign) NSInteger lastVisitedHighlight; @property (nonatomic, strong) NSMutableArray *messageQueue; @property (nonatomic, strong) NSMutableArray *highlightedLineNumbers; +@property (nonatomic, assign) dispatch_queue_t messageQueueDispatch; - (void)setUp; - (void)restorePosition; @@ -67,8 +68,8 @@ typedef BOOL (^MessageBlock)(void); - (void)changeTextSize:(BOOL)bigger; -- (BOOL)print:(LogLine *)line; -- (BOOL)print:(LogLine *)line withHTML:(BOOL)stripHTML; +- (BOOL)print:(TVCLogLine *)line; +- (BOOL)print:(TVCLogLine *)line withHTML:(BOOL)stripHTML; - (void)logViewOnDoubleClick:(NSString *)e; @end \ No newline at end of file diff --git a/Classes/Headers/TVCLogLine.h b/Classes/Headers/TVCLogLine.h new file mode 100755 index 0000000000..2d90b91bfc --- /dev/null +++ b/Classes/Headers/TVCLogLine.h @@ -0,0 +1,52 @@ +// Created by Satoshi Nakagawa +// Modifications by Codeux Software +// You can redistribute it and/or modify it under the new BSD license. +// Converted to ARC Support on Thursday, June 07, 2012 + +typedef enum { + TVCLogLineSystemType, + TVCLogLineErrorType, + TVCLogLineErrorReplyType, + TVCLogLineCTCPType, + TVCLogLineReplyType, + TVCLogLinePrivateMessageType, + TVCLogLinePrivateMessageNoHighlightType, + TVCLogLineNoticeType, + TVCLogLineActionType, + TVCLogLineActionNoHighlightType, + TVCLogLineJoinType, + TVCLogLinePartType, + TVCLogLineKickType, + TVCLogLineQuitType, + TVCLogLineKillType, + TVCLogLineNickType, + TVCLogLineModeType, + TVCLogLineTopicType, + TVCLogLineInviteType, + TVCLogLineWebsiteType, + TVCLogLineDebugType, +} TVCLogLineType; + +typedef enum { + TVCLogMemberNormalType, + TVCLogMemberLocalUserType, +} TVCLogMemberType; + +#define IRCCommandFromLineType(t) [TVCLogLine lineTypeString:t] + +@interface TVCLogLine : NSObject +@property (nonatomic, strong) NSDate *receivedAt; +@property (nonatomic, strong) NSString *time; +@property (nonatomic, strong) NSString *nick; +@property (nonatomic, strong) NSString *body; +@property (nonatomic, assign) TVCLogLineType lineType; +@property (nonatomic, assign) TVCLogMemberType memberType; +@property (nonatomic, strong) NSString *nickInfo; +@property (nonatomic, assign) BOOL identified; +@property (nonatomic, assign) NSInteger nickColorNumber; +@property (nonatomic, strong) NSArray *keywords; +@property (nonatomic, strong) NSArray *excludeWords; + ++ (NSString *)lineTypeString:(TVCLogLineType)type; ++ (NSString *)memberTypeString:(TVCLogMemberType)type; +@end \ No newline at end of file diff --git a/Classes/Headers/LogPolicy.h b/Classes/Headers/TVCLogPolicy.h similarity index 84% rename from Classes/Headers/LogPolicy.h rename to Classes/Headers/TVCLogPolicy.h index f585d7c2ac..4dd91f0246 100755 --- a/Classes/Headers/LogPolicy.h +++ b/Classes/Headers/TVCLogPolicy.h @@ -3,10 +3,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@class MenuController; - -@interface LogPolicy : NSObject -@property (nonatomic, unsafe_unretained) MenuController *menuController; +@interface TVCLogPolicy : NSObject +@property (nonatomic, unsafe_unretained) TXMenuController *menuController; @property (nonatomic, strong) NSMenu *menu; @property (nonatomic, strong) NSMenu *urlMenu; @property (nonatomic, strong) NSMenu *memberMenu; @@ -17,5 +15,4 @@ - (void)channelDoubleClicked; - (void)nicknameDoubleClicked; - @end \ No newline at end of file diff --git a/Classes/Headers/LogRenderer.h b/Classes/Headers/TVCLogRenderer.h similarity index 74% rename from Classes/Headers/LogRenderer.h rename to Classes/Headers/TVCLogRenderer.h index 03987512c3..136bd8d4aa 100755 --- a/Classes/Headers/LogRenderer.h +++ b/Classes/Headers/TVCLogRenderer.h @@ -2,12 +2,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@class LogController; - typedef enum { - ASCII_TO_HTML, - ASCII_TO_ATTRIBUTED_STRING, -} LogRendererType; + TVCLogRendererHTMLType, + TVCLogRendererAttributedStringType, +} TVCLogRendererType; TEXTUAL_EXTERN NSString *logEscape(NSString *s); TEXTUAL_EXTERN NSString *logEscapeWithNil(NSString *s); @@ -15,10 +13,10 @@ TEXTUAL_EXTERN NSString *logEscapeWithNil(NSString *s); TEXTUAL_EXTERN NSInteger mapColorValue(NSColor *color); TEXTUAL_EXTERN NSColor *mapColorCode(NSInteger colorChar); -@interface LogRenderer : NSObject +@interface LVCLogRenderer : NSObject + (NSString *)renderBody:(NSString *)body - controller:(LogController *)log - renderType:(LogRendererType)drawingType + controller:(TVCLogController *)log + renderType:(TVCLogRendererType)drawingType properties:(NSDictionary *)inputDictionary resultInfo:(NSDictionary **)outputDictionary; @end \ No newline at end of file diff --git a/Classes/Headers/LogScriptEventSink.h b/Classes/Headers/TVCLogScriptEventSink.h similarity index 85% rename from Classes/Headers/LogScriptEventSink.h rename to Classes/Headers/TVCLogScriptEventSink.h index 07600943a7..05db5398ff 100755 --- a/Classes/Headers/LogScriptEventSink.h +++ b/Classes/Headers/TVCLogScriptEventSink.h @@ -2,9 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@class LogController, LogPolicy; - -@interface LogScriptEventSink : NSObject +@interface TVCLogScriptEventSink : NSObject @property (nonatomic, unsafe_unretained) id owner; @property (nonatomic, strong) id policy; @property (nonatomic, assign) NSInteger x; diff --git a/Classes/Headers/LogView.h b/Classes/Headers/TVCLogView.h similarity index 95% rename from Classes/Headers/LogView.h rename to Classes/Headers/TVCLogView.h index 8a1b176994..5c3440b7ef 100755 --- a/Classes/Headers/LogView.h +++ b/Classes/Headers/TVCLogView.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface LogView : WebView +@interface TVCLogView : WebView @property (nonatomic, unsafe_unretained) id keyDelegate; @property (nonatomic, unsafe_unretained) id resizeDelegate; diff --git a/Classes/Headers/MainWindow.h b/Classes/Headers/TVCMainWindow.h similarity index 82% rename from Classes/Headers/MainWindow.h rename to Classes/Headers/TVCMainWindow.h index 9ff64a787a..2cc4cfa43e 100755 --- a/Classes/Headers/MainWindow.h +++ b/Classes/Headers/TVCMainWindow.h @@ -2,8 +2,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface MainWindow : NSWindow -@property (nonatomic, strong) KeyEventHandler *keyHandler; +@interface TVCMainWindow : NSWindow +@property (nonatomic, strong) TLOKeyEventHandler *keyHandler; - (void)setKeyHandlerTarget:(id)target; - (void)registerKeyHandler:(SEL)selector key:(NSInteger)code modifiers:(NSUInteger)mods; diff --git a/Classes/Headers/MemberList.h b/Classes/Headers/TVCMemberList.h similarity index 89% rename from Classes/Headers/MemberList.h rename to Classes/Headers/TVCMemberList.h index 3ac3467a42..37fc16546b 100755 --- a/Classes/Headers/MemberList.h +++ b/Classes/Headers/TVCMemberList.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface MemberList : ListView +@interface TVCMemberList : TVCListView @end @interface NSObject (MemberListViewDelegate) diff --git a/Classes/Headers/MemberListCell.h b/Classes/Headers/TVCMemberListCell.h similarity index 74% rename from Classes/Headers/MemberListCell.h rename to Classes/Headers/TVCMemberListCell.h index 836ca852ce..90efe2fbae 100755 --- a/Classes/Headers/MemberListCell.h +++ b/Classes/Headers/TVCMemberListCell.h @@ -2,10 +2,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@class IRCUser; - -@interface MemberListCell : NSTextFieldCell +@interface TVCMemberListCell : NSTextFieldCell @property (nonatomic, unsafe_unretained) id cellItem; @property (nonatomic, weak) IRCUser *member; -@property (nonatomic, weak) MemberList *parent; +@property (nonatomic, weak) TVCMemberList *parent; @end \ No newline at end of file diff --git a/Classes/Headers/ServerList.h b/Classes/Headers/TVCServerList.h similarity index 90% rename from Classes/Headers/ServerList.h rename to Classes/Headers/TVCServerList.h index ffaffbbfc8..68a12bb66a 100755 --- a/Classes/Headers/ServerList.h +++ b/Classes/Headers/TVCServerList.h @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface ServerList : NSOutlineView +@interface TVCServerList : NSOutlineView @property (nonatomic, unsafe_unretained) id keyDelegate; - (void)toggleAddServerButton; diff --git a/Classes/Headers/ServerListCell.h b/Classes/Headers/TVCServerListCell.h similarity index 70% rename from Classes/Headers/ServerListCell.h rename to Classes/Headers/TVCServerListCell.h index 68dccfc0f9..2331c17fac 100755 --- a/Classes/Headers/ServerListCell.h +++ b/Classes/Headers/TVCServerListCell.h @@ -2,9 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@class IRCTreeItem; - -@interface ServerListCell : NSTextFieldCell -@property (nonatomic, weak) ServerList *parent; +@interface TVCServerListCell : NSTextFieldCell +@property (nonatomic, weak) TVCServerList *parent; @property (nonatomic, weak) IRCTreeItem *cellItem; @end \ No newline at end of file diff --git a/Classes/Headers/TextField.h b/Classes/Headers/TVCTextField.h similarity index 66% rename from Classes/Headers/TextField.h rename to Classes/Headers/TVCTextField.h index bb65b4e124..e2d2b10efe 100755 --- a/Classes/Headers/TextField.h +++ b/Classes/Headers/TVCTextField.h @@ -2,18 +2,16 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define DefaultTextFieldFontColor [NSColor colorWithCalibratedWhite:0.15 alpha:1.0] -#define DefaultTextFieldFont [NSFont fontWithName:@"Helvetica" size:12.0] -#define DefaultTextFieldWidthPadding 1.0 -#define DefaultTextFieldHeightPadding 6.0 +@class TLOKeyEventHandler; -@class KeyEventHandler; +#define TXTXDefaultTextFieldFontColor [NSColor colorWithCalibratedWhite:0.15 alpha:1.0] +#define TXDefaultTextFieldFont [NSFont fontWithName:@"Helvetica" size:12.0] -@interface TextField : NSTextView -@property (nonatomic, strong) KeyEventHandler *_keyHandler; -@property (nonatomic, assign) dispatch_queue_t _formattingQueue; +@interface TVCTextField : NSTextView +@property (nonatomic, strong) TLOKeyEventHandler *keyHandler; +@property (nonatomic, assign) dispatch_queue_t formattingQueue; -- (BOOL)isAtTopfView; +- (BOOL)isAtTopOfView; - (BOOL)isAtBottomOfView; - (NSInteger)selectedLineNumber; diff --git a/Classes/Headers/IRCTextFormatterMenu.h b/Classes/Headers/TVCTextFormatterMenu.h similarity index 84% rename from Classes/Headers/IRCTextFormatterMenu.h rename to Classes/Headers/TVCTextFormatterMenu.h index cdc3960c71..a7677ae2f6 100755 --- a/Classes/Headers/IRCTextFormatterMenu.h +++ b/Classes/Headers/TVCTextFormatterMenu.h @@ -4,15 +4,15 @@ #define IRCTextFormatterMenuTag 53037 -@interface IRCTextFormatterMenu : NSObject -@property (nonatomic, unsafe_unretained) TextField *textField; +@interface TVCTextFormatterMenu : NSObject +@property (nonatomic, unsafe_unretained) TVCTextField *textField; @property (nonatomic, strong) NSMenuItem *formatterMenu; @property (nonatomic, strong) NSMenu *foregroundColorMenu; @property (nonatomic, strong) NSMenu *backgroundColorMenu; @property (nonatomic, assign) BOOL sheetOverrideEnabled; -- (void)enableSheetField:(TextField *)field; -- (void)enableWindowField:(TextField *)field; +- (void)enableSheetField:(TVCTextField *)field; +- (void)enableWindowField:(TVCTextField *)field; - (BOOL)boldSet; - (BOOL)italicSet; diff --git a/Classes/Headers/ThinSplitView.h b/Classes/Headers/TVCThinSplitView.h similarity index 79% rename from Classes/Headers/ThinSplitView.h rename to Classes/Headers/TVCThinSplitView.h index 96070575b7..40f463d52b 100755 --- a/Classes/Headers/ThinSplitView.h +++ b/Classes/Headers/TVCThinSplitView.h @@ -2,10 +2,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface ThinSplitView : NSSplitView +@interface TVCThinSplitView : NSSplitView @property (nonatomic, assign) NSInteger fixedViewIndex; @property (nonatomic, assign) NSInteger position; @property (nonatomic, assign) BOOL inverted; @property (nonatomic, assign) BOOL hidden; -@property (nonatomic, nonatomic) NSInteger myDividerThickness; +@property (nonatomic, nonatomic) NSInteger altDividerThickness; @end \ No newline at end of file diff --git a/Classes/Headers/WebViewAutoScroll.h b/Classes/Headers/TVCWebViewAutoScroll.h similarity index 84% rename from Classes/Headers/WebViewAutoScroll.h rename to Classes/Headers/TVCWebViewAutoScroll.h index 011a718441..1bd050b696 100755 --- a/Classes/Headers/WebViewAutoScroll.h +++ b/Classes/Headers/TVCWebViewAutoScroll.h @@ -1,7 +1,7 @@ // Created by Allan Odgaard. // Converted to ARC Support on Thursday, June 07, 2012 -@interface WebViewAutoScroll : NSObject +@interface TVCWebViewAutoScroll : NSObject @property (nonatomic, assign) NSRect lastFrame; @property (nonatomic, assign) NSRect lastVisibleRect; @property (nonatomic, weak) WebFrameView *webFrame; diff --git a/Classes/Headers/GlobalModels.h b/Classes/Headers/TXGlobalModels.h similarity index 100% rename from Classes/Headers/GlobalModels.h rename to Classes/Headers/TXGlobalModels.h diff --git a/Classes/Headers/MasterController.h b/Classes/Headers/TXMasterController.h similarity index 66% rename from Classes/Headers/MasterController.h rename to Classes/Headers/TXMasterController.h index b567c0ac20..c4f843fb96 100755 --- a/Classes/Headers/MasterController.h +++ b/Classes/Headers/TXMasterController.h @@ -3,17 +3,18 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface MasterController : NSObject +@interface TXMasterController : NSObject @property (nonatomic, assign) BOOL ghostMode; @property (nonatomic, assign) BOOL terminating; @property (nonatomic, strong) NSBox *logBase; -@property (nonatomic, strong) MainWindow *window; -@property (nonatomic, strong) MenuController *menu; -@property (nonatomic, strong) InputTextField *text; -@property (nonatomic, strong) ServerList *serverList; -@property (nonatomic, strong) MemberList *memberList; -@property (nonatomic, strong) ThinSplitView *serverSplitView; -@property (nonatomic, strong) ThinSplitView *memberSplitView; +@property (nonatomic, strong) TXMenuController *menu; +@property (nonatomic, strong) TVCMainWindow *window; +@property (nonatomic, strong) TVCInputTextField *text; +@property (nonatomic, strong) TVCServerList *serverList; +@property (nonatomic, strong) TVCMemberList *memberList; +@property (nonatomic, strong) TVCThinSplitView *serverSplitView; +@property (nonatomic, strong) TVCThinSplitView *memberSplitView; +@property (nonatomic, strong) TVCTextFormatterMenu *formattingMenu; @property (nonatomic, strong) NSMenuItem *serverMenu; @property (nonatomic, strong) NSMenuItem *channelMenu; @property (nonatomic, strong) NSButton *addServerButton; @@ -24,12 +25,11 @@ @property (nonatomic, strong) NSMenu *memberMenu; @property (nonatomic, strong) IRCWorld *world; @property (nonatomic, strong) IRCExtras *extrac; -@property (nonatomic, strong) ViewTheme *viewTheme; -@property (nonatomic, strong) GrowlController *growl; -@property (nonatomic, strong) WelcomeSheet *welcomeSheet; -@property (nonatomic, strong) InputHistory *inputHistory; -@property (nonatomic, strong) IRCTextFormatterMenu *formattingMenu; -@property (nonatomic, strong) NickCompletionStatus *completionStatus; +@property (nonatomic, strong) TPCViewTheme *viewTheme; +@property (nonatomic, strong) TDCWelcomeSheet *welcomeSheet; +@property (nonatomic, strong) TLOGrowlController *growl; +@property (nonatomic, strong) TLOInputHistory *inputHistory; +@property (nonatomic, strong) TLONickCompletionStatus *completionStatus; @property (nonatomic, assign) NSInteger memberSplitViewOldPosition; - (void)loadWindowState; diff --git a/Classes/Headers/TXMenuController.h b/Classes/Headers/TXMenuController.h new file mode 100755 index 0000000000..687e71a845 --- /dev/null +++ b/Classes/Headers/TXMenuController.h @@ -0,0 +1,125 @@ +// Created by Satoshi Nakagawa +// Modifications by Codeux Software +// You can redistribute it and/or modify it under the new BSD license. +// Converted to ARC Support on Thursday, June 08, 2012 + +@interface TXMenuController : NSObject +@property (nonatomic, weak) IRCWorld *world; +@property (nonatomic, weak) TXMasterController *master; +@property (nonatomic, weak) TVCServerList *serverList; +@property (nonatomic, weak) TVCMemberList *memberList; +@property (nonatomic, unsafe_unretained) TVCMainWindow *window; +@property (nonatomic, unsafe_unretained) TVCInputTextField *text; +@property (nonatomic, strong) NSString *pointedUrl; +@property (nonatomic, strong) NSString *pointedNick; +@property (nonatomic, strong) NSString *pointedChannelName; +@property (nonatomic, strong) NSString *currentSearchPhrase; +@property (nonatomic, strong) NSMenuItem *closeWindowItem; +@property (nonatomic, strong) TDChannelSheet *channelSheet; +@property (nonatomic, strong) TDCNickSheet *nickSheet; +@property (nonatomic, strong) TDCModeSheet *modeSheet; +@property (nonatomic, strong) TDCAboutPanel *aboutPanel; +@property (nonatomic, strong) TDCTopicSheet *topicSheet; +@property (nonatomic, strong) TDCServerSheet *serverSheet; +@property (nonatomic, strong) TDCInviteSheet *inviteSheet; +@property (nonatomic, strong) TDCHighlightSheet *highlightSheet; +@property (nonatomic, strong) TDCPreferencesController *preferencesController; +@property (nonatomic, assign) BOOL isInFullScreenMode; + +- (void)terminate; + +- (NSArray *)selectedMembers:(NSMenuItem *)sender; +- (BOOL)checkSelectedMembers:(NSMenuItem *)item; +- (void)deselectMembers:(NSMenuItem *)sender; + +- (void)showPreferencesDialog:(id)sender; + +- (void)performPaste:(id)sender; +- (void)searchGoogle:(id)sender; +- (void)closeWindow:(id)sender; +- (void)copyLogAsHtml:(id)sender; + +- (void)toggleDeveloperMode:(id)sender; + +- (void)showHighlightSheet:(id)sender; +- (void)showServerPropertyDialog:(IRCClient *)u ignore:(NSString *)imask; + +- (void)markScrollback:(id)sender; +- (void)clearScrollback:(id)sender; +- (void)gotoScrollbackMarker:(id)sender; +- (void)markAllAsRead:(id)sender; +- (void)increaseLogFontSize:(id)sender; +- (void)decreaseLogFontSize:(id)sender; + +- (void)connect:(id)sender; +- (void)disconnect:(id)sender; +- (void)cancelReconnection:(id)sender; +- (void)showNicknameChangeDialog:(id)sender; +- (void)showServerChannelList:(id)sender; +- (void)addServer:(id)sender; +- (void)copyServer:(id)sender; +- (void)deleteServer:(id)sender; +- (void)showServerPropertiesDialog:(id)sender; + +- (void)onNextHighlight:(id)sender; +- (void)onPreviousHighlight:(id)sender; + +- (void)joinChannel:(id)sender; +- (void)leaveChannel:(id)sender; +- (void)showChannelTopicDialog:(id)sender; +- (void)showChannelModeDialog:(id)sender; +- (void)addChannel:(id)sender; +- (void)deleteChannel:(id)sender; +- (void)showChannelPropertiesDialog:(id)sender; + +- (void)memberListDoubleClicked:(id)sender; +- (void)memberSendWhois:(id)sender; +- (void)memberStartQuery:(id)sender; +- (void)memberSendInvite:(id)sender; +- (void)memberSendCTCPPing:(id)sender; +- (void)memberSendCTCPTime:(id)sender; +- (void)memberSendCTCPVersion:(id)sender; +- (void)memberSendCTCPUserinfo:(id)sender; +- (void)memberSendCTCPClientInfo:(id)sender; +- (void)memberModeChangeOp:(id)sender; +- (void)memberModeChangeDeop:(id)sender; +- (void)memberModeChangeHalfop:(id)sender; +- (void)memberModeChangeDehalfop:(id)sender; +- (void)memberModeChangeVoice:(id)sender; +- (void)memberModeChangeDevoice:(id)sender; +- (void)memberKickFromChannel:(id)sender; +- (void)memberBanFromServer:(id)sender; +- (void)memberKickbanFromChannel:(id)sender; +- (void)memberKillFromServer:(id)sender; +- (void)memberGlineFromServer:(id)sender; +- (void)memberShunFromServer:(id)sender; + +- (void)copyUrl:(id)sender; +- (void)joinClickedChannel:(id)sender; + +- (void)toggleChannelModerationMode:(id)sender; +- (void)toggleChannelInviteMode:(id)sender; + +- (void)sortChannelListNames:(id)sender; +- (void)showMainWindow:(id)sender; +- (void)showChannelIgnoreList:(id)sender; +- (void)showAboutWindow:(id)sender; +- (void)openLogLocation:(id)sender; +- (void)openChannelLogs:(id)sender; +- (void)connectToTextualHelpChannel:(id)sender; +- (void)showSetVhostPrompt:(id)sender; +- (void)showFindPanel:(id)sender; +- (void)showChannelBanList:(id)sender; +- (void)showChannelBanExceptionList:(id)sender; +- (void)showChannelInviteExceptionList:(id)sender; + +- (void)commandWShortcutUsed:(id)sender; +- (void)openHelpMenuLinkItem:(id)sender; +- (void)showContributors:(id)sender; +- (void)showAcknowledgments:(id)sender; +- (void)processNavigationItem:(id)sender; +- (void)toggleFullscreenMode:(id)sender; +- (void)centerMainWindow:(id)sender; + +- (void)forceReloadTheme:(id)sender; +@end \ No newline at end of file diff --git a/Classes/Headers/TextualApplication.h b/Classes/Headers/TextualApplication.h index b757a9f303..e8834af664 100755 --- a/Classes/Headers/TextualApplication.h +++ b/Classes/Headers/TextualApplication.h @@ -11,115 +11,141 @@ #import "StaticDefinitions.h" - #import "GlobalModels.h" - #import "RegexKitLite.h" - #import "TXRegularExpression.h" - #import "PopupPrompts.h" - #import "RLMAsyncSocket.h" - #import "GCDAsyncSocket.h" - #import "NSOutlineViewHelper.h" - #import "ThinSplitView.h" - #import "ServerList.h" - #import "ServerListCell.h" - #import "AsyncSocketExtensions.h" - #import "GrowlController.h" - #import "Preferences.h" - #import "OtherTheme.h" - #import "FileWithContent.h" - #import "ViewTheme.h" - #import "LogView.h" - #import "LogLine.h" - #import "DockIcon.h" - #import "ListView.h" - #import "LogPolicy.h" - #import "TextField.h" - #import "KeyEventHandler.h" - #import "NSSplitViewHelper.h" - #import "MainWindow.h" - #import "LogRenderer.h" - #import "InputTextField.h" - #import "ImageURLParser.h" - #import "ListSeparatorCell.h" - #import "WebViewAutoScroll.h" - #import "LogScriptEventSink.h" - #import "LogController.h" - #import "MemberList.h" - #import "MemberListCell.h" - #import "IRC.h" - #import "Timer.h" - #import "TCPClient.h" - #import "URLParser.h" + /* 3rd Party Extensions. */ + #import "AGKeychain.h" - #import "FileLogger.h" - #import "InputHistory.h" - #import "LanguagePreferences.h" + #import "DDExtensions.h" + #import "DDInvocation.h" + #import "GCDAsyncSocket.h" + #import "GCDAsyncSocketExtensions.h" #import "GTMBase64.h" - #import "URLOpener.h" #import "GTMDefines.h" - #import "SoundPlayer.h" - #import "NSNumberHelper.h" - #import "NSFontHelper.h" - #import "NSDateHelper.h" - #import "NSDataHelper.h" - #import "NSRectHelper.h" - #import "UnicodeHelper.h" - #import "NSColorHelper.h" - #import "NSArrayHelper.h" - #import "NSWindowHelper.h" - #import "NSStringHelper.h" - #import "IRCColorFormat.h" - #import "NSTextFieldHelper.h" - #import "GTMNSString+HTML.h" - #import "NSPasteboardHelper.h" - #import "NSDictionaryHelper.h" - #import "DDInvocationGrabber.h" #import "GTMGarbageCollection.h" - #import "DDExtensions.h" - #import "GTMNSString+URLArguments.h" - #import "IRCUser.h" - #import "IRCTextFormatterMenu.h" - #import "IRCExtras.h" - #import "IRCTreeItem.h" - #import "IRCWorldConfig.h" - #import "IRCWorld.h" - #import "IRCClientConfig.h" - #import "IRCModeInfo.h" - #import "IRCISupportInfo.h" + #import "GTMEncodeHTML.h" + #import "GTMEncodeURL.h" + #import "RLMAsyncSocket.h" + #import "RegexKitLite.h" + + /* IRC Controllers — Core. */ + + #import "IRC.h" + #import "IRCAddressBook.h" + #import "IRCChannel.h" + #import "IRCChannelConfig.h" #import "IRCChannelMode.h" + #import "IRCClient.h" + #import "IRCClientConfig.h" + #import "IRCColorFormat.h" #import "IRCConnection.h" - #import "IRCChannelConfig.h" - #import "SheetBase.h" - #import "ModeSheet.h" - #import "NickSheet.h" - #import "AboutPanel.h" - #import "TopicSheet.h" - #import "ListDialog.h" - #import "InviteSheet.h" - #import "SoundWrapper.h" - #import "ChannelSheet.h" - #import "WelcomeSheet.h" - #import "ChanBanSheet.h" - #import "ScriptsWrapper.h" - #import "AddressBook.h" - #import "AddressBookSheet.h" - #import "ServerSheet.h" - #import "InputPromptDialog.h" - #import "ChanBanExceptionSheet.h" - #import "ChanInviteExceptionSheet.h" - #import "HighlightSheet.h" - #import "IRCPrefix.h" - #import "IRCChannel.h" + #import "IRCExtras.h" + #import "IRCISupportInfo.h" #import "IRCMessage.h" - #import "IRCClient.h" - #import "TimerCommand.h" + #import "IRCModeInfo.h" + #import "IRCPrefix.h" #import "IRCSendingMessage.h" - #import "PreferencesController.h" - #import "PluginProtocol.h" + #import "IRCTreeItem.h" + #import "IRCUser.h" + #import "IRCWorld.h" + #import "IRCWorldConfig.h" + + /* Framework Extensions (Helpers). */ + + #import "NSArrayHelper.h" #import "NSBundleHelper.h" - #import "TextualPluginItem.h" - #import "MenuController.h" - #import "NickCompletionStatus.h" - #import "MasterController.h" + #import "NSColorHelper.h" + #import "NSDataHelper.h" + #import "NSDateHelper.h" + #import "NSDictionaryHelper.h" + #import "NSFontHelper.h" + #import "NSNumberHelper.h" + #import "NSOutlineViewHelper.h" + #import "NSPasteboardHelper.h" + #import "NSRectHelper.h" + #import "NSSplitViewHelper.h" + #import "NSStringHelper.h" + #import "NSTextFieldHelper.h" + #import "NSWindowHelper.h" + + /* Dialogs. */ + + #import "TDCSheetBase.h" + #import "TDCAboutPanel.h" + #import "TDCAddressBookSheet.h" + #import "TDCHighlightSheet.h" + #import "TDCInviteSheet.h" + #import "TDCListDialog.h" + #import "TDCModeSheet.h" + #import "TDCNickSheet.h" + #import "TDCPreferencesController.h" + #import "TDCPreferencesScriptWrapper.h" + #import "TDCPreferencesSoundWrapper.h" + #import "TDCServerSheet.h" + #import "TDCTopicSheet.h" + #import "TDCWelcomeSheet.h" + #import "TDChanBanExceptionSheet.h" + #import "TDChanBanSheet.h" + #import "TDChanInviteExceptionSheet.h" + #import "TDChannelSheet.h" + + /* Helpers. */ + + #import "THOPluginItem.h" + #import "THOPluginProtocol.h" + #import "THOUnicodeHelper.h" + + /* Library. */ + + #import "TLOFileLogger.h" + #import "TLOFileWithContent.h" + #import "TLOGrowlController.h" + #import "TLOInputHistory.h" + #import "TLOKeyEventHandler.h" + #import "TLOLanguagePreferences.h" + #import "TLOLinkParser.h" + #import "TLONickCompletionStatus.h" + #import "TLOPopupPrompts.h" + #import "TLORegularExpression.h" + #import "TLOSocketClient.h" + #import "TLOSoundPlayer.h" + #import "TLOTimer.h" + #import "TLOTimerCommand.h" + #import "TLOpenLink.h" + + /* Preferences. */ + + #import "TPCOtherTheme.h" + #import "TPCPreferences.h" + #import "TPCViewTheme.h" + + /* View Controllers. */ + + #import "TVCDockIcon.h" + #import "TVCImageURLParser.h" + #import "TVCInputPromptDialog.h" + #import "TVCInputTextField.h" + #import "TVCListSeparatorCell.h" + #import "TVCListView.h" + #import "TVCLogController.h" + #import "TVCLogLine.h" + #import "TVCLogPolicy.h" + #import "TVCLogRenderer.h" + #import "TVCLogScriptEventSink.h" + #import "TVCLogView.h" + #import "TVCMainWindow.h" + #import "TVCMemberList.h" + #import "TVCMemberListCell.h" + #import "TVCServerList.h" + #import "TVCServerListCell.h" + #import "TVCTextField.h" + #import "TVCTextFormatterMenu.h" + #import "TVCThinSplitView.h" + #import "TVCWebViewAutoScroll.h" + + /* Master Controllers — Root. */ + + #import "TXGlobalModels.h" + #import "TXMasterController.h" + #import "TXMenuController.h" #endif /* @end */ \ No newline at end of file diff --git a/Classes/Helpers/DDExtensions.m b/Classes/Helpers/DDExtensions.m index c78c29ab45..a94a420e0a 100755 --- a/Classes/Helpers/DDExtensions.m +++ b/Classes/Helpers/DDExtensions.m @@ -26,94 +26,94 @@ @implementation NSObject (DDExtensions) - (id)invokeOnThread:(NSThread *)thread { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; [grabber setParentThread:thread]; - [grabber setThreadType:INVOCATION_PARENT_THREAD]; + [grabber setThreadType:DDInvocationParentThread]; return [grabber prepareWithInvocationTarget:self]; } + (id)invokeOnThread:(NSThread *)thread { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; [grabber setParentThread:thread]; - [grabber setThreadType:INVOCATION_PARENT_THREAD]; + [grabber setThreadType:DDInvocationParentThread]; return [grabber prepareWithInvocationTarget:self]; } - (id)iomt { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; - [grabber setThreadType:INVOCATION_MAIN_THREAD]; + [grabber setThreadType:DDInvocationMainThread]; return [grabber prepareWithInvocationTarget:self]; } + (id)iomt { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; - [grabber setThreadType:INVOCATION_MAIN_THREAD]; + [grabber setThreadType:DDInvocationMainThread]; return [grabber prepareWithInvocationTarget:self]; } - (id)invokeOnMainThread { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; - [grabber setThreadType:INVOCATION_MAIN_THREAD]; + [grabber setThreadType:DDInvocationMainThread]; return [grabber prepareWithInvocationTarget:self]; } + (id)invokeOnMainThread { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; - [grabber setThreadType:INVOCATION_MAIN_THREAD]; + [grabber setThreadType:DDInvocationMainThread]; return [grabber prepareWithInvocationTarget:self]; } - (id)invokeInBackgroundThread { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; - [grabber setThreadType:INVOCATION_BACKGROUND_THREAD]; + [grabber setThreadType:DDInvocationBackgroundThread]; return [grabber prepareWithInvocationTarget:self]; } + (id)invokeInBackgroundThread { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; - [grabber setThreadType:INVOCATION_BACKGROUND_THREAD]; + [grabber setThreadType:DDInvocationBackgroundThread]; return [grabber prepareWithInvocationTarget:self]; } - (id)invokeOnMainThreadAndWaitUntilDone:(BOOL)waitUntilDone { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; [grabber setWaitUntilDone:waitUntilDone]; - [grabber setThreadType:INVOCATION_MAIN_THREAD]; + [grabber setThreadType:DDInvocationMainThread]; return [grabber prepareWithInvocationTarget:self]; } + (id)invokeOnMainThreadAndWaitUntilDone:(BOOL)waitUntilDone { - DDInvocationGrabber *grabber = [DDInvocationGrabber invocationGrabber]; + DDInvocation *grabber = [DDInvocation invocationGrabber]; [grabber setWaitUntilDone:waitUntilDone]; - [grabber setThreadType:INVOCATION_MAIN_THREAD]; + [grabber setThreadType:DDInvocationMainThread]; return [grabber prepareWithInvocationTarget:self]; } diff --git a/Classes/Helpers/DDInvocationGrabber.m b/Classes/Helpers/DDInvocation.m similarity index 92% rename from Classes/Helpers/DDInvocationGrabber.m rename to Classes/Helpers/DDInvocation.m index 5705c9257e..dd12113c9f 100755 --- a/Classes/Helpers/DDInvocationGrabber.m +++ b/Classes/Helpers/DDInvocation.m @@ -22,7 +22,7 @@ * SOFTWARE. */ -@implementation DDInvocationGrabber +@implementation DDInvocation @synthesize target; @synthesize invocation; @@ -41,7 +41,7 @@ - (id)init self.invocation = nil; self.parentThread = nil; self.waitUntilDone = NO; - self.threadType = INVOCATION_BACKGROUND_THREAD; + self.threadType = DDInvocationBackgroundThread; return self; } @@ -68,13 +68,13 @@ - (void)forwardInvocation:(NSInvocation *)ioInvocation [self.invocation retainArguments]; } - if (self.parentThread && self.threadType == INVOCATION_PARENT_THREAD) { + if (self.parentThread && self.threadType == DDInvocationParentThread) { [self.invocation performSelector:@selector(performInvocation:) onThread:self.parentThread withObject:self.invocation waitUntilDone:NO]; } else { - if (self.threadType == INVOCATION_BACKGROUND_THREAD) { + if (self.threadType == DDInvocationBackgroundThread) { [self.invocation performSelectorInBackground:@selector(performInvocation:) withObject:self.invocation]; } else { diff --git a/Classes/Helpers/GTMNSString+HTML.m b/Classes/Helpers/GTMEncodeHTML.m similarity index 100% rename from Classes/Helpers/GTMNSString+HTML.m rename to Classes/Helpers/GTMEncodeHTML.m diff --git a/Classes/Helpers/GTMNSString+URLArguments.m b/Classes/Helpers/GTMEncodeURL.m similarity index 100% rename from Classes/Helpers/GTMNSString+URLArguments.m rename to Classes/Helpers/GTMEncodeURL.m diff --git a/Classes/Helpers/NSArrayHelper.m b/Classes/Helpers/NSArrayHelper.m index f863f3a11b..26c0c9d464 100755 --- a/Classes/Helpers/NSArrayHelper.m +++ b/Classes/Helpers/NSArrayHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSArray (NSArrayHelper) +@implementation NSArray (TXArrayHelper) - (id)safeObjectAtIndex:(NSInteger)n { @@ -79,7 +79,7 @@ - (long long)longLongAtIndex:(NSInteger)n return 0; } -- (NSDoubleN)doubleAtIndex:(NSInteger)n +- (TXNSDouble)doubleAtIndex:(NSInteger)n { id obj = [self safeObjectAtIndex:n]; @@ -116,7 +116,7 @@ - (BOOL)containsObjectIgnoringCase:(id)anObject @end -@implementation NSMutableArray (NSMutableArrayHelper) +@implementation NSMutableArray (TXMutableArrayHelper) - (void)safeRemoveObjectAtIndex:(NSInteger)n { @@ -154,7 +154,7 @@ - (void)insertLongLong:(long long)value atIndex:(NSUInteger)index [self safeInsertObject:NSNumberWithLongLong(value) atIndex:index]; } -- (void)insertDouble:(NSDoubleN)value atIndex:(NSUInteger)index +- (void)insertDouble:(TXNSDouble)value atIndex:(NSUInteger)index { [self safeInsertObject:NSNumberWithDouble(value) atIndex:index]; } @@ -179,7 +179,7 @@ - (void)addLongLong:(long long)value [self safeAddObject:NSNumberWithLongLong(value)]; } -- (void)addDouble:(NSDoubleN)value +- (void)addDouble:(TXNSDouble)value { [self safeAddObject:NSNumberWithDouble(value)]; } @@ -191,7 +191,7 @@ - (void)addPointer:(void *)value @end -@implementation NSIndexSet (NSIndexSetHelper) +@implementation NSIndexSet (TXIndexSetHelper) - (NSArray *)arrayFromIndexSet { diff --git a/Classes/Helpers/NSBundleHelper.m b/Classes/Helpers/NSBundleHelper.m index 3b5a296cce..62e46ffc10 100755 --- a/Classes/Helpers/NSBundleHelper.m +++ b/Classes/Helpers/NSBundleHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSBundle (NSBundleHelper) +@implementation NSBundle (TXBundleHelper) + (void)sendUserInputDataToBundles:(IRCWorld *)world message:(NSString *)message @@ -12,8 +12,8 @@ + (void)sendUserInputDataToBundles:(IRCWorld *)world NSArray *cmdPlugins = [[world bundlesForUserInput] objectForKey:command]; if (NSObjectIsNotEmpty(cmdPlugins)) { - for (TextualPluginItem *plugin in cmdPlugins) { - PluginProtocol *bundle = [plugin pluginPrimaryClass]; + for (THOTextualPluginItem *plugin in cmdPlugins) { + THOPluginProtocol *bundle = [plugin pluginPrimaryClass]; [bundle messageSentByUser:client message:message command:command]; } @@ -36,14 +36,14 @@ + (void)sendServerInputDataToBundles:(IRCWorld *)world NSDictionary *messageData = [NSDictionary dictionaryWithObjectsAndKeys: msg.command, @"messageCommand", - [msg sequence], @"messageSequence", - [msg params], @"messageParamaters", + msg.sequence, @"messageSequence", + msg.params, @"messageParamaters", client.config.server, @"messageServer", client.config.network, @"messageNetwork", - NSNumberWithInteger([msg numericReply]), @"messageNumericReply", nil]; + NSNumberWithInteger(msg.numericReply), @"messageNumericReply", nil]; - for (TextualPluginItem *plugin in cmdPlugins) { - PluginProtocol *bundle = [plugin pluginPrimaryClass]; + for (THOTextualPluginItem *plugin in cmdPlugins) { + THOPluginProtocol *bundle = [plugin pluginPrimaryClass]; [bundle messageReceivedByServer:client sender:senderData message:messageData]; } @@ -58,7 +58,7 @@ + (void)reloadBundles:(IRCWorld *)world + (void)deallocBundlesFromMemory:(IRCWorld *)world { - PreferencesController *prefController = world.menuController.preferencesController; + TDCPreferencesController *prefController = world.menuController.preferencesController; if (prefController) { if (NSObjectIsNotEmpty(world.bundlesWithPreferences)) { @@ -81,8 +81,8 @@ + (void)deallocBundlesFromMemory:(IRCWorld *)world + (void)loadBundlesIntoMemory:(IRCWorld *)world { - NSString *path_1 = [Preferences wherePluginsPath]; - NSString *path_2 = [Preferences wherePluginsLocalPath]; + NSString *path_1 = [TPCPreferences wherePluginsPath]; + NSString *path_2 = [TPCPreferences wherePluginsLocalPath]; if (NSObjectIsNotEmpty(world.allLoadedBundles)) { [self deallocBundlesFromMemory:world]; @@ -117,7 +117,7 @@ + (void)loadBundlesIntoMemory:(IRCWorld *)world NSBundle *currBundle = [NSBundle bundleWithPath:fullPath]; - TextualPluginItem *plugin = [TextualPluginItem new]; + THOTextualPluginItem *plugin = [THOTextualPluginItem new]; [plugin initWithPluginClass:[currBundle principalClass] andBundle:currBundle @@ -146,7 +146,6 @@ + (void)loadBundlesIntoMemory:(IRCWorld *)world [world setBundlesWithOutputRules:outputRulesDict]; [world setBundlesForServerInput:serverInputBundles]; [world setBundlesWithPreferences:preferencesBundlesIndex]; - } @end \ No newline at end of file diff --git a/Classes/Helpers/NSColorHelper.m b/Classes/Helpers/NSColorHelper.m index 4f9bacdddf..1be1e1d79e 100755 --- a/Classes/Helpers/NSColorHelper.m +++ b/Classes/Helpers/NSColorHelper.m @@ -2,19 +2,19 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSColor (NSColorHelper) +@implementation NSColor (TXColorHelper) #pragma mark - #pragma mark Custom Methods -+ (NSColor *)_colorWithSRGBRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha ++ (NSColor *)internalColorWithSRGBRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha { CGFloat comps[] = {red, green, blue, alpha}; return [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace] components:comps count:4]; } -+ (NSColor *)_colorWithCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha ++ (NSColor *)internalCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGFloat)blue alpha:(CGFloat)alpha { if (red > 1.0) red = (red / 255.99999f); if (green > 1.0) green = (green / 255.99999f); @@ -28,82 +28,82 @@ + (NSColor *)_colorWithCalibratedRed:(CGFloat)red green:(CGFloat)green blue:(CGF + (NSColor *)formatterWhiteColor { - return NSCalibratedRBGColor(1.00, 1.00, 1.00); + return TXCalibratedRBGColor(1.00, 1.00, 1.00); } + (NSColor *)formatterBlackColor { - return NSCalibratedRBGColor(0.00, 0.00, 0.00); + return TXCalibratedRBGColor(0.00, 0.00, 0.00); } + (NSColor *)formatterNavyBlueColor { - return NSCalibratedRBGColor(0.04, 0.52, 0.00); + return TXCalibratedRBGColor(0.04, 0.52, 0.00); } + (NSColor *)formatterDarkGreenColor { - return NSCalibratedRBGColor(0.00, 0.08, 0.54); + return TXCalibratedRBGColor(0.00, 0.08, 0.54); } + (NSColor *)formatterRedColor { - return NSCalibratedRBGColor(1.00, 0.04, 0.05); + return TXCalibratedRBGColor(1.00, 0.04, 0.05); } + (NSColor *)formatterBrownColor { - return NSCalibratedRBGColor(0.55, 0.02, 0.02); + return TXCalibratedRBGColor(0.55, 0.02, 0.02); } + (NSColor *)formatterPurpleColor { - return NSCalibratedRBGColor(0.55, 0.53, 0.00); + return TXCalibratedRBGColor(0.55, 0.53, 0.00); } + (NSColor *)formatterOrangeColor { - return NSCalibratedRBGColor(1.00, 0.09, 0.54); + return TXCalibratedRBGColor(1.00, 0.09, 0.54); } + (NSColor *)formatterYellowColor { - return NSCalibratedRBGColor(1.00, 0.15, 1.00); + return TXCalibratedRBGColor(1.00, 0.15, 1.00); } + (NSColor *)formatterLimeGreenColor { - return NSCalibratedRBGColor(0.00, 0.15, 1.00); + return TXCalibratedRBGColor(0.00, 0.15, 1.00); } + (NSColor *)formatterTealColor { - return NSCalibratedRBGColor(0.00, 0.53, 0.53); + return TXCalibratedRBGColor(0.00, 0.53, 0.53); } + (NSColor *)formatterAquaCyanColor { - return NSCalibratedRBGColor(0.00, 1.00, 1.00); + return TXCalibratedRBGColor(0.00, 1.00, 1.00); } + (NSColor *)formatterLightBlueColor { - return NSCalibratedRBGColor(0.07, 0.98, 0.00); + return TXCalibratedRBGColor(0.07, 0.98, 0.00); } + (NSColor *)formatterFuchsiaPinkColor { - return NSCalibratedRBGColor(1.00, 0.98, 0.00); + return TXCalibratedRBGColor(1.00, 0.98, 0.00); } + (NSColor *)formatterNormalGrayColor { - return NSCalibratedRBGColor(0.53, 0.53, 0.53); + return TXCalibratedRBGColor(0.53, 0.53, 0.53); } + (NSColor *)formatterLightGrayColor { - return NSCalibratedRBGColor(0.80, 0.80, 0.80); + return TXCalibratedRBGColor(0.80, 0.80, 0.80); } + (NSArray *)possibleFormatterColors @@ -117,43 +117,43 @@ + (NSArray *)possibleFormatterColors combo = [NSMutableArray arrayWithObjects:[self formatterBlackColor], nil]; [colors safeInsertObject:combo atIndex:1]; - combo = [NSMutableArray arrayWithObjects:[self formatterNavyBlueColor], NSCalibratedRBGColor(0.0, 0.47, 0.0), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterNavyBlueColor], TXCalibratedRBGColor(0.0, 0.47, 0.0), nil]; [colors safeInsertObject:combo atIndex:2]; - combo = [NSMutableArray arrayWithObjects:[self formatterDarkGreenColor], NSCalibratedRBGColor(0.03, 0.0, 0.48), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterDarkGreenColor], TXCalibratedRBGColor(0.03, 0.0, 0.48), nil]; [colors safeInsertObject:combo atIndex:3]; - combo = [NSMutableArray arrayWithObjects:[self formatterRedColor], NSCalibratedRBGColor(1.00, 0.00, 0.00), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterRedColor], TXCalibratedRBGColor(1.00, 0.00, 0.00), nil]; [colors safeInsertObject:combo atIndex:4]; - combo = [NSMutableArray arrayWithObjects:[self formatterBrownColor], NSCalibratedRBGColor(0.46, 0.00, 0.00), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterBrownColor], TXCalibratedRBGColor(0.46, 0.00, 0.00), nil]; [colors safeInsertObject:combo atIndex:5]; - combo = [NSMutableArray arrayWithObjects:[self formatterPurpleColor], NSCalibratedRBGColor(0.46, 0.47, 0.00), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterPurpleColor], TXCalibratedRBGColor(0.46, 0.47, 0.00), nil]; [colors safeInsertObject:combo atIndex:6]; - combo = [NSMutableArray arrayWithObjects:[self formatterOrangeColor], NSCalibratedRBGColor(1.00, 0.00, 0.45), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterOrangeColor], TXCalibratedRBGColor(1.00, 0.00, 0.45), nil]; [colors safeInsertObject:combo atIndex:7]; - combo = [NSMutableArray arrayWithObjects:[self formatterYellowColor], NSCalibratedRBGColor(1.00, 0.00, 1.00), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterYellowColor], TXCalibratedRBGColor(1.00, 0.00, 1.00), nil]; [colors safeInsertObject:combo atIndex:8]; - combo = [NSMutableArray arrayWithObjects:[self formatterLimeGreenColor], NSCalibratedRBGColor(0.06, 0.00, 1.00), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterLimeGreenColor], TXCalibratedRBGColor(0.06, 0.00, 1.00), nil]; [colors safeInsertObject:combo atIndex:9]; - combo = [NSMutableArray arrayWithObjects:[self formatterTealColor], NSCalibratedRBGColor(0.00, 0.46, 0.46), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterTealColor], TXCalibratedRBGColor(0.00, 0.46, 0.46), nil]; [colors safeInsertObject:combo atIndex:10]; combo = [NSMutableArray arrayWithObjects:[self formatterAquaCyanColor], nil]; [colors safeInsertObject:combo atIndex:11]; - combo = [NSMutableArray arrayWithObjects:[self formatterLightBlueColor], NSCalibratedRBGColor(0.00, 1.00, 0.00), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterLightBlueColor], TXCalibratedRBGColor(0.00, 1.00, 0.00), nil]; [colors safeInsertObject:combo atIndex:12]; - combo = [NSMutableArray arrayWithObjects:[self formatterFuchsiaPinkColor], NSCalibratedRBGColor(1.00, 1.00, 0.00), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterFuchsiaPinkColor], TXCalibratedRBGColor(1.00, 1.00, 0.00), nil]; [colors safeInsertObject:combo atIndex:13]; - combo = [NSMutableArray arrayWithObjects:[self formatterNormalGrayColor], NSCalibratedRBGColor(0.46, 0.46, 0.46), nil]; + combo = [NSMutableArray arrayWithObjects:[self formatterNormalGrayColor], TXCalibratedRBGColor(0.46, 0.46, 0.46), nil]; [colors safeInsertObject:combo atIndex:14]; combo = [NSMutableArray arrayWithObjects:[self formatterLightGrayColor], nil]; @@ -204,7 +204,7 @@ + (NSColor *)fromCSS:(NSString *)s NSInteger g = ((n >> 8) & 0xff); NSInteger b = (n & 0xff); - return NSCalibratedRBGColor(r, b, g); + return TXCalibratedRBGColor(r, b, g); } else if (len == 3) { long n = strtol([s UTF8String], NULL, 16); @@ -212,7 +212,7 @@ + (NSColor *)fromCSS:(NSString *)s NSInteger g = ((n >> 4) & 0xf); NSInteger b = (n & 0xf); - return NSCalibratedRBGColor((r / 15.0), + return TXCalibratedRBGColor((r / 15.0), (b / 15.0), (g / 15.0)); } @@ -226,12 +226,12 @@ + (NSColor *)fromCSS:(NSString *)s + (NSColor *)outlineViewHeaderTextColor { - return [self _colorWithSRGBRed:0.439216 green:0.494118 blue:0.54902 alpha:1.0]; + return [self internalColorWithSRGBRed:0.439216 green:0.494118 blue:0.54902 alpha:1.0]; } + (NSColor *)outlineViewHeaderDisabledTextColor { - return [self _colorWithSRGBRed:0.439216 green:0.494118 blue:0.54902 alpha:0.7]; + return [self internalColorWithSRGBRed:0.439216 green:0.494118 blue:0.54902 alpha:0.7]; } @end \ No newline at end of file diff --git a/Classes/Helpers/NSDataHelper.m b/Classes/Helpers/NSDataHelper.m index aebe53f5f1..587169892d 100755 --- a/Classes/Helpers/NSDataHelper.m +++ b/Classes/Helpers/NSDataHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSData (NSDataHelper) +@implementation NSData (TXDataHelper) static char encodingTable[64] = { 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P', @@ -117,10 +117,10 @@ - (NSString *)validateUTF8WithCharacter:(UniChar)malformChar return [[NSString alloc] initWithCharacters:buf length:n]; } - /* The following method was borrowed from the source code of the - Colloquy IRC Client. It is a product of and is copyright of the + Colloquy IRC Client. It is a product of and is copyrighted by the respective ontributors of that project. */ + - (NSString *)base64EncodingWithLineLength:(NSUInteger)lineLength { const unsigned char *bytes = [self bytes]; diff --git a/Classes/Helpers/NSDateHelper.m b/Classes/Helpers/NSDateHelper.m index b4c65728cc..9b3ea59453 100755 --- a/Classes/Helpers/NSDateHelper.m +++ b/Classes/Helpers/NSDateHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSDate (NSDateHelper) +@implementation NSDate (TXDateHelper) + (NSInteger)secondsSinceUnixTimestamp:(NSInteger)stamp { diff --git a/Classes/Helpers/NSDictionaryHelper.m b/Classes/Helpers/NSDictionaryHelper.m index 81f7f6d2d8..8eaaa35123 100755 --- a/Classes/Helpers/NSDictionaryHelper.m +++ b/Classes/Helpers/NSDictionaryHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSDictionary (NSDictionaryHelper) +@implementation NSDictionary (TXDictionaryHelper) - (BOOL)boolForKey:(NSString *)key { @@ -37,7 +37,7 @@ - (long long)longLongForKey:(NSString *)key return 0; } -- (NSDoubleN)doubleForKey:(NSString *)key +- (TXNSDouble)doubleForKey:(NSString *)key { id obj = [self objectForKey:key]; @@ -115,7 +115,7 @@ - (NSString *)keyIgnoringCase:(NSString *)baseKey @end -@implementation NSMutableDictionary (NSMutableDictionaryHelper) +@implementation NSMutableDictionary (TXMutableDictionaryHelper) - (void)setBool:(BOOL)value forKey:(NSString *)key { @@ -132,7 +132,7 @@ - (void)setLongLong:(long long)value forKey:(NSString *)key [self setObject:NSNumberWithLongLong(value) forKey:key]; } -- (void)setDouble:(NSDoubleN)value forKey:(NSString *)key +- (void)setDouble:(TXNSDouble)value forKey:(NSString *)key { [self setObject:NSNumberWithDouble(value) forKey:key]; } diff --git a/Classes/Helpers/NSFontHelper.m b/Classes/Helpers/NSFontHelper.m index 4f2a3e5e59..2b06d7ef2a 100755 --- a/Classes/Helpers/NSFontHelper.m +++ b/Classes/Helpers/NSFontHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSFont (NSFontHelper) +@implementation NSFont (TXFontHelper) const CGFloat kRotationForItalicText = -14.0; diff --git a/Classes/Helpers/NSNumberHelper.m b/Classes/Helpers/NSNumberHelper.m index 999ba24ea6..24ee3e25ed 100755 --- a/Classes/Helpers/NSNumberHelper.m +++ b/Classes/Helpers/NSNumberHelper.m @@ -2,11 +2,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSNumber (NSNumberHelper) +@implementation NSNumber (TXNumberHelper) + (BOOL)compareIRCColor:(UniChar)c against:(NSInteger)firstNumber { - if (IsNumeric(c) && firstNumber < 2) { + if (TXIsNumeric(c) && firstNumber < 2) { NSInteger ci = (c - '0'); if ((firstNumber == 0 && ((ci >= 1 && ci <= 9) || ci == 0)) || diff --git a/Classes/Helpers/NSOutlineViewHelper.m b/Classes/Helpers/NSOutlineViewHelper.m index b6eaeaf8d1..16799b3b00 100755 --- a/Classes/Helpers/NSOutlineViewHelper.m +++ b/Classes/Helpers/NSOutlineViewHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSOutlineView (NSOutlineViewHelper) +@implementation NSOutlineView (TXOutlineViewHelper) - (NSInteger)countSelectedRows { diff --git a/Classes/Helpers/NSPasteboardHelper.m b/Classes/Helpers/NSPasteboardHelper.m index c32301f35c..119eb3d99c 100755 --- a/Classes/Helpers/NSPasteboardHelper.m +++ b/Classes/Helpers/NSPasteboardHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSPasteboard (NSPasteboardHelper) +@implementation NSPasteboard (TXPasteboardHelper) - (NSArray *)pasteboardStringType { @@ -17,6 +17,7 @@ - (NSString *)stringContent - (void)setStringContent:(NSString *)s { [self declareTypes:[self pasteboardStringType] owner:nil]; + [self setString:s forType:NSStringPboardType]; } diff --git a/Classes/Helpers/NSRectHelper.m b/Classes/Helpers/NSRectHelper.m index 5437a3cda0..45d1dac42a 100755 --- a/Classes/Helpers/NSRectHelper.m +++ b/Classes/Helpers/NSRectHelper.m @@ -27,4 +27,4 @@ NSRect NSRectAdjustInRect(NSRect r, NSRect bounds) } return r; -} +} \ No newline at end of file diff --git a/Classes/Helpers/NSSplitViewHelper.m b/Classes/Helpers/NSSplitViewHelper.m index e94112cb6b..2cf7669612 100755 --- a/Classes/Helpers/NSSplitViewHelper.m +++ b/Classes/Helpers/NSSplitViewHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSSplitView (NSSplitViewHelper) +@implementation NSSplitView (TXSplitViewHelper) - (BOOL)hasHiddenView { diff --git a/Classes/Helpers/NSStringHelper.m b/Classes/Helpers/NSStringHelper.m index d0b5786fe6..04452c7e3a 100755 --- a/Classes/Helpers/NSStringHelper.m +++ b/Classes/Helpers/NSStringHelper.m @@ -3,10 +3,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define LF 0xa -#define CR 0xd +#define _LF 0xa +#define _CR 0xd -@implementation NSString (NSStringHelper) +@implementation NSString (TXStringHelper) /* Private Header */ BOOL isSurrogate(UniChar c); @@ -154,7 +154,7 @@ - (BOOL)isNumericOnly for (NSInteger i = 0; i < len; ++i) { UniChar c = buffer[i]; - if (IsNumeric(c) == NO) { + if (TXIsNumeric(c) == NO) { return NO; } } @@ -173,7 +173,7 @@ - (BOOL)isAlphaNumOnly for (NSInteger i = 0; i < len; ++i) { UniChar c = buffer[i]; - if (IsAlphaNum(c) == NO) { + if (TXTXIsAlphaNumeric(c) == NO) { return NO; } } @@ -270,7 +270,7 @@ - (NSString *)safeUsername for (NSInteger i = 0; i < len; ++i) { UniChar c = buf[i]; - if (IsWordLetter(c)) { + if (TXIsWordLetter(c)) { dest[n++] = c; } else { dest[n++] = '_'; @@ -305,15 +305,15 @@ - (NSInteger)stringPositionIgnoringCase:(NSString *)needle - (id)attributedStringWithIRCFormatting:(NSFont *)defaultFont followFormattingPreference:(BOOL)formattingPreference { - if (formattingPreference && [Preferences removeAllFormatting]) { + if (formattingPreference && [TPCPreferences removeAllFormatting]) { return [self stripEffects]; } NSDictionary *input = [NSDictionary dictionaryWithObjectsAndKeys:defaultFont, @"attributedStringFont", nil]; - return [LogRenderer renderBody:self + return [LVCLogRenderer renderBody:self controller:nil - renderType:ASCII_TO_ATTRIBUTED_STRING + renderType:TVCLogRendererAttributedStringType properties:input resultInfo:NULL]; } @@ -357,7 +357,7 @@ - (NSString *)stripEffects if ((i + 1) >= len) continue; unichar e = src[i+1]; - if (IsIRCColor(e, (d - '0')) == NO && NSDissimilarObjects(e, ',')) continue; + if (TXIsIRCColor(e, (d - '0')) == NO && NSDissimilarObjects(e, ',')) continue; i++; if ((e == ',') == NO) { @@ -377,7 +377,7 @@ - (NSString *)stripEffects if ((i + 1) >= len) continue; unichar h = src[i+1]; - if (IsIRCColor(h, (g - '0')) == NO) continue; + if (TXIsIRCColor(h, (g - '0')) == NO) continue; i++; break; @@ -438,7 +438,7 @@ - (NSRange)rangeOfChannelNameStart:(NSInteger)start NSString *shortstring = [self safeSubstringFromIndex:start]; - NSRange rs = [TXRegularExpression string:shortstring rangeOfRegex:@"#([a-zA-Z0-9\\#\\-]+)"]; + NSRange rs = [TLORegularExpression string:shortstring rangeOfRegex:@"#([a-zA-Z0-9\\#\\-]+)"]; if (rs.location == NSNotFound) return NSMakeRange(NSNotFound, 0); NSRange r = NSMakeRange((rs.location + start), rs.length); @@ -447,7 +447,7 @@ - (NSRange)rangeOfChannelNameStart:(NSInteger)start if (0 <= prev && prev < len) { UniChar c = [self characterAtIndex:prev]; - if (IsWordLetter(c)) { + if (TXIsWordLetter(c)) { return NSMakeRange(NSNotFound, 0); } } @@ -457,7 +457,7 @@ - (NSRange)rangeOfChannelNameStart:(NSInteger)start if (next < len) { UniChar c = [self characterAtIndex:next]; - if (IsWordLetter(c)) { + if (TXIsWordLetter(c)) { return NSMakeRange(NSNotFound, 0); } } @@ -467,12 +467,12 @@ - (NSRange)rangeOfChannelNameStart:(NSInteger)start - (NSString *)encodeURIComponent { - if (NSObjectIsEmpty(self)) return NSNullObject; + if (NSObjectIsEmpty(self)) return NSStringEmptyPlaceholder; const char *src = [self UTF8String]; const char *characters = "0123456789ABCDEF"; - if (src == NULL) return NSNullObject; + if (src == NULL) return NSStringEmptyPlaceholder; NSUInteger len = [self lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; @@ -482,7 +482,7 @@ - (NSString *)encodeURIComponent for (NSInteger i = (len - 1); i >= 0; --i) { unsigned char c = *src++; - if (IsWordLetter(c) || c == '-' || c == '.' || c == '~') { + if (TXIsWordLetter(c) || c == '-' || c == '.' || c == '~') { *dest++ = c; } else { *dest++ = '%'; @@ -496,12 +496,12 @@ - (NSString *)encodeURIComponent - (NSString *)encodeURIFragment { - if (NSObjectIsEmpty(self)) return NSNullObject; + if (NSObjectIsEmpty(self)) return NSStringEmptyPlaceholder; const char *src = [self UTF8String]; const char *characters = "0123456789ABCDEF"; - if (src == NULL) return NSNullObject; + if (src == NULL) return NSStringEmptyPlaceholder; NSUInteger len = [self lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; @@ -511,7 +511,7 @@ - (NSString *)encodeURIFragment for (NSInteger i = (len - 1); i >= 0; --i) { unsigned char c = *src++; - if (IsWordLetter(c) + if (TXIsWordLetter(c) || c == '#' || c == '%' || c == '&' || c == '+' || c == ',' || c == '-' @@ -538,8 +538,8 @@ - (NSString *)decodeURIFragement + (NSString *)stringWithUUID { -#ifdef _USES_FOUNDATION_BASED_NSUUID - if ([Preferences featureAvailableToOSXMountainLion]) { +#ifdef TXFoundationBasedUUIDAvailable + if ([TPCPreferences featureAvailableToOSXMountainLion]) { NSUUID *uuidObj = [NSUUID UUID]; return [uuidObj UUIDString]; @@ -606,8 +606,8 @@ - (NSString *)cleanedServerHostmask /* We do not want ports in server address. */ NSString *bob = [self trim]; - if ([TXRegularExpression string:bob isMatchedByRegex:@"^([^:]+):([0-9]{2,7})$"] || - [TXRegularExpression string:bob isMatchedByRegex:@"^\\[([0-9a-f:]+)\\]:([0-9]{2,7})$"]) { + if ([TLORegularExpression string:bob isMatchedByRegex:@"^([^:]+):([0-9]{2,7})$"] || + [TLORegularExpression string:bob isMatchedByRegex:@"^\\[([0-9a-f:]+)\\]:([0-9]{2,7})$"]) { NSInteger stringPos = [bob rangeOfString:@":" options:NSBackwardsSearch range:NSMakeRange(0, self.length)].location; @@ -669,7 +669,7 @@ + (NSString *)stringWithLongLong:(long long)value { return [NSString string + (NSString *)stringWithUnsignedLongLong:(unsigned long long)value { return [NSString stringWithFormat:@"%qu", value]; } + (NSString *)stringWithFloat:(float)value { return [NSString stringWithFormat:@"%f", value]; } -+ (NSString *)stringWithDouble:(NSDoubleN)value { return [NSString stringWithFormat:@"%f", value]; } ++ (NSString *)stringWithDouble:(TXNSDouble)value { return [NSString stringWithFormat:@"%f", value]; } @end @@ -686,7 +686,7 @@ - (void)safeDeleteCharactersInRange:(NSRange)range - (NSString *)getToken { - NSRange r = [self rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:NSWhitespaceCharacter]]; + NSRange r = [self rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:NSStringWhitespacePlaceholder]]; if (NSDissimilarObjects(r.location, NSNotFound)) { NSString *result = [self safeSubstringToIndex:r.location]; @@ -705,7 +705,7 @@ - (NSString *)getToken NSString *result = [self copy]; - [self setString:NSNullObject]; + [self setString:NSStringEmptyPlaceholder]; return result; } @@ -748,7 +748,7 @@ - (id)safeAttribute:(NSString *)attrName atIndex:(NSUInteger)location longestEff + (NSAttributedString *)emptyString { - return [NSAttributedString emptyStringWithBase:NSNullObject]; + return [NSAttributedString emptyStringWithBase:NSStringEmptyPlaceholder]; } + (NSAttributedString *)emptyStringWithBase:(NSString *)base diff --git a/Classes/Helpers/NSTextFieldHelper.m b/Classes/Helpers/NSTextFieldHelper.m index 6a3ceb3b7e..0497fd77b8 100755 --- a/Classes/Helpers/NSTextFieldHelper.m +++ b/Classes/Helpers/NSTextFieldHelper.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSTextView (NSTextViewHelper) +@implementation NSTextView (TXTextViewHelper) - (BOOL)isFocused { diff --git a/Classes/Helpers/NSWindowHelper.m b/Classes/Helpers/NSWindowHelper.m index 688c7cffaa..190d283907 100755 --- a/Classes/Helpers/NSWindowHelper.m +++ b/Classes/Helpers/NSWindowHelper.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation NSWindow (NSWindowHelper) +@implementation NSWindow (TXWindowHelper) - (void)centerOfWindow:(NSWindow *)window { @@ -25,6 +25,7 @@ - (void)centerOfWindow:(NSWindow *)window if (NSContainsRect(screenFrame, r) == NO) { r = NSRectAdjustInRect(r, screenFrame); + p = r.origin; } } @@ -58,8 +59,8 @@ - (BOOL)isOnCurrentWorkspace - (BOOL)isInFullscreenMode { -#ifdef _MAC_OS_LION_OR_NEWER - return (([self styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask); +#ifdef TXMacOSLionOrNewer + return ((self.styleMask & NSFullScreenWindowMask) == NSFullScreenWindowMask); #else return NO; #endif diff --git a/Classes/Helpers/TextualPluginItem.m b/Classes/Helpers/THOPluginItem.m similarity index 97% rename from Classes/Helpers/TextualPluginItem.m rename to Classes/Helpers/THOPluginItem.m index 72e61b1672..aafa6878b2 100755 --- a/Classes/Helpers/TextualPluginItem.m +++ b/Classes/Helpers/THOPluginItem.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation TextualPluginItem +@implementation THOTextualPluginItem @synthesize pluginBundle; @synthesize pluginPrimaryClass; @@ -21,7 +21,6 @@ - (void)initWithPluginClass:(Class)primaryClass NSMutableDictionary *newServerDict = [*serverDict mutableCopy]; NSMutableDictionary *newOutputRulesDict = [*outputRulesDict mutableCopy]; - // Ouput Rules if ([self.pluginPrimaryClass respondsToSelector:@selector(pluginOutputDisplayRules)]) { @@ -29,7 +28,7 @@ - (void)initWithPluginClass:(Class)primaryClass if (NSObjectIsNotEmpty(pluginRules)) { for (NSString *command in pluginRules) { - if ([Preferences commandUIndex:command] >= 1) { + if ([TPCPreferences commandUIndex:command] >= 1) { id objectValue = [pluginRules objectForKey:command]; if ([objectValue isKindOfClass:[NSArray class]]) { diff --git a/Classes/Helpers/UnicodeHelper.m b/Classes/Helpers/THOUnicodeHelper.m similarity index 99% rename from Classes/Helpers/UnicodeHelper.m rename to Classes/Helpers/THOUnicodeHelper.m index b0aa7b3597..8460e8390c 100755 --- a/Classes/Helpers/UnicodeHelper.m +++ b/Classes/Helpers/THOUnicodeHelper.m @@ -358,7 +358,7 @@ 0x1d7c4, 0x1d7cb, }; -@implementation UnicodeHelper +@implementation THOUnicodeHelper + (BOOL)isPrivate:(UniChar)c { diff --git a/Classes/Helpers/SoundPlayer.m b/Classes/Helpers/TLOSoundPlayer.m similarity index 93% rename from Classes/Helpers/SoundPlayer.m rename to Classes/Helpers/TLOSoundPlayer.m index 513a771e9d..477453e47b 100755 --- a/Classes/Helpers/SoundPlayer.m +++ b/Classes/Helpers/TLOSoundPlayer.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation SoundPlayer +@implementation TLOSoundPlayer + (void)play:(NSString *)name isMuted:(BOOL)muted { diff --git a/Classes/Helpers/URLOpener.m b/Classes/Helpers/TLOpenLink.m similarity index 88% rename from Classes/Helpers/URLOpener.m rename to Classes/Helpers/TLOpenLink.m index a435b9c806..13f343beba 100755 --- a/Classes/Helpers/URLOpener.m +++ b/Classes/Helpers/TLOpenLink.m @@ -2,11 +2,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation URLOpener +@implementation TLOpenLink + (void)open:(NSURL *)url { - if ([Preferences openBrowserInBackground]) { + if ([TPCPreferences openBrowserInBackground]) { [_NSWorkspace() openURLs:[NSArray arrayWithObject:url] withAppBundleIdentifier:nil options:NSWorkspaceLaunchWithoutActivation diff --git a/Classes/IRC/AddressBook.m b/Classes/IRC/IRCAddressBook.m similarity index 95% rename from Classes/IRC/AddressBook.m rename to Classes/IRC/IRCAddressBook.m index a2c55903ff..9da2e2d330 100755 --- a/Classes/IRC/AddressBook.m +++ b/Classes/IRC/IRCAddressBook.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -@implementation AddressBook +@implementation IRCAddressBook @synthesize cid; @synthesize hostmask; @@ -33,7 +33,7 @@ - (id)initWithDictionary:(NSDictionary *)dic self.notifyJoins = [dic boolForKey:@"notifyJoins"]; self.ignorePMHighlights = [dic boolForKey:@"ignorePMHighlights"]; - self.entryType = (AddressBookEntryType)[dic integerForKey:@"entryType"]; + self.entryType = (IRCAddressBookEntryType)[dic integerForKey:@"entryType"]; [self processHostMaskRegex]; @@ -45,7 +45,7 @@ - (id)initWithDictionary:(NSDictionary *)dic - (void)processHostMaskRegex { - if (self.entryType == ADDRESS_BOOK_TRACKING_ENTRY) { + if (self.entryType == IRCAddressBookUserTrackingEntryType) { NSString *nickname = [self trackingNickname]; self.hostmaskRegex = nil; @@ -127,7 +127,7 @@ - (NSDictionary *)dictionaryValue - (BOOL)checkIgnore:(NSString *)thehost { if (self.hostmaskRegex && thehost) { - return [TXRegularExpression string:thehost + return [TLORegularExpression string:thehost isMatchedByRegex:self.hostmaskRegex withoutCase:YES]; } diff --git a/Classes/IRC/IRCChannel.m b/Classes/IRC/IRCChannel.m index f88eb36dd0..304df8ce9f 100755 --- a/Classes/IRC/IRCChannel.m +++ b/Classes/IRC/IRCChannel.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define TREE_USERLIST_HEIGHT 16.0 +#define _treeUserlistHeight 16.0 @interface IRCChannel (Private) - (void)closeLogFile; @@ -70,24 +70,24 @@ - (void)setName:(NSString *)value - (NSString *)password { - return ((self.config.password) ?: NSNullObject); + return ((self.config.password) ?: NSStringEmptyPlaceholder); } - (BOOL)isChannel { - return (self.config.type == CHANNEL_TYPE_CHANNEL); + return (self.config.type == IRCChannelNormalType); } - (BOOL)isTalk { - return (self.config.type == CHANNEL_TYPE_TALK); + return (self.config.type == IRCChannelPrivateMessageType); } - (NSString *)channelTypeString { switch (self.config.type) { - case CHANNEL_TYPE_CHANNEL: return @"channel"; - case CHANNEL_TYPE_TALK: return @"talk"; + case IRCChannelNormalType: return @"channel"; + case IRCChannelPrivateMessageType: return @"talk"; } return nil; @@ -111,10 +111,10 @@ - (void)closeDialogs - (void)preferencesChanged { - self.log.maxLines = [Preferences maxLogLines]; + self.log.maxLines = [TPCPreferences maxLogLines]; if (self.logFile) { - if ([Preferences logTranscript]) { + if ([TPCPreferences logTranscript]) { [self.logFile reopenIfNeeded]; } else { [self closeLogFile]; @@ -158,8 +158,8 @@ - (void)deactivate - (void)detectOutgoingConversation:(NSString *)text { - if (NSObjectIsNotEmpty([Preferences completionSuffix])) { - NSArray *pieces = [text split:[Preferences completionSuffix]]; + if (NSObjectIsNotEmpty([TPCPreferences completionSuffix])) { + NSArray *pieces = [text split:[TPCPreferences completionSuffix]]; if ([pieces count] > 1) { IRCUser *talker = [self findMember:[pieces safeObjectAtIndex:0]]; @@ -171,18 +171,18 @@ - (void)detectOutgoingConversation:(NSString *)text } } -- (BOOL)print:(LogLine *)line +- (BOOL)print:(TVCLogLine *)line { return [self print:line withHTML:NO]; } -- (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML +- (BOOL)print:(TVCLogLine *)line withHTML:(BOOL)rawHTML { BOOL result = [self.log print:line withHTML:rawHTML]; - if ([Preferences logTranscript]) { + if ([TPCPreferences logTranscript]) { if (PointerIsEmpty(self.logFile)) { - self.logFile = [FileLogger new]; + self.logFile = [TLOFileLogger new]; self.logFile.client = self.client; self.logFile.channel = self; } @@ -199,7 +199,7 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML self.logDate = comp; } - NSString *nickStr = NSNullObject; + NSString *nickStr = NSStringEmptyPlaceholder; if (line.nick) { nickStr = [NSString stringWithFormat:@"%@: ", line.nickInfo]; @@ -466,18 +466,18 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)sender - (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row { - return TREE_USERLIST_HEIGHT; + return _treeUserlistHeight; } - (id)tableView:(NSTableView *)sender objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row { IRCUser *user = [self.members safeObjectAtIndex:row]; - return TXTFLS(@"ACCESSIBILITY_MEMBER_LIST_DESCRIPTION", [user nick], [self.config.name safeSubstringFromIndex:1]); + return TXTFLS(@"AccessibilityMemberListDescription", [user nick], [self.config.name safeSubstringFromIndex:1]); } - (void)tableView:(NSTableView *)sender - willDisplayCell:(MemberListCell *)cell + willDisplayCell:(TVCMemberListCell *)cell forTableColumn:(NSTableColumn *)column row:(NSInteger)row { diff --git a/Classes/IRC/IRCChannelConfig.m b/Classes/IRC/IRCChannelConfig.m index 4ed864f8ab..5273a6c312 100755 --- a/Classes/IRC/IRCChannelConfig.m +++ b/Classes/IRC/IRCChannelConfig.m @@ -20,7 +20,7 @@ @implementation IRCChannelConfig - (id)init { if ((self = [super init])) { - self.type = CHANNEL_TYPE_CHANNEL; + self.type = IRCChannelNormalType; self.inlineImages = NO; self.iJPQActivity = NO; @@ -28,11 +28,11 @@ - (id)init self.autoJoin = YES; self.growl = YES; - self.name = NSNullObject; - self.mode = NSNullObject; - self.topic = NSNullObject; - self.password = NSNullObject; - self.encryptionKey = NSNullObject; + self.name = NSStringEmptyPlaceholder; + self.mode = NSStringEmptyPlaceholder; + self.topic = NSStringEmptyPlaceholder; + self.password = NSStringEmptyPlaceholder; + self.encryptionKey = NSStringEmptyPlaceholder; } return self; @@ -41,10 +41,10 @@ - (id)init - (id)initWithDictionary:(NSDictionary *)dic { if ((self = [self init])) { - self.type = (ChannelType)[dic integerForKey:@"type"]; + self.type = (IRCChannelType)[dic integerForKey:@"type"]; - self.name = (([dic stringForKey:@"name"]) ?: NSNullObject); - self.password = (([dic stringForKey:@"password"]) ?: NSNullObject); + self.name = (([dic stringForKey:@"name"]) ?: NSStringEmptyPlaceholder); + self.password = (([dic stringForKey:@"password"]) ?: NSStringEmptyPlaceholder); self.growl = [dic boolForKey:@"growl"]; self.autoJoin = [dic boolForKey:@"auto_join"]; @@ -52,9 +52,9 @@ - (id)initWithDictionary:(NSDictionary *)dic self.inlineImages = [dic boolForKey:@"disable_images"]; self.iJPQActivity = [dic boolForKey:@"ignore_join,leave"]; - self.mode = (([dic stringForKey:@"mode"]) ?: NSNullObject); - self.topic = (([dic stringForKey:@"topic"]) ?: NSNullObject); - self.encryptionKey = (([dic stringForKey:@"encryptionKey"]) ?: NSNullObject); + self.mode = (([dic stringForKey:@"mode"]) ?: NSStringEmptyPlaceholder); + self.topic = (([dic stringForKey:@"topic"]) ?: NSStringEmptyPlaceholder); + self.encryptionKey = (([dic stringForKey:@"encryptionKey"]) ?: NSStringEmptyPlaceholder); return self; } diff --git a/Classes/IRC/IRCChannelMode.m b/Classes/IRC/IRCChannelMode.m index 8631699170..0f12e94077 100755 --- a/Classes/IRC/IRCChannelMode.m +++ b/Classes/IRC/IRCChannelMode.m @@ -88,7 +88,7 @@ - (NSString *)getChangeCommand:(IRCChannelMode *)mode [str appendFormat:@"-%c", h.mode]; if (h.mode == 'k') { - h.param = NSNullObject; + h.param = NSStringEmptyPlaceholder; } else { if (h.mode == 'l') { h.param = 0; diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m index be8479e301..28ca0d5e47 100755 --- a/Classes/IRC/IRCClient.m +++ b/Classes/IRC/IRCClient.m @@ -5,14 +5,14 @@ #import #import -#define TIMEOUT_INTERVAL 360 -#define PING_INTERVAL 270 -#define RETRY_INTERVAL 240 -#define RECONNECT_INTERVAL 20 -#define ISON_CHECK_INTERVAL 30 -#define TRIAL_PERIOD_INTERVAL 7200 -#define AUTOJOIN_DELAY_INTERVAL 2 -#define PONG_CHECK_INTERVAL 30 +#define _timeoutInterval 360 +#define _pingInterval 270 +#define _retryInterval 240 +#define _reconnectInterval 20 +#define _isonCheckIntervalL 30 +#define _trialPeriodInterval 7200 +#define _autojoinDelayInterval 2 +#define _pongCheckInterval 30 static NSDateFormatter *dateTimeFormatter = nil; @@ -46,20 +46,20 @@ - (void)tryAnotherNick; - (void)changeStateOff; - (void)performAutoJoin; -- (void)addCommandToCommandQueue:(TimerCommand *)m; +- (void)addCommandToCommandQueue:(TLOTimerCommand *)m; - (void)clearCommandQueue; -- (void)handleUserTrackingNotification:(AddressBook *)ignoreItem +- (void)handleUserTrackingNotification:(IRCAddressBook *)ignoreItem nickname:(NSString *)nick hostmask:(NSString *)host langitem:(NSString *)localKey; - @end @implementation IRCClient @synthesize uid; @synthesize log; +@synthesize connectDelay; @synthesize autoJoinTimer; @synthesize autojoinInitialized; @synthesize banExceptionSheet; @@ -115,8 +115,13 @@ @implementation IRCClient @synthesize whoisChannel; @synthesize inSASLRequest; @synthesize lastMessageReceived; +@synthesize capPaused; @synthesize world; +#ifdef IS_TRIAL_BINARY +@synthesize trialPeriodTimer; +#endif + - (id)init { if ((self = [super init])) { @@ -141,32 +146,32 @@ - (id)init isAway = NO; hasIRCopAccess = NO; - reconnectTimer = [Timer new]; + reconnectTimer = [TLOTimer new]; reconnectTimer.delegate = self; reconnectTimer.reqeat = NO; reconnectTimer.selector = @selector(onReconnectTimer:); - retryTimer = [Timer new]; + retryTimer = [TLOTimer new]; retryTimer.delegate = self; retryTimer.reqeat = NO; retryTimer.selector = @selector(onRetryTimer:); - autoJoinTimer = [Timer new]; + autoJoinTimer = [TLOTimer new]; autoJoinTimer.delegate = self; autoJoinTimer.reqeat = YES; autoJoinTimer.selector = @selector(onAutoJoinTimer:); - commandQueueTimer = [Timer new]; + commandQueueTimer = [TLOTimer new]; commandQueueTimer.delegate = self; commandQueueTimer.reqeat = NO; commandQueueTimer.selector = @selector(onCommandQueueTimer:); - pongTimer = [Timer new]; + pongTimer = [TLOTimer new]; pongTimer.delegate = self; pongTimer.reqeat = YES; pongTimer.selector = @selector(onPongTimer:); - isonTimer = [Timer new]; + isonTimer = [TLOTimer new]; isonTimer.delegate = self; isonTimer.reqeat = YES; isonTimer.selector = @selector(onISONTimer:); @@ -305,7 +310,7 @@ - (BOOL)isReconnecting #pragma mark - #pragma mark User Tracking -- (void)handleUserTrackingNotification:(AddressBook *)ignoreItem +- (void)handleUserTrackingNotification:(IRCAddressBook *)ignoreItem nickname:(NSString *)nick hostmask:(NSString *)host langitem:(NSString *)localKey @@ -313,7 +318,7 @@ - (void)handleUserTrackingNotification:(AddressBook *)ignoreItem if ([ignoreItem notifyJoins] == YES) { NSString *text = TXTFLS(localKey, host, ignoreItem.hostmask); - [self notifyEvent:NOTIFICATION_ADDRESS_BOOK_MATCH lineType:LINE_TYPE_NOTICE target:nil nick:nick text:text]; + [self notifyEvent:TXNotificationAddressBookMatchType lineType:TVCLogLineNoticeType target:nil nick:nick text:text]; } } @@ -334,7 +339,7 @@ - (void)populateISONTrackedUsersList:(NSMutableArray *)ignores [oldEntries setObject:[trackedUsers objectForKey:lname] forKey:lname]; } - for (AddressBook *g in ignores) { + for (IRCAddressBook *g in ignores) { if (g.notifyJoins) { NSString *lname = [g trackingNickname]; @@ -350,7 +355,7 @@ - (void)populateISONTrackedUsersList:(NSMutableArray *)ignores trackedUsers = newEntries; } else { - for (AddressBook *g in ignores) { + for (IRCAddressBook *g in ignores) { if (g.notifyJoins) { NSString *lname = [g trackingNickname]; @@ -402,7 +407,7 @@ - (void)closeDialogs - (void)preferencesChanged { - log.maxLines = [Preferences maxLogLines]; + log.maxLines = [TPCPreferences maxLogLines]; for (IRCChannel *c in channels) { [c preferencesChanged]; @@ -414,11 +419,11 @@ - (void)reloadTree [world reloadTree]; } -- (AddressBook *)checkIgnoreAgainstHostmask:(NSString *)host withMatches:(NSArray *)matches +- (IRCAddressBook *)checkIgnoreAgainstHostmask:(NSString *)host withMatches:(NSArray *)matches { host = [host lowercaseString]; - for (AddressBook *g in config.ignores) { + for (IRCAddressBook *g in config.ignores) { if ([g checkIgnore:host]) { NSDictionary *ignoreDict = [g dictionaryValue]; @@ -440,13 +445,13 @@ - (AddressBook *)checkIgnoreAgainstHostmask:(NSString *)host withMatches:(NSArra } -- (BOOL)outputRuleMatchedInMessage:(NSString *)raw inChannel:(IRCChannel *)chan withLineType:(LogLineType)type +- (BOOL)outputRuleMatchedInMessage:(NSString *)raw inChannel:(IRCChannel *)chan withLineType:(TVCLogLineType)type { - if ([Preferences removeAllFormatting]) { + if ([TPCPreferences removeAllFormatting]) { raw = [raw stripEffects]; } - NSString *rulekey = [LogLine lineTypeString:type]; + NSString *rulekey = [TVCLogLine lineTypeString:type]; NSDictionary *rules = world.bundlesWithOutputRules; if (NSObjectIsNotEmpty(rules)) { @@ -454,7 +459,7 @@ - (BOOL)outputRuleMatchedInMessage:(NSString *)raw inChannel:(IRCChannel *)chan if (NSObjectIsNotEmpty(ruleData)) { for (NSString *ruleRegex in ruleData) { - if ([TXRegularExpression string:raw isMatchedByRegex:ruleRegex]) { + if ([TLORegularExpression string:raw isMatchedByRegex:ruleRegex]) { NSArray *regexData = [ruleData arrayForKey:ruleRegex]; BOOL console = [regexData boolAtIndex:0]; @@ -489,7 +494,7 @@ - (void)createChanBanListDialog if (PointerIsEmpty(u) || PointerIsEmpty(c)) return; - chanBanListSheet = [ChanBanSheet new]; + chanBanListSheet = [TDChanBanSheet new]; chanBanListSheet.delegate = self; chanBanListSheet.window = world.window; } else { @@ -505,18 +510,18 @@ - (void)createChanBanListDialog [chanBanListSheet show]; } -- (void)chanBanDialogOnUpdate:(ChanBanSheet *)sender +- (void)chanBanDialogOnUpdate:(TDChanBanSheet *)sender { [sender.list removeAllObjects]; - [self send:IRCCI_MODE, [[world selectedChannel] name], @"+b", nil]; + [self send:IRCCommandIndexMode, [[world selectedChannel] name], @"+b", nil]; } -- (void)chanBanDialogWillClose:(ChanBanSheet *)sender +- (void)chanBanDialogWillClose:(TDChanBanSheet *)sender { if (NSObjectIsNotEmpty(sender.modes)) { for (NSString *mode in sender.modes) { - [self sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCI_MODE, [world selectedChannel].name, mode]]; + [self sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCommandIndexMode, [world selectedChannel].name, mode]]; } } @@ -540,25 +545,25 @@ - (void)createChanInviteExceptionListDialog if (PointerIsEmpty(u) || PointerIsEmpty(c)) return; - inviteExceptionSheet = [ChanInviteExceptionSheet new]; + inviteExceptionSheet = [TDChanInviteExceptionSheet new]; inviteExceptionSheet.delegate = self; inviteExceptionSheet.window = world.window; [inviteExceptionSheet show]; } } -- (void)chanInviteExceptionDialogOnUpdate:(ChanInviteExceptionSheet *)sender +- (void)chanInviteExceptionDialogOnUpdate:(TDChanInviteExceptionSheet *)sender { [sender.list removeAllObjects]; - [self send:IRCCI_MODE, [[world selectedChannel] name], @"+I", nil]; + [self send:IRCCommandIndexMode, [[world selectedChannel] name], @"+I", nil]; } -- (void)chanInviteExceptionDialogWillClose:(ChanInviteExceptionSheet *)sender +- (void)chanInviteExceptionDialogWillClose:(TDChanInviteExceptionSheet *)sender { if (NSObjectIsNotEmpty(sender.modes)) { for (NSString *mode in sender.modes) { - [self sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCI_MODE, [world selectedChannel].name, mode]]; + [self sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCommandIndexMode, [world selectedChannel].name, mode]]; } } @@ -576,7 +581,7 @@ - (void)createChanBanExceptionListDialog if (PointerIsEmpty(u) || PointerIsEmpty(c)) return; - banExceptionSheet = [ChanBanExceptionSheet new]; + banExceptionSheet = [TDChanBanExceptionSheet new]; banExceptionSheet.delegate = self; banExceptionSheet.window = world.window; } else { @@ -592,18 +597,18 @@ - (void)createChanBanExceptionListDialog [banExceptionSheet show]; } -- (void)chanBanExceptionDialogOnUpdate:(ChanBanExceptionSheet *)sender +- (void)chanBanExceptionDialogOnUpdate:(TDChanBanExceptionSheet *)sender { [sender.list removeAllObjects]; - [self send:IRCCI_MODE, [[world selectedChannel] name], @"+e", nil]; + [self send:IRCCommandIndexMode, [[world selectedChannel] name], @"+e", nil]; } -- (void)chanBanExceptionDialogWillClose:(ChanBanExceptionSheet *)sender +- (void)chanBanExceptionDialogWillClose:(TDChanBanExceptionSheet *)sender { if (NSObjectIsNotEmpty(sender.modes)) { for (NSString *mode in sender.modes) { - [self sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCI_MODE, [world selectedChannel].name, mode]]; + [self sendLine:[NSString stringWithFormat:@"%@ %@ %@", IRCCommandIndexMode, [world selectedChannel].name, mode]]; } } @@ -616,7 +621,7 @@ - (void)chanBanExceptionDialogWillClose:(ChanBanExceptionSheet *)sender - (void)createChannelListDialog { if (PointerIsEmpty(channelListDialog)) { - channelListDialog = [ListDialog new]; + channelListDialog = [TDCListDialog new]; channelListDialog.delegate = self; [channelListDialog start]; } else { @@ -624,19 +629,19 @@ - (void)createChannelListDialog } } -- (void)listDialogOnUpdate:(ListDialog *)sender +- (void)listDialogOnUpdate:(TDCListDialog *)sender { [sender.list removeAllObjects]; - [self sendLine:IRCCI_LIST]; + [self sendLine:IRCCommandIndexList]; } -- (void)listDialogOnJoin:(ListDialog *)sender channel:(NSString *)channel +- (void)listDialogOnJoin:(TDCListDialog *)sender channel:(NSString *)channel { [self joinUnlistedChannel:channel]; } -- (void)listDialogWillClose:(ListDialog *)sender +- (void)listDialogWillClose:(TDCListDialog *)sender { channelListDialog = nil; } @@ -648,7 +653,7 @@ - (void)startISONTimer { if (isonTimer.isActive) return; - [isonTimer start:ISON_CHECK_INTERVAL]; + [isonTimer start:_isonCheckIntervalL]; } - (void)stopISONTimer @@ -670,7 +675,7 @@ - (void)onISONTimer:(id)sender [userstr appendFormat:@" %@", name]; } - [self send:IRCCI_ISON, userstr, nil]; + [self send:IRCCommandIndexIson, userstr, nil]; } } @@ -678,7 +683,7 @@ - (void)startPongTimer { if (pongTimer.isActive) return; - [pongTimer start:PONG_CHECK_INTERVAL]; + [pongTimer start:_pongCheckInterval]; } - (void)stopPongTimer @@ -699,12 +704,12 @@ - (void)onPongTimer:(id)sender NSInteger timeSpent = [NSDate secondsSinceUnixTimestamp:lastMessageReceived]; NSInteger minsSpent = (timeSpent / 60); - if (timeSpent >= TIMEOUT_INTERVAL) { - [self printDebugInformation:TXTFLS(@"IRC_DISCONNECTED_FROM_TIMEOUT", minsSpent) channel:nil]; + if (timeSpent >= _timeoutInterval) { + [self printDebugInformation:TXTFLS(@"IRCDisconnectedByTimeout", minsSpent) channel:nil]; [self disconnect]; - } else if (timeSpent >= PING_INTERVAL) { - [self send:IRCCI_PING, serverHostname, nil]; + } else if (timeSpent >= _pingInterval) { + [self send:IRCCommandIndexPing, serverHostname, nil]; } } @@ -713,7 +718,7 @@ - (void)startReconnectTimer if (config.autoReconnect) { if (reconnectTimer.isActive) return; - [reconnectTimer start:RECONNECT_INTERVAL]; + [reconnectTimer start:_reconnectInterval]; } } @@ -724,14 +729,14 @@ - (void)stopReconnectTimer - (void)onReconnectTimer:(id)sender { - [self connect:CONNECT_RECONNECT]; + [self connect:IRCNormalReconnectionMode]; } - (void)startRetryTimer { if (retryTimer.isActive) return; - [retryTimer start:RETRY_INTERVAL]; + [retryTimer start:_retryInterval]; } - (void)stopRetryTimer @@ -742,13 +747,13 @@ - (void)stopRetryTimer - (void)onRetryTimer:(id)sender { [self disconnect]; - [self connect:CONNECT_RETRY]; + [self connect:IRCConnectionRetryMode]; } - (void)startAutoJoinTimer { [autoJoinTimer stop]; - [autoJoinTimer start:AUTOJOIN_DELAY_INTERVAL]; + [autoJoinTimer start:_autojoinDelayInterval]; } - (void)stopAutoJoinTimer @@ -758,7 +763,7 @@ - (void)stopAutoJoinTimer - (void)onAutoJoinTimer:(id)sender { - if ([Preferences autojoinWaitForNickServ] == NO || NSObjectIsEmpty(config.nickPassword)) { + if ([TPCPreferences autojoinWaitForNickServ] == NO || NSObjectIsEmpty(config.nickPassword)) { [self performAutoJoin]; autojoinInitialized = YES; @@ -784,15 +789,15 @@ - (void)onAutoJoinTimer:(id)sender - (void)connect { - [self connect:CONNECT_NORMAL]; + [self connect:IRCConnectNormalMode]; } -- (void)connect:(ConnectMode)mode +- (void)connect:(IRCConnectMode)mode { [self stopReconnectTimer]; connectType = mode; - disconnectType = DISCONNECT_NORMAL; + disconnectType = IRCDisconnectNormalMode; if (isConnected) { [conn close]; @@ -805,16 +810,16 @@ - (void)connect:(ConnectMode)mode NSString *host = config.host; switch (mode) { - case CONNECT_NORMAL: - [self printSystemBoth:nil text:TXTFLS(@"IRC_IS_CONNECTING", host, config.port)]; + case IRCConnectNormalMode: + [self printSystemBoth:nil text:TXTFLS(@"IRCIsConnecting", host, config.port)]; break; - case CONNECT_RECONNECT: - [self printSystemBoth:nil text:TXTLS(@"IRC_IS_RECONNECTING")]; - [self printSystemBoth:nil text:TXTFLS(@"IRC_IS_CONNECTING", host, config.port)]; + case IRCNormalReconnectionMode: + [self printSystemBoth:nil text:TXTLS(@"IRCIsReconnecting")]; + [self printSystemBoth:nil text:TXTFLS(@"IRCIsConnecting", host, config.port)]; break; - case CONNECT_RETRY: - [self printSystemBoth:nil text:TXTLS(@"IRC_IS_RETRYING_CONNECTION")]; - [self printSystemBoth:nil text:TXTFLS(@"IRC_IS_CONNECTING", host, config.port)]; + case IRCConnectionRetryMode: + [self printSystemBoth:nil text:TXTLS(@"IRCIsRetryingConnection")]; + [self printSystemBoth:nil text:TXTFLS(@"IRCIsConnecting", host, config.port)]; break; default: break; } @@ -830,10 +835,10 @@ - (void)connect:(ConnectMode)mode conn.encoding = config.encoding; switch (config.proxyType) { - case PROXY_SOCKS_SYSTEM: + case TXConnectionSystemSocksProxyType: conn.useSystemSocks = YES; - case PROXY_SOCKS4: - case PROXY_SOCKS5: + case TXConnectionSocks4ProxyType: + case TXConnectionSocks5ProxyType: conn.useSocks = YES; conn.socksVersion = config.proxyType; conn.proxyHost = config.proxyHost; @@ -879,7 +884,7 @@ - (void)quit:(NSString *)comment [conn clearSendQueue]; - [self send:IRCCI_QUIT, ((comment) ?: config.leavingComment), nil]; + [self send:IRCCommandIndexQuit, ((comment) ?: config.leavingComment), nil]; [self performSelector:@selector(disconnect) withObject:nil afterDelay:2.0]; } @@ -896,7 +901,7 @@ - (void)changeNick:(NSString *)newNick inputNick = newNick; sentNick = newNick; - [self send:IRCCI_NICK, newNick, nil]; + [self send:IRCCommandIndexNick, newNick, nil]; } - (void)_joinKickedChannel:(IRCChannel *)channel @@ -963,7 +968,7 @@ - (void)joinUnlistedChannel:(NSString *)channel password:(NSString *)password - (void)forceJoinChannel:(NSString *)channel password:(NSString *)password { - [self send:IRCCI_JOIN, channel, password, nil]; + [self send:IRCCommandIndexJoin, channel, password, nil]; } - (void)partUnlistedChannel:(NSString *)channel withComment:(NSString *)comment @@ -991,14 +996,14 @@ - (void)partChannel:(IRCChannel *)channel withComment:(NSString *)comment comment = config.leavingComment; } - [self send:IRCCI_PART, channel.name, comment, nil]; + [self send:IRCCommandIndexPart, channel.name, comment, nil]; } - (void)sendWhois:(NSString *)nick { if (isLoggedIn == NO) return; - [self send:IRCCI_WHOIS, nick, nick, nil]; + [self send:IRCCommandIndexWhois, nick, nick, nil]; } - (void)changeOp:(IRCChannel *)channel users:(NSArray *)inputUsers mode:(char)mode value:(BOOL)value @@ -1025,14 +1030,14 @@ - (void)changeOp:(IRCChannel *)channel users:(NSArray *)inputUsers mode:(char)mo NSMutableString *s = [NSMutableString string]; - [s appendFormat:@"%@ %@ %c", IRCCI_MODE, channel.name, ((value) ? '+' : '-')]; + [s appendFormat:@"%@ %@ %c", IRCCommandIndexMode, channel.name, ((value) ? '+' : '-')]; for (NSInteger i = (ary.count - 1); i >= 0; --i) { [s appendFormat:@"%c", mode]; } for (IRCUser *m in ary) { - [s appendString:NSWhitespaceCharacter]; + [s appendString:NSStringWhitespacePlaceholder]; [s appendString:m.nick]; } @@ -1044,7 +1049,7 @@ - (void)changeOp:(IRCChannel *)channel users:(NSArray *)inputUsers mode:(char)mo - (void)kick:(IRCChannel *)channel target:(NSString *)nick { - [self send:IRCCI_KICK, channel.name, nick, [Preferences defaultKickMessage], nil]; + [self send:IRCCommandIndexKick, channel.name, nick, [TPCPreferences defaultKickMessage], nil]; } - (void)quickJoin:(NSArray *)chans @@ -1075,12 +1080,12 @@ - (void)quickJoin:(NSArray *)chans NSData *targetData = [target dataUsingEncoding:enc]; NSData *passData = [pass dataUsingEncoding:enc]; - if ((targetData.length + passData.length) > MAXIMUM_IRC_BODY_LEN) { + if ((targetData.length + passData.length) > TXMaximumIRCBodyLength) { if (NSObjectIsEmpty(prevTarget)) { if (NSObjectIsEmpty(prevPass)) { - [self send:IRCCI_JOIN, prevTarget, nil]; + [self send:IRCCommandIndexJoin, prevTarget, nil]; } else { - [self send:IRCCI_JOIN, prevTarget, prevPass, nil]; + [self send:IRCCommandIndexJoin, prevTarget, prevPass, nil]; } [target setString:c.name]; @@ -1092,17 +1097,17 @@ - (void)quickJoin:(NSArray *)chans [self joinChannel:c password:c.password]; } - [target setString:NSNullObject]; - [pass setString:NSNullObject]; + [target setString:NSStringEmptyPlaceholder]; + [pass setString:NSStringEmptyPlaceholder]; } } } if (NSObjectIsNotEmpty(target)) { if (NSObjectIsEmpty(pass)) { - [self send:IRCCI_JOIN, target, nil]; + [self send:IRCCommandIndexJoin, target, nil]; } else { - [self send:IRCCI_JOIN, target, pass, nil]; + [self send:IRCCommandIndexJoin, target, pass, nil]; } } } @@ -1154,7 +1159,7 @@ - (void)joinChannels:(NSArray *)chans [ary safeAddObject:c]; } - if (ary.count >= [Preferences autojoinMaxChannelJoins]) { + if (ary.count >= [TPCPreferences autojoinMaxChannelJoins]) { [self quickJoin:ary]; [ary removeAllObjects]; @@ -1179,7 +1184,7 @@ - (void)startTrialPeriodTimer { if (trialPeriodTimer.isActive) return; - [trialPeriodTimer start:TRIAL_PERIOD_INTERVAL]; + [trialPeriodTimer start:_trialPeriodInterval]; } - (void)stopTrialPeriodTimer @@ -1190,7 +1195,7 @@ - (void)stopTrialPeriodTimer - (void)onTrialPeriodTimer:(id)sender { if (isLoggedIn) { - disconnectType = DISCONNECT_TRIAL_PERIOD; + disconnectType = IRCTrialPeriodDisconnectMode; [self quit]; } @@ -1210,7 +1215,7 @@ - (BOOL)encryptOutgoingMessage:(NSString **)message channel:(IRCChannel *)chan NSString *newstr = [CSFWBlowfish encodeData:*message key:chan.config.encryptionKey encoding:config.encoding]; if ([newstr length] < 5) { - [self printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPT_FAILED") channel:chan]; + [self printDebugInformation:TXTLS(@"BlowfishEncryptionFailed") channel:chan]; return NO; } else { @@ -1252,10 +1257,10 @@ - (void)executeTextualCmdScript:(NSDictionary *)details NSString *scriptPath = [details valueForKey:@"path"]; -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER +#ifdef TXUserScriptsFolderAvailable BOOL MLNonsandboxedScript = NO; - if ([scriptPath contains:[Preferences whereScriptsUnsupervisedPath]]) { + if ([scriptPath contains:[TPCPreferences whereScriptsUnsupervisedPath]]) { MLNonsandboxedScript = YES; } #endif @@ -1286,26 +1291,26 @@ - (void)executeTextualCmdScript:(NSDictionary *)details /* Execute Event — Mountain Lion, Non-sandboxed Script */ -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER +#ifdef TXUserScriptsFolderAvailable if (MLNonsandboxedScript) { - if ([Preferences featureAvailableToOSXMountainLion]) { + if ([TPCPreferences featureAvailableToOSXMountainLion]) { NSError *aserror = [NSError new]; NSUserAppleScriptTask *applescript = [[NSUserAppleScriptTask alloc] initWithURL:[NSURL fileURLWithPath:scriptPath] error:&aserror]; if (PointerIsEmpty(applescript)) { - NSLog(TXTLS(@"IRC_SCRIPT_EXECUTION_FAILURE"), [aserror localizedDescription]); + NSLog(TXTLS(@"ScriptExecutionFailure"), [aserror localizedDescription]); } else { [applescript executeWithAppleEvent:event completionHandler:^(NSAppleEventDescriptor *result, NSError *error){ if (PointerIsEmpty(result)) { - NSLog(TXTLS(@"IRC_SCRIPT_EXECUTION_FAILURE"), [error localizedDescription]); + NSLog(TXTLS(@"ScriptExecutionFailure"), [error localizedDescription]); } else { NSString *finalResult = [result stringValue].trim; if (NSObjectIsNotEmpty(finalResult)) { - [world.iomt inputText:finalResult command:IRCCI_PRIVMSG]; + [world.iomt inputText:finalResult command:IRCCommandIndexPrivmsg]; } } }]; @@ -1327,16 +1332,16 @@ - (void)executeTextualCmdScript:(NSDictionary *)details NSAppleEventDescriptor *result = [appleScript executeAppleEvent:event error:&errors]; if (errors && PointerIsEmpty(result)) { - NSLog(TXTLS(@"IRC_SCRIPT_EXECUTION_FAILURE"), errors); + NSLog(TXTLS(@"ScriptExecutionFailure"), errors); } else { NSString *finalResult = [result stringValue].trim; if (NSObjectIsNotEmpty(finalResult)) { - [world.iomt inputText:finalResult command:IRCCI_PRIVMSG]; + [world.iomt inputText:finalResult command:IRCCommandIndexPrivmsg]; } } } else { - NSLog(TXTLS(@"IRC_SCRIPT_EXECUTION_FAILURE"), errors); + NSLog(TXTLS(@"ScriptExecutionFailure"), errors); } } else { @@ -1373,7 +1378,7 @@ - (void)executeTextualCmdScript:(NSDictionary *)details NSString *outputString = [NSString stringWithData:outputData encoding:NSUTF8StringEncoding]; if (NSObjectIsNotEmpty(outputString)) { - [world.iomt inputText:outputString command:IRCCI_PRIVMSG]; + [world.iomt inputText:outputString command:IRCCommandIndexPrivmsg]; } } @@ -1381,7 +1386,7 @@ - (void)executeTextualCmdScript:(NSDictionary *)details - (void)processBundlesUserMessage:(NSArray *)info { - NSString *command = NSNullObject; + NSString *command = NSStringEmptyPlaceholder; NSString *message = [info safeObjectAtIndex:0]; if ([info count] == 2) { @@ -1456,7 +1461,7 @@ - (void)sendPrivmsgToSelectedChannel:(NSString *)message { NSAttributedString *new = [NSAttributedString emptyStringWithBase:message]; - [self sendText:new command:IRCCI_PRIVMSG channel:[world selectedChannelOn:self]]; + [self sendText:new command:IRCCommandIndexPrivmsg channel:[world selectedChannelOn:self]]; } - (void)sendText:(NSAttributedString *)str command:(NSString *)command channel:(IRCChannel *)channel @@ -1465,14 +1470,14 @@ - (void)sendText:(NSAttributedString *)str command:(NSString *)command channel:( return; } - LogLineType type; + TVCLogLineType type; - if ([command isEqualToString:IRCCI_NOTICE]) { - type = LINE_TYPE_NOTICE; - } else if ([command isEqualToString:IRCCI_ACTION]) { - type = LINE_TYPE_ACTION; + if ([command isEqualToString:IRCCommandIndexNotice]) { + type = TVCLogLineNoticeType; + } else if ([command isEqualToString:IRCCommandIndexAction]) { + type = TVCLogLineActionType; } else { - type = LINE_TYPE_PRIVMSG; + type = TVCLogLinePrivateMessageType; } if ([[world bundlesForUserInput] containsKey:command]) { @@ -1499,11 +1504,11 @@ - (void)sendText:(NSAttributedString *)str command:(NSString *)command channel:( NSString *cmd = command; - if (type == LINE_TYPE_ACTION) { - cmd = IRCCI_PRIVMSG; + if (type == TVCLogLineActionType) { + cmd = IRCCommandIndexPrivmsg; - newstr = [NSString stringWithFormat:@"%c%@ %@%c", 0x01, IRCCI_ACTION, newstr, 0x01]; - } else if (type == LINE_TYPE_PRIVMSG) { + newstr = [NSString stringWithFormat:@"%c%@ %@%c", 0x01, IRCCommandIndexAction, newstr, 0x01]; + } else if (type == TVCLogLinePrivateMessageType) { [channel detectOutgoingConversation:newstr]; } @@ -1527,7 +1532,7 @@ - (void)sendCTCPQuery:(NSString *)target command:(NSString *)command text:(NSStr trail = [NSString stringWithFormat:@"%c%@%c", 0x01, command, 0x01]; } - [self send:IRCCI_PRIVMSG, target, trail, nil]; + [self send:IRCCommandIndexPrivmsg, target, trail, nil]; } - (void)sendCTCPReply:(NSString *)target command:(NSString *)command text:(NSString *)text @@ -1540,12 +1545,12 @@ - (void)sendCTCPReply:(NSString *)target command:(NSString *)command text:(NSStr trail = [NSString stringWithFormat:@"%c%@%c", 0x01, command, 0x01]; } - [self send:IRCCI_NOTICE, target, trail, nil]; + [self send:IRCCommandIndexNotice, target, trail, nil]; } - (void)sendCTCPPing:(NSString *)target { - [self sendCTCPQuery:target command:IRCCI_PING text:[NSString stringWithFormat:@"%qu", mach_absolute_time()]]; + [self sendCTCPQuery:target command:IRCCommandIndexPing text:[NSString stringWithFormat:@"%qu", mach_absolute_time()]]; } - (BOOL)sendCommand:(id)str @@ -1577,7 +1582,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString IRCChannel *selChannel = nil; - if ([cmd isEqualToString:IRCCI_MODE] && ([s.string hasPrefix:@"+"] || [s.string hasPrefix:@"-"]) == NO) { + if ([cmd isEqualToString:IRCCommandIndexMode] && ([s.string hasPrefix:@"+"] || [s.string hasPrefix:@"-"]) == NO) { // do not complete for /mode #chname ... } else if (completeTarget && targetChannelName) { selChannel = [self findChannel:targetChannelName]; @@ -1593,18 +1598,18 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString [s deleteCharactersInRange:NSMakeRange(0, 1)]; } - switch ([Preferences commandUIndex:cmd]) { + switch ([TPCPreferences commandUIndex:cmd]) { case 3: // Command: AWAY { NSString *msg = s.string; if (NSObjectIsEmpty(s) && cutColon == NO) { if (isAway == NO) { - msg = TXTLS(@"IRC_AWAY_COMMAND_DEFAULT_REASON"); + msg = TXTLS(@"IRCAwayCommandDefaultReason"); } } - if ([Preferences awayAllConnections]) { + if ([TPCPreferences awayAllConnections]) { for (IRCClient *u in [world clients]) { if (u.isConnected == NO) continue; @@ -1665,7 +1670,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } } - [self send:IRCCI_JOIN, targetChannelName, s.string, nil]; + [self send:IRCCommandIndexJoin, targetChannelName, s.string, nil]; return YES; break; @@ -1688,7 +1693,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSString *reason = [s.string trim]; if (NSObjectIsEmpty(reason)) { - reason = [Preferences defaultKickMessage]; + reason = [TPCPreferences defaultKickMessage]; } [self send:cmd, targetChannelName, peer, reason, nil]; @@ -1705,10 +1710,10 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSString *reason = [s.string trim]; if (NSObjectIsEmpty(reason)) { - reason = [Preferences IRCopDefaultKillMessage]; + reason = [TPCPreferences IRCopDefaultKillMessage]; } - [self send:IRCCI_KILL, peer, reason, nil]; + [self send:IRCCommandIndexKill, peer, reason, nil]; } return YES; @@ -1720,7 +1725,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString [self createChannelListDialog]; } - [self send:IRCCI_LIST, s.string, nil]; + [self send:IRCCommandIndexList, s.string, nil]; return YES; break; @@ -1729,7 +1734,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString { NSString *newnick = s.getToken.string; - if ([Preferences nickAllConnections]) { + if ([TPCPreferences nickAllConnections]) { for (IRCClient *u in [world clients]) { if ([u isConnected] == NO) continue; @@ -1757,29 +1762,29 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString BOOL opMsg = NO; BOOL secretMsg = NO; - if ([cmd isEqualToString:IRCCI_MSG]) { - cmd = IRCCI_PRIVMSG; - } else if ([cmd isEqualToString:IRCCI_OMSG]) { + if ([cmd isEqualToString:IRCCommandIndexMsg]) { + cmd = IRCCommandIndexPrivmsg; + } else if ([cmd isEqualToString:IRCCommandIndexOmsg]) { opMsg = YES; - cmd = IRCCI_PRIVMSG; - } else if ([cmd isEqualToString:IRCCI_ONOTICE]) { + cmd = IRCCommandIndexPrivmsg; + } else if ([cmd isEqualToString:IRCCommandIndexOnotice]) { opMsg = YES; - cmd = IRCCI_NOTICE; - } else if ([cmd isEqualToString:IRCCI_SME]) { + cmd = IRCCommandIndexNotice; + } else if ([cmd isEqualToString:IRCCommandIndexSme]) { secretMsg = YES; - cmd = IRCCI_ME; - } else if ([cmd isEqualToString:IRCCI_SMSG]) { + cmd = IRCCommandIndexMe; + } else if ([cmd isEqualToString:IRCCommandIndexSmsg]) { secretMsg = YES; - cmd = IRCCI_PRIVMSG; + cmd = IRCCommandIndexPrivmsg; } - if ([cmd isEqualToString:IRCCI_PRIVMSG] || - [cmd isEqualToString:IRCCI_NOTICE] || - [cmd isEqualToString:IRCCI_ACTION]) { + if ([cmd isEqualToString:IRCCommandIndexPrivmsg] || + [cmd isEqualToString:IRCCommandIndexNotice] || + [cmd isEqualToString:IRCCommandIndexAction]) { if (opMsg) { if (selChannel && selChannel.isChannel && [s.string isChannelName] == NO) { @@ -1790,8 +1795,8 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } else { targetChannelName = s.getToken.string; } - } else if ([cmd isEqualToString:IRCCI_ME]) { - cmd = IRCCI_ACTION; + } else if ([cmd isEqualToString:IRCCommandIndexMe]) { + cmd = IRCCommandIndexAction; if (selChannel) { targetChannelName = selChannel.name; @@ -1800,9 +1805,9 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } } - if ([cmd isEqualToString:IRCCI_PRIVMSG] || [cmd isEqualToString:IRCCI_NOTICE]) { + if ([cmd isEqualToString:IRCCommandIndexPrivmsg] || [cmd isEqualToString:IRCCommandIndexNotice]) { if ([s.string hasPrefix:@"\x01"]) { - cmd = (([cmd isEqualToString:IRCCI_PRIVMSG]) ? IRCCI_CTCP : IRCCI_CTCPREPLY); + cmd = (([cmd isEqualToString:IRCCommandIndexPrivmsg]) ? IRCCommandIndexCtcp : IRCCommandIndexCtcpreply); [s deleteCharactersInRange:NSMakeRange(0, 1)]; @@ -1818,13 +1823,13 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } } - if ([cmd isEqualToString:IRCCI_CTCP]) { + if ([cmd isEqualToString:IRCCommandIndexCtcp]) { NSMutableAttributedString *t = s.mutableCopy; NSString *subCommand = [t.getToken.string uppercaseString]; - if ([subCommand isEqualToString:IRCCI_ACTION]) { - cmd = IRCCI_ACTION; + if ([subCommand isEqualToString:IRCCommandIndexAction]) { + cmd = IRCCommandIndexAction; s = t; @@ -1835,7 +1840,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString if (NSObjectIsNotEmpty(subCommand)) { targetChannelName = s.getToken.string; - if ([subCommand isEqualToString:IRCCI_PING]) { + if ([subCommand isEqualToString:IRCCommandIndexPing]) { [self sendCTCPPing:targetChannelName]; } else { [self sendCTCPQuery:targetChannelName command:subCommand text:s.string]; @@ -1846,7 +1851,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } } - if ([cmd isEqualToString:IRCCI_CTCPREPLY]) { + if ([cmd isEqualToString:IRCCommandIndexCtcpreply]) { targetChannelName = s.getToken.string; NSString *subCommand = s.getToken.string; @@ -1856,21 +1861,21 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString return YES; } - if ([cmd isEqualToString:IRCCI_PRIVMSG] || - [cmd isEqualToString:IRCCI_NOTICE] || - [cmd isEqualToString:IRCCI_ACTION]) { + if ([cmd isEqualToString:IRCCommandIndexPrivmsg] || + [cmd isEqualToString:IRCCommandIndexNotice] || + [cmd isEqualToString:IRCCommandIndexAction]) { if (NSObjectIsEmpty(s)) return NO; if (NSObjectIsEmpty(targetChannelName)) return NO; - LogLineType type; + TVCLogLineType type; - if ([cmd isEqualToString:IRCCI_NOTICE]) { - type = LINE_TYPE_NOTICE; - } else if ([cmd isEqualToString:IRCCI_ACTION]) { - type = LINE_TYPE_ACTION; + if ([cmd isEqualToString:IRCCommandIndexNotice]) { + type = TVCLogLineNoticeType; + } else if ([cmd isEqualToString:IRCCommandIndexAction]) { + type = TVCLogLineActionType; } else { - type = LINE_TYPE_PRIVMSG; + type = TVCLogLinePrivateMessageType; } while (NSObjectIsNotEmpty(s)) { @@ -1895,7 +1900,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString if (PointerIsEmpty(c) && [chname isChannelName] == NO && secretMsg == NO) { - if (type == LINE_TYPE_NOTICE) { + if (type == TVCLogLineNoticeType) { c = (id)self; } else { c = [world createTalk:chname client:self]; @@ -1918,15 +1923,15 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSString *localCmd = cmd; - if ([localCmd isEqualToString:IRCCI_ACTION]) { - localCmd = IRCCI_PRIVMSG; + if ([localCmd isEqualToString:IRCCommandIndexAction]) { + localCmd = IRCCommandIndexPrivmsg; - t = [NSString stringWithFormat:@"\x01%@ %@\x01", IRCCI_ACTION, t]; + t = [NSString stringWithFormat:@"\x01%@ %@\x01", IRCCommandIndexAction, t]; } [self send:localCmd, chname, t, nil]; - if (c && [Preferences giveFocusOnMessage]) { + if (c && [TPCPreferences giveFocusOnMessage]) { [world select:c]; } } @@ -1988,7 +1993,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString IRCChannel *c = [self findChannel:targetChannelName]; if ([self encryptOutgoingMessage:&topic channel:c] == YES) { - [self send:IRCCI_TOPIC, targetChannelName, topic, nil]; + [self send:IRCCommandIndexTopic, targetChannelName, topic, nil]; } } @@ -1999,7 +2004,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString { inWhoInfoRun = YES; - [self send:IRCCI_WHO, s.string, nil]; + [self send:IRCCommandIndexWho, s.string, nil]; return YES; break; @@ -2018,10 +2023,10 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } } - if ([s.string contains:NSWhitespaceCharacter]) { - [self sendLine:[NSString stringWithFormat:@"%@ %@", IRCCI_WHOIS, peer]]; + if ([s.string contains:NSStringWhitespacePlaceholder]) { + [self sendLine:[NSString stringWithFormat:@"%@ %@", IRCCommandIndexWhois, peer]]; } else { - [self send:IRCCI_WHOIS, peer, peer, nil]; + [self send:IRCCommandIndexWhois, peer, peer, nil]; } return YES; @@ -2034,7 +2039,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString if (NSObjectIsNotEmpty(targetChannelName)) { NSString *subCommand = [s.getToken.string uppercaseString]; - if ([subCommand isEqualToString:IRCCI_PING]) { + if ([subCommand isEqualToString:IRCCommandIndexPing]) { [self sendCTCPPing:targetChannelName]; } else { [self sendCTCPQuery:targetChannelName command:subCommand text:s.string]; @@ -2066,7 +2071,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSString *host = ((user) ? [user banMask] : peer); - if ([cmd isEqualToString:IRCCI_BAN]) { + if ([cmd isEqualToString:IRCCommandIndexBan]) { [self sendCommand:[NSString stringWithFormat:@"MODE +b %@", host] completeTarget:YES target:c.name]; } else { [self sendCommand:[NSString stringWithFormat:@"MODE -b %@", host] completeTarget:YES target:c.name]; @@ -2087,18 +2092,18 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString case 66: // Command: UMODE case 53: // Command: M { - if ([cmd isEqualToString:IRCCI_M]) { - cmd = IRCCI_MODE; + if ([cmd isEqualToString:IRCCommandIndexM]) { + cmd = IRCCommandIndexMode; } - if ([cmd isEqualToString:IRCCI_MODE]) { + if ([cmd isEqualToString:IRCCommandIndexMode]) { if (selChannel && selChannel.isChannel && [s.string isModeChannelName] == NO) { targetChannelName = selChannel.name; } else if (([s.string hasPrefix:@"+"] || [s.string hasPrefix:@"-"]) == NO) { targetChannelName = s.getToken.string; } - } else if ([cmd isEqualToString:IRCCI_UMODE]) { - [s insertAttributedString:[NSAttributedString emptyStringWithBase:NSWhitespaceCharacter] atIndex:0]; + } else if ([cmd isEqualToString:IRCCommandIndexUmode]) { + [s insertAttributedString:[NSAttributedString emptyStringWithBase:NSStringWhitespacePlaceholder] atIndex:0]; [s insertAttributedString:[NSAttributedString emptyStringWithBase:myNick] atIndex:0]; } else { if (selChannel && selChannel.isChannel && [s.string isModeChannelName] == NO) { @@ -2133,7 +2138,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString [ms appendString:modeCharStr]; } - [ms appendString:NSWhitespaceCharacter]; + [ms appendString:NSStringWhitespacePlaceholder]; [ms appendString:s.string]; [s setAttributedString:[NSAttributedString emptyStringWithBase:ms]]; @@ -2142,15 +2147,15 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSMutableString *line = [NSMutableString string]; - [line appendString:IRCCI_MODE]; + [line appendString:IRCCommandIndexMode]; if (NSObjectIsNotEmpty(targetChannelName)) { - [line appendString:NSWhitespaceCharacter]; + [line appendString:NSStringWhitespacePlaceholder]; [line appendString:targetChannelName]; } if (NSObjectIsNotEmpty(s)) { - [line appendString:NSWhitespaceCharacter]; + [line appendString:NSStringWhitespacePlaceholder]; [line appendString:s.string]; } @@ -2233,7 +2238,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSString *hostmask = [u banMask]; - AddressBook *g = [[AddressBook alloc] init]; + IRCAddressBook *g = [[IRCAddressBook alloc] init]; g.hostmask = hostmask; @@ -2248,10 +2253,10 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString [g processHostMaskRegex]; - if ([cmd isEqualToString:IRCCI_IGNORE]) { + if ([cmd isEqualToString:IRCCommandIndexIgnore]) { BOOL found = NO; - for (AddressBook *e in config.ignores) { + for (IRCAddressBook *e in config.ignores) { if ([g.hostmask isEqualToString:e.hostmask]) { found = YES; @@ -2268,7 +2273,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSMutableArray *ignores = config.ignores; for (NSInteger i = (ignores.count - 1); i >= 0; --i) { - AddressBook *e = [ignores safeObjectAtIndex:i]; + IRCAddressBook *e = [ignores safeObjectAtIndex:i]; if ([g.hostmask isEqualToString:e.hostmask]) { [ignores safeRemoveObjectAtIndex:i]; @@ -2314,7 +2319,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSInteger interval = [s.getToken.string integerValue]; if (interval > 0) { - TimerCommand *cmd = [[TimerCommand alloc] init]; + TLOTimerCommand *cmd = [[TLOTimerCommand alloc] init]; if ([s.string hasPrefix:@"/"]) { [s deleteCharactersInRange:NSMakeRange(0, 1)]; @@ -2326,7 +2331,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString [self addCommandToCommandQueue:cmd]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_ERROR_REPLY text:TXTLS(@"IRC_TIMER_REQUIRES_REALINT")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineErrorReplyType text:TXTLS(@"IRCTimerCommandRequiresInteger")]; } return YES; @@ -2339,16 +2344,16 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString for (IRCUser *m in c.members) { if (m.totalWeight > 0) { - NSString *text = TXTFLS(@"IRC_WEIGHTS_COMMAND_RESULT", m.nick, m.incomingWeight, m.outgoingWeight, m.totalWeight); + NSString *text = TXTFLS(@"IRCWeightsCommandResultRow", m.nick, m.incomingWeight, m.outgoingWeight, m.totalWeight); tc++; - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:text]; } } if (tc == 0) { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"IRC_WEIGHTS_COMMAND_NO_RESULT")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"IRCWeightsCommandNoResults")]; } } @@ -2361,13 +2366,13 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString if ([s.string isEqualNoCase:@"raw on"]) { rawModeEnabled = YES; - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"IRC_RAW_MODE_IS_ENABLED")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"IRCRawModeIsEnabled")]; } else if ([s.string isEqualNoCase:@"raw off"]) { rawModeEnabled = NO; - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"IRC_RAW_MODE_IS_DISABLED")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"IRCRawModeIsDisabled")]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:s.string]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:s.string]; } return YES; @@ -2375,7 +2380,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } case 71: // Command: CLEARALL { - if ([Preferences clearAllOnlyOnActiveServer]) { + if ([TPCPreferences clearAllOnlyOnActiveServer]) { [world clearContentsOfClient:self]; for (IRCChannel *c in channels) { @@ -2410,7 +2415,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString { [s insertAttributedString:[NSAttributedString emptyStringWithBase:@"MSG "] atIndex:0]; - if ([Preferences amsgAllConnections]) { + if ([TPCPreferences amsgAllConnections]) { for (IRCClient *u in [world clients]) { if ([u isConnected] == NO) continue; @@ -2439,7 +2444,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString { [s insertAttributedString:[NSAttributedString emptyStringWithBase:@"ME "] atIndex:0]; - if ([Preferences amsgAllConnections]) { + if ([TPCPreferences amsgAllConnections]) { for (IRCClient *u in [world clients]) { if ([u isConnected] == NO) continue; @@ -2478,11 +2483,11 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSString *host = ((user) ? [user banMask] : peer); if (NSObjectIsEmpty(reason)) { - reason = [Preferences defaultKickMessage]; + reason = [TPCPreferences defaultKickMessage]; } - [self send:IRCCI_MODE, c.name, @"+b", host, nil]; - [self send:IRCCI_KICK, c.name, user.nick, reason, nil]; + [self send:IRCCommandIndexMode, c.name, @"+b", host, nil]; + [self send:IRCCommandIndexKick, c.name, user.nick, reason, nil]; } } @@ -2491,11 +2496,11 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } case 81: // Command: ICBADGE { - if ([s.string contains:NSWhitespaceCharacter] == NO) return NO; + if ([s.string contains:NSStringWhitespacePlaceholder] == NO) return NO; NSArray *data = [s.string componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; - [DockIcon drawWithHilightCount:[data integerAtIndex:0] + [TVCDockIcon drawWithHilightCount:[data integerAtIndex:0] messageCount:[data integerAtIndex:1]]; return YES; @@ -2525,16 +2530,16 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } case 84: // Command: MYVERSION { - NSString *ref = [Preferences gitBuildReference]; - NSString *text = [NSString stringWithFormat:TXTLS(@"IRC_CTCP_VERSION_INFO"), - [[Preferences textualInfoPlist] objectForKey:@"CFBundleName"], - [[Preferences textualInfoPlist] objectForKey:@"CFBundleVersion"], + NSString *ref = [TPCPreferences gitBuildReference]; + NSString *text = [NSString stringWithFormat:TXTLS(@"IRCCTCPVersionInfo"), + [[TPCPreferences textualInfoPlist] objectForKey:@"CFBundleName"], + [[TPCPreferences textualInfoPlist] objectForKey:@"CFBundleVersion"], ((NSObjectIsEmpty(ref)) ? @"Unknown" : ref)]; if (c.isChannel == NO && c.isTalk == NO) { [self printDebugInformationToConsole:text]; } else { - text = TXTFLS(@"IRC_CTCP_VERSION_TITLE", text); + text = TXTFLS(@"IRCCTCPVersionTitle", text); [self sendPrivmsgToSelectedChannel:text]; } @@ -2545,9 +2550,9 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString case 74: // Command: MUTE { if (world.soundMuted) { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"SOUND_IS_ALREADY_MUTED")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"SoundIsAlreadyMuted")]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"SOUND_HAS_BEEN_MUTED")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"SoundIsNowMuted")]; [world setSoundMuted:YES]; } @@ -2558,11 +2563,11 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString case 75: // Command: UNMUTE { if (world.soundMuted) { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"SOUND_IS_NO_LONGER_MUTED")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"SoundIsNoLongerMuted")]; [world setSoundMuted:NO]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"SOUND_IS_NOT_MUTED")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"SoundIsNotMuted")]; } return YES; @@ -2587,12 +2592,12 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString { lastLagCheck = CFAbsoluteTimeGetCurrent(); - if ([cmd isEqualNoCase:IRCCI_MYLAG]) { + if ([cmd isEqualNoCase:IRCCommandIndexMylag]) { sendLagcheckToChannel = YES; } - [self sendCTCPQuery:myNick command:IRCCI_LAGCHECK text:[NSString stringWithDouble:lastLagCheck]]; - [self printDebugInformation:TXTLS(@"LAG_CHECK_REQUEST_SENT_MESSAGE")]; + [self sendCTCPQuery:myNick command:IRCCommandIndexLagcheck text:[NSString stringWithDouble:lastLagCheck]]; + [self printDebugInformation:TXTLS(@"LagCheckRequestSentMessage")]; return YES; break; @@ -2613,10 +2618,10 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString reason = [reason trim]; if (NSObjectIsEmpty(reason)) { - reason = [Preferences IRCopDefaultGlineMessage]; + reason = [TPCPreferences IRCopDefaultGlineMessage]; - if ([reason contains:NSWhitespaceCharacter]) { - NSInteger spacePos = [reason stringPosition:NSWhitespaceCharacter]; + if ([reason contains:NSStringWhitespacePlaceholder]) { + NSInteger spacePos = [reason stringPosition:NSStringWhitespacePlaceholder]; if (NSObjectIsEmpty(time)) { time = [reason safeSubstringToIndex:spacePos]; @@ -2642,16 +2647,16 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString [self send:cmd, peer, s.string, nil]; } else { if (peer) { - if ([cmd isEqualToString:IRCCI_TEMPSHUN]) { + if ([cmd isEqualToString:IRCCommandIndexTempshun]) { NSString *reason = s.getToken.string; reason = [reason trim]; if (NSObjectIsEmpty(reason)) { - reason = [Preferences IRCopDefaultShunMessage]; + reason = [TPCPreferences IRCopDefaultShunMessage]; - if ([reason contains:NSWhitespaceCharacter]) { - NSInteger spacePos = [reason stringPosition:NSWhitespaceCharacter]; + if ([reason contains:NSStringWhitespacePlaceholder]) { + NSInteger spacePos = [reason stringPosition:NSStringWhitespacePlaceholder]; reason = [reason safeSubstringAfterIndex:spacePos]; } @@ -2665,10 +2670,10 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString reason = [reason trim]; if (NSObjectIsEmpty(reason)) { - reason = [Preferences IRCopDefaultShunMessage]; + reason = [TPCPreferences IRCopDefaultShunMessage]; - if ([reason contains:NSWhitespaceCharacter]) { - NSInteger spacePos = [reason stringPosition:NSWhitespaceCharacter]; + if ([reason contains:NSStringWhitespacePlaceholder]) { + NSInteger spacePos = [reason stringPosition:NSStringWhitespacePlaceholder]; if (NSObjectIsEmpty(time)) { time = [reason safeSubstringToIndex:spacePos]; @@ -2690,9 +2695,9 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString case 103: // Command: CAPS { if ([acceptedCaps count]) { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTFLS(@"IRC_CAP_CURRENTLY_ENABLED", [acceptedCaps componentsJoinedByString:@", "])]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTFLS(@"IRCCapCurrentlyEnbaled", [acceptedCaps componentsJoinedByString:@", "])]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:TXTLS(@"IRC_CAP_CURRENTLY_ENABLED_NONE")]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:TXTLS(@"IRCCapCurrentlyEnabledNone")]; } return YES; @@ -2739,12 +2744,12 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString NSArray *scriptPaths = [NSArray arrayWithObjects: -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER - [Preferences whereScriptsUnsupervisedPath], +#ifdef TXUserScriptsFolderAvailable + [TPCPreferences whereScriptsUnsupervisedPath], #endif - [Preferences whereScriptsLocalPath], - [Preferences whereScriptsPath], nil]; + [TPCPreferences whereScriptsLocalPath], + [TPCPreferences whereScriptsPath], nil]; @@ -2768,7 +2773,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString BOOL pluginFound = BOOLValueFromObject([world.bundlesForUserInput objectForKey:cmd]); if (pluginFound && scriptFound) { - NSLog(TXTLS(@"PLUGIN_COMMAND_CLASH_ERROR_MESSAGE") ,cmd); + NSLog(TXTLS(@"PluginCommandClashErrorMessage") ,cmd); } else { if (pluginFound) { [[self invokeInBackgroundThread] processBundlesUserMessage:[NSArray arrayWithObjects:[NSString stringWithString:s.string], cmd, nil]]; @@ -2791,7 +2796,7 @@ - (BOOL)sendCommand:(id)str completeTarget:(BOOL)completeTarget target:(NSString } if ([s length]) { - [s insertAttributedString:[NSAttributedString emptyStringWithBase:NSWhitespaceCharacter] atIndex:0]; + [s insertAttributedString:[NSAttributedString emptyStringWithBase:NSStringWhitespacePlaceholder] atIndex:0]; } [s insertAttributedString:[NSAttributedString emptyStringWithBase:cmd] atIndex:0]; @@ -2839,9 +2844,9 @@ - (void)send:(NSString *)str, ... for (NSInteger i = 0; i < count; i++) { NSString *e = [ary safeObjectAtIndex:i]; - [s appendString:NSWhitespaceCharacter]; + [s appendString:NSStringWhitespacePlaceholder]; - if (i == (count - 1) && (NSObjectIsEmpty(e) || [e hasPrefix:@":"] || [e contains:NSWhitespaceCharacter])) { + if (i == (count - 1) && (NSObjectIsEmpty(e) || [e hasPrefix:@":"] || [e contains:NSStringWhitespacePlaceholder])) { [s appendString:@":"]; } @@ -2916,7 +2921,7 @@ - (void)processCommandsInCommandQueue CFAbsoluteTime now = CFAbsoluteTimeGetCurrent(); while (commandQueue.count) { - TimerCommand *m = [commandQueue safeObjectAtIndex:0]; + TLOTimerCommand *m = [commandQueue safeObjectAtIndex:0]; if (m.time <= now) { NSString *target = nil; @@ -2936,7 +2941,7 @@ - (void)processCommandsInCommandQueue } if (commandQueue.count) { - TimerCommand *m = [commandQueue safeObjectAtIndex:0]; + TLOTimerCommand *m = [commandQueue safeObjectAtIndex:0]; CFAbsoluteTime delta = (m.time - CFAbsoluteTimeGetCurrent()); @@ -2946,13 +2951,13 @@ - (void)processCommandsInCommandQueue } } -- (void)addCommandToCommandQueue:(TimerCommand *)m +- (void)addCommandToCommandQueue:(TLOTimerCommand *)m { BOOL added = NO; NSInteger i = 0; - for (TimerCommand *c in commandQueue) { + for (TLOTimerCommand *c in commandQueue) { if (m.time < c.time) { added = YES; @@ -3000,7 +3005,7 @@ - (void)updateChannelTitle:(IRCChannel *)c #pragma mark - #pragma mark Growl -- (BOOL)notifyText:(NotificationType)type lineType:(LogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text +- (BOOL)notifyText:(TXNotificationType)type lineType:(TVCLogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text { if ([myNick isEqual:nick]) { return NO; @@ -3019,7 +3024,7 @@ - (BOOL)notifyText:(NotificationType)type lineType:(LogLineType)ltype target:(id channel = (IRCChannel *)target; chname = channel.name; - if (type == NOTIFICATION_HIGHLIGHT) { + if (type == TXNotificationHighlightType) { if (channel.config.ihighlights) { return YES; } @@ -3035,18 +3040,18 @@ - (BOOL)notifyText:(NotificationType)type lineType:(LogLineType)ltype target:(id chname = self.name; } - [SoundPlayer play:[Preferences soundForEvent:type] isMuted:world.soundMuted]; + [TLOSoundPlayer play:[TPCPreferences soundForEvent:type] isMuted:world.soundMuted]; - if ([Preferences growlEnabledForEvent:type] == NO) return YES; - if ([Preferences stopGrowlOnActive] && [world.window isOnCurrentWorkspace]) return YES; - if ([Preferences disableWhileAwayForEvent:type] == YES && isAway == YES) return YES; + if ([TPCPreferences growlEnabledForEvent:type] == NO) return YES; + if ([TPCPreferences stopGrowlOnActive] && [world.window isOnCurrentWorkspace]) return YES; + if ([TPCPreferences disableWhileAwayForEvent:type] == YES && isAway == YES) return YES; NSDictionary *info = nil; NSString *title = chname; NSString *desc; - if (ltype == LINE_TYPE_ACTION || ltype == LINE_TYPE_ACTION_NH) { + if (ltype == TVCLogLineActionType || ltype == TVCLogLineActionNoHighlightType) { desc = [NSString stringWithFormat:@"• %@: %@", nick, text]; } else { desc = [NSString stringWithFormat:@"<%@> %@", nick, text]; @@ -3063,22 +3068,22 @@ - (BOOL)notifyText:(NotificationType)type lineType:(LogLineType)ltype target:(id return YES; } -- (BOOL)notifyEvent:(NotificationType)type lineType:(LogLineType)ltype +- (BOOL)notifyEvent:(TXNotificationType)type lineType:(TVCLogLineType)ltype { - return [self notifyEvent:type lineType:ltype target:nil nick:NSNullObject text:NSNullObject]; + return [self notifyEvent:type lineType:ltype target:nil nick:NSStringEmptyPlaceholder text:NSStringEmptyPlaceholder]; } -- (BOOL)notifyEvent:(NotificationType)type lineType:(LogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text +- (BOOL)notifyEvent:(TXNotificationType)type lineType:(TVCLogLineType)ltype target:(id)target nick:(NSString *)nick text:(NSString *)text { if ([self outputRuleMatchedInMessage:text inChannel:target withLineType:ltype] == YES) { return NO; } - [SoundPlayer play:[Preferences soundForEvent:type] isMuted:world.soundMuted]; + [TLOSoundPlayer play:[TPCPreferences soundForEvent:type] isMuted:world.soundMuted]; - if ([Preferences growlEnabledForEvent:type] == NO) return YES; - if ([Preferences stopGrowlOnActive] && [world.window isOnCurrentWorkspace]) return YES; - if ([Preferences disableWhileAwayForEvent:type] == YES && isAway == YES) return YES; + if ([TPCPreferences growlEnabledForEvent:type] == NO) return YES; + if ([TPCPreferences stopGrowlOnActive] && [world.window isOnCurrentWorkspace]) return YES; + if ([TPCPreferences disableWhileAwayForEvent:type] == YES && isAway == YES) return YES; IRCChannel *channel = nil; @@ -3092,33 +3097,33 @@ - (BOOL)notifyEvent:(NotificationType)type lineType:(LogLineType)ltype target:(i } } - NSString *title = NSNullObject; - NSString *desc = NSNullObject; + NSString *title = NSStringEmptyPlaceholder; + NSString *desc = NSStringEmptyPlaceholder; switch (type) { - case NOTIFICATION_LOGIN: + case TXNotificationConnectType: { title = self.name; break; } - case NOTIFICATION_DISCONNECT: + case TXNotificationDisconnectType: { title = self.name; break; } - case NOTIFICATION_KICKED: + case TXNotificationKickType: { title = channel.name; - desc = TXTFLS(@"NOTIFICATION_MSG_KICKED_DESC", nick, text); + desc = TXTFLS(@"NotificationKickedMessage_DESC", nick, text); break; } - case NOTIFICATION_INVITED: + case TXNotificationInviteType: { title = self.name; - desc = TXTFLS(@"NOTIFICATION_MSG_INVITED_DESC", nick, text); + desc = TXTFLS(@"NotificationInvitedMessage_DESC", nick, text); break; } - case NOTIFICATION_ADDRESS_BOOK_MATCH: + case TXNotificationAddressBookMatchType: { desc = text; break; @@ -3193,7 +3198,7 @@ - (void)setUnreadState:(id)t BOOL isActiveWindow = [world.window isOnCurrentWorkspace]; if ([t isKindOfClass:[IRCChannel class]]) { - if ([Preferences countPublicMessagesInIconBadge] == NO) { + if ([TPCPreferences countPublicMessagesInIconBadge] == NO) { if ([t isTalk] == YES && [t isClient] == NO) { if (NSDissimilarObjects(world.selected, t) || [[NSApp mainWindow] isOnCurrentWorkspace] == NO) { [t setDockUnreadCount:([t dockUnreadCount] + 1)]; @@ -3226,29 +3231,29 @@ - (void)setUnreadState:(id)t #pragma mark - #pragma mark Print -- (BOOL)printBoth:(id)chan type:(LogLineType)type text:(NSString *)text +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type text:(NSString *)text { return [self printBoth:chan type:type nick:nil text:text identified:NO]; } -- (BOOL)printBoth:(id)chan type:(LogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt { return [self printBoth:chan type:type nick:nil text:text identified:NO receivedAt:receivedAt]; } -- (BOOL)printBoth:(id)chan type:(LogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified { return [self printBoth:chan type:type nick:nick text:text identified:identified receivedAt:[NSDate date]]; } -- (BOOL)printBoth:(id)chan type:(LogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate*)receivedAt +- (BOOL)printBoth:(id)chan type:(TVCLogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate*)receivedAt { return [self printChannel:chan type:type nick:nick text:text identified:identified receivedAt:receivedAt]; } - (NSString *)formatNick:(NSString *)nick channel:(IRCChannel *)channel { - NSString *format = ((world.viewTheme.other.nicknameFormat) ? world.viewTheme.other.nicknameFormat : [Preferences themeNickFormat]); + NSString *format = ((world.viewTheme.other.nicknameFormat) ? world.viewTheme.other.nicknameFormat : [TPCPreferences themeNickFormat]); if (NSObjectIsEmpty(format)) { format = @"<%@%n>"; @@ -3265,41 +3270,41 @@ - (NSString *)formatNick:(NSString *)nick channel:(IRCChannel *)channel if (m) { NSString *mark = [NSString stringWithChar:m.mark]; - if ([mark isEqualToString:NSWhitespaceCharacter] || NSObjectIsEmpty(mark)) { - format = [format stringByReplacingOccurrencesOfString:@"%@" withString:NSNullObject]; + if ([mark isEqualToString:NSStringWhitespacePlaceholder] || NSObjectIsEmpty(mark)) { + format = [format stringByReplacingOccurrencesOfString:@"%@" withString:NSStringEmptyPlaceholder]; } else { format = [format stringByReplacingOccurrencesOfString:@"%@" withString:mark]; } } else { - format = [format stringByReplacingOccurrencesOfString:@"%@" withString:NSNullObject]; + format = [format stringByReplacingOccurrencesOfString:@"%@" withString:NSStringEmptyPlaceholder]; } } else { - format = [format stringByReplacingOccurrencesOfString:@"%@" withString:NSNullObject]; + format = [format stringByReplacingOccurrencesOfString:@"%@" withString:NSStringEmptyPlaceholder]; } } return format; } -- (BOOL)printChannel:(id)chan type:(LogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified +- (BOOL)printChannel:(id)chan type:(TVCLogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified { return [self printChannel:chan type:type nick:nil text:text identified:identified receivedAt:[NSDate date]]; } -- (BOOL)printChannel:(id)chan type:(LogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt +- (BOOL)printChannel:(id)chan type:(TVCLogLineType)type text:(NSString *)text receivedAt:(NSDate*)receivedAt { return [self printChannel:chan type:type nick:nil text:text identified:NO receivedAt:receivedAt]; } -- (BOOL)printAndLog:(LogLine *)line withHTML:(BOOL)rawHTML +- (BOOL)printAndLog:(TVCLogLine *)line withHTML:(BOOL)rawHTML { BOOL result = [log print:line withHTML:rawHTML]; if (isConnected == NO) return NO; - if ([Preferences logTranscript]) { + if ([TPCPreferences logTranscript]) { if (PointerIsEmpty(logFile)) { - logFile = [FileLogger new]; + logFile = [TLOFileLogger new]; logFile.client = self; } @@ -3315,7 +3320,7 @@ - (BOOL)printAndLog:(LogLine *)line withHTML:(BOOL)rawHTML logDate = comp; } - NSString *nickStr = NSNullObject; + NSString *nickStr = NSStringEmptyPlaceholder; if (line.nick) { nickStr = [NSString stringWithFormat:@"%@: ", line.nickInfo]; @@ -3341,19 +3346,19 @@ - (BOOL)printRawHTMLToCurrentChannelWithoutTime:(NSString *)text receivedAt:(NSD - (BOOL)printRawHTMLToCurrentChannel:(NSString *)text withTimestamp:(BOOL)showTime receivedAt:(NSDate*)receivedAt { - LogLine *c = [[LogLine alloc] init]; + TVCLogLine *c = [[TVCLogLine alloc] init]; IRCChannel *channel = [world selectedChannelOn:self]; c.body = text; - c.lineType = LINE_TYPE_REPLY; - c.memberType = MEMBER_TYPE_NORMAL; + c.lineType = TVCLogLineReplyType; + c.memberType = TVCLogMemberNormalType; if (showTime) { - NSString *time = TXFormattedTimestampWithOverride(receivedAt, [Preferences themeTimestampFormat], world.viewTheme.other.timestampFormat); + NSString *time = TXFormattedTimestampWithOverride(receivedAt, [TPCPreferences themeTimestampFormat], world.viewTheme.other.timestampFormat); if (NSObjectIsNotEmpty(time)) { - time = [time stringByAppendingString:NSWhitespaceCharacter]; + time = [time stringByAppendingString:NSStringWhitespacePlaceholder]; } c.time = time; @@ -3366,28 +3371,28 @@ - (BOOL)printRawHTMLToCurrentChannel:(NSString *)text withTimestamp:(BOOL)showTi } } -- (BOOL)printChannel:(id)chan type:(LogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate*)receivedAt +- (BOOL)printChannel:(id)chan type:(TVCLogLineType)type nick:(NSString *)nick text:(NSString *)text identified:(BOOL)identified receivedAt:(NSDate*)receivedAt { if ([self outputRuleMatchedInMessage:text inChannel:chan withLineType:type] == YES) { return NO; } - NSString *time = TXFormattedTimestampWithOverride(receivedAt, [Preferences themeTimestampFormat], world.viewTheme.other.timestampFormat); + NSString *time = TXFormattedTimestampWithOverride(receivedAt, [TPCPreferences themeTimestampFormat], world.viewTheme.other.timestampFormat); NSString *nickStr = nil; IRCChannel *channel = nil; - LogMemberType memberType = MEMBER_TYPE_NORMAL; + TVCLogMemberType memberType = TVCLogMemberNormalType; NSInteger colorNumber = 0; NSArray *keywords = nil; NSArray *excludeWords = nil; - LogLine *c = [[LogLine alloc] init]; + TVCLogLine *c = [[TVCLogLine alloc] init]; if (nick && [nick isEqualToString:myNick]) { - memberType = MEMBER_TYPE_MYSELF; + memberType = TVCLogMemberLocalUserType; } if ([chan isKindOfClass:[IRCChannel class]]) { @@ -3398,14 +3403,14 @@ - (BOOL)printChannel:(id)chan type:(LogLineType)type nick:(NSString *)nick text: } } - if (type == LINE_TYPE_PRIVMSG || type == LINE_TYPE_ACTION) { - if (NSDissimilarObjects(memberType, MEMBER_TYPE_MYSELF)) { + if (type == TVCLogLinePrivateMessageType || type == TVCLogLineActionType) { + if (NSDissimilarObjects(memberType, TVCLogMemberLocalUserType)) { if (channel && [[channel config] ihighlights] == NO) { - keywords = [Preferences keywords]; - excludeWords = [Preferences excludeWords]; + keywords = [TPCPreferences keywords]; + excludeWords = [TPCPreferences excludeWords]; - if (NSDissimilarObjects([Preferences keywordMatchingMethod], KEYWORD_MATCH_REGEX)) { - if ([Preferences keywordCurrentNick]) { + if (NSDissimilarObjects([TPCPreferences keywordMatchingMethod], TXNicknameHighlightRegularExpressionMatchType)) { + if ([TPCPreferences keywordCurrentNick]) { NSMutableArray *ary = [keywords mutableCopy]; [ary safeInsertObject:myNick atIndex:0]; @@ -3417,27 +3422,27 @@ - (BOOL)printChannel:(id)chan type:(LogLineType)type nick:(NSString *)nick text: } } - if (type == LINE_TYPE_ACTION_NH) { - type = LINE_TYPE_ACTION; - } else if (type == LINE_TYPE_PRIVMSG_NH) { - type = LINE_TYPE_PRIVMSG; + if (type == TVCLogLineActionNoHighlightType) { + type = TVCLogLineActionType; + } else if (type == TVCLogLinePrivateMessageNoHighlightType) { + type = TVCLogLinePrivateMessageType; } if (NSObjectIsNotEmpty(time)) { - time = [time stringByAppendingString:NSWhitespaceCharacter]; + time = [time stringByAppendingString:NSStringWhitespacePlaceholder]; } if (NSObjectIsNotEmpty(nick)) { - if (type == LINE_TYPE_ACTION) { + if (type == TVCLogLineActionType) { nickStr = [NSString stringWithFormat:@"%@ ", nick]; - } else if (type == LINE_TYPE_NOTICE) { + } else if (type == TVCLogLineNoticeType) { nickStr = [NSString stringWithFormat:@"-%@-", nick]; } else { nickStr = [self formatNick:nick channel:channel]; } } - if (nick && channel && (type == LINE_TYPE_PRIVMSG || type == LINE_TYPE_ACTION)) { + if (nick && channel && (type == TVCLogLinePrivateMessageType || type == TVCLogLineActionType)) { IRCUser *user = [channel findMember:nick]; if (user) { @@ -3459,10 +3464,10 @@ - (BOOL)printChannel:(id)chan type:(LogLineType)type nick:(NSString *)nick text: c.excludeWords = excludeWords; if (channel) { - if ([Preferences autoAddScrollbackMark]) { + if ([TPCPreferences autoAddScrollbackMark]) { if (NSDissimilarObjects(channel, [world selectedChannel]) || [[NSApp mainWindow] isOnCurrentWorkspace] == NO) { if (channel.isUnread == NO) { - if (type == LINE_TYPE_PRIVMSG || type == LINE_TYPE_ACTION || type == LINE_TYPE_NOTICE) { + if (type == TVCLogLinePrivateMessageType || type == TVCLogLineActionType || type == TVCLogLineNoticeType) { [channel.log unmark]; [channel.log mark]; } @@ -3472,7 +3477,7 @@ - (BOOL)printChannel:(id)chan type:(LogLineType)type nick:(NSString *)nick text: return [channel print:c]; } else { - if ([Preferences logTranscript]) { + if ([TPCPreferences logTranscript]) { return [self printAndLog:c withHTML:NO]; } else { return [log print:c]; @@ -3482,12 +3487,12 @@ - (BOOL)printChannel:(id)chan type:(LogLineType)type nick:(NSString *)nick text: - (void)printSystem:(id)channel text:(NSString *)text { - [self printChannel:channel type:LINE_TYPE_SYSTEM text:text receivedAt:[NSDate date]]; + [self printChannel:channel type:TVCLogLineSystemType text:text receivedAt:[NSDate date]]; } - (void)printSystem:(id)channel text:(NSString *)text receivedAt:(NSDate*)receivedAt { - [self printChannel:channel type:LINE_TYPE_SYSTEM text:text receivedAt:receivedAt]; + [self printChannel:channel type:TVCLogLineSystemType text:text receivedAt:receivedAt]; } - (void)printSystemBoth:(id)channel text:(NSString *)text @@ -3497,17 +3502,17 @@ - (void)printSystemBoth:(id)channel text:(NSString *)text - (void)printSystemBoth:(id)channel text:(NSString *)text receivedAt:(NSDate*)receivedAt { - [self printBoth:channel type:LINE_TYPE_SYSTEM text:text receivedAt:receivedAt]; + [self printBoth:channel type:TVCLogLineSystemType text:text receivedAt:receivedAt]; } - (void)printReply:(IRCMessage *)m { - [self printBoth:nil type:LINE_TYPE_REPLY text:[m sequence:1] receivedAt:m.receivedAt]; + [self printBoth:nil type:TVCLogLineReplyType text:[m sequence:1] receivedAt:m.receivedAt]; } - (void)printUnknownReply:(IRCMessage *)m { - [self printBoth:nil type:LINE_TYPE_REPLY text:[m sequence:1] receivedAt:m.receivedAt]; + [self printBoth:nil type:TVCLogLineReplyType text:[m sequence:1] receivedAt:m.receivedAt]; } - (void)printDebugInformation:(NSString *)m @@ -3522,7 +3527,7 @@ - (void)printDebugInformationToConsole:(NSString *)m - (void)printDebugInformation:(NSString *)m channel:(IRCChannel *)channel { - [self printBoth:channel type:LINE_TYPE_DEBUG text:m]; + [self printBoth:channel type:TVCLogLineDebugType text:m]; } - (void)printErrorReply:(IRCMessage *)m @@ -3532,14 +3537,14 @@ - (void)printErrorReply:(IRCMessage *)m - (void)printErrorReply:(IRCMessage *)m channel:(IRCChannel *)channel { - NSString *text = TXTFLS(@"IRC_HAD_RAW_ERROR", m.numericReply, [m sequence]); + NSString *text = TXTFLS(@"IRCHadRawError", m.numericReply, [m sequence]); - [self printBoth:channel type:LINE_TYPE_ERROR_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:channel type:TVCLogLineErrorReplyType text:text receivedAt:m.receivedAt]; } - (void)printError:(NSString *)error { - [self printBoth:nil type:LINE_TYPE_ERROR text:error]; + [self printBoth:nil type:TVCLogLineErrorType text:error]; } #pragma mark - @@ -3584,10 +3589,10 @@ - (void)receivePrivmsgAndNotice:(IRCMessage *)m BOOL identified = NO; - if (identifyCTCP && ([text hasPrefix:@"+\x01"] || [text hasPrefix:@"-\x01"])) { + if (self.identifyCTCP && ([text hasPrefix:@"+\x01"] || [text hasPrefix:@"-\x01"])) { identified = [text hasPrefix:@"+"]; text = [text safeSubstringFromIndex:1]; - } else if (identifyMsg && ([text hasPrefix:@"+"] || [text hasPrefix:@"-"])) { + } else if (self.identifyMsg && ([text hasPrefix:@"+"] || [text hasPrefix:@"-"])) { identified = [text hasPrefix:@"+"]; text = [text safeSubstringFromIndex:1]; } @@ -3601,11 +3606,11 @@ - (void)receivePrivmsgAndNotice:(IRCMessage *)m text = [text safeSubstringToIndex:n]; } - if ([m.command isEqualToString:IRCCI_PRIVMSG]) { + if ([m.command isEqualToString:IRCCommandIndexPrivmsg]) { if ([[text uppercaseString] hasPrefix:@"ACTION "]) { text = [text safeSubstringFromIndex:7]; - [self receiveText:m command:IRCCI_ACTION text:text identified:identified]; + [self receiveText:m command:IRCCommandIndexAction text:text identified:identified]; } else { [self receiveCTCPQuery:m text:text]; } @@ -3622,20 +3627,21 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex NSString *anick = m.sender.nick; NSString *target = [m paramAt:0]; - LogLineType type = LINE_TYPE_PRIVMSG; + TVCLogLineType type = TVCLogLinePrivateMessageType; - if ([cmd isEqualToString:IRCCI_NOTICE]) { - type = LINE_TYPE_NOTICE; - } else if ([cmd isEqualToString:IRCCI_ACTION]) { - type = LINE_TYPE_ACTION; + if ([cmd isEqualToString:IRCCommandIndexNotice]) { + type = TVCLogLineNoticeType; + } else if ([cmd isEqualToString:IRCCommandIndexAction]) { + type = TVCLogLineActionType; } if ([target hasPrefix:@"@"]) { target = [target safeSubstringFromIndex:1]; } - AddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw - withMatches:[NSArray arrayWithObjects:@"ignoreHighlights", + IRCAddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw + withMatches:[NSArray arrayWithObjects: + @"ignoreHighlights", @"ignorePMHighlights", @"ignoreNotices", @"ignorePublicMsg", @@ -3644,14 +3650,14 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex if ([target isChannelName]) { if ([ignoreChecks ignoreHighlights] == YES) { - if (type == LINE_TYPE_ACTION) { - type = LINE_TYPE_ACTION_NH; - } else if (type == LINE_TYPE_PRIVMSG) { - type = LINE_TYPE_PRIVMSG_NH; + if (type == TVCLogLineActionType) { + type = TVCLogLineActionNoHighlightType; + } else if (type == TVCLogLinePrivateMessageType) { + type = TVCLogLinePrivateMessageNoHighlightType; } } - if (type == LINE_TYPE_NOTICE) { + if (type == TVCLogLineNoticeType) { if ([ignoreChecks ignoreNotices] == YES) { return; } @@ -3666,21 +3672,22 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex [self decryptIncomingMessage:&text channel:c]; - if (type == LINE_TYPE_NOTICE) { + if (type == TVCLogLineNoticeType) { [self printBoth:c type:type nick:anick text:text identified:identified receivedAt:m.receivedAt]; - [self notifyText:NOTIFICATION_CHANNEL_NOTICE lineType:type target:c nick:anick text:text]; + + [self notifyText:TXNotificationChannelNoticeType lineType:type target:c nick:anick text:text]; } else { BOOL highlight = [self printBoth:c type:type nick:anick text:text identified:identified receivedAt:m.receivedAt]; BOOL postevent = NO; if (highlight) { - postevent = [self notifyText:NOTIFICATION_HIGHLIGHT lineType:type target:c nick:anick text:text]; + postevent = [self notifyText:TXNotificationHighlightType lineType:type target:c nick:anick text:text]; if (postevent) { [self setKeywordState:c]; } } else { - postevent = [self notifyText:NOTIFICATION_CHANNEL_MSG lineType:type target:c nick:anick text:text]; + postevent = [self notifyText:TXNotificationChannelMessageType lineType:type target:c nick:anick text:text]; } if (postevent && (highlight || c.config.growl)) { @@ -3691,7 +3698,7 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex IRCUser *sender = [c findMember:anick]; if (sender) { - NSString *trimmedMyNick = [myNick stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"_"]]; + NSString *trimmedMyNick = [self.myNick stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"_"]]; if ([text stringPositionIgnoringCase:trimmedMyNick] >= 0) { [sender outgoingConversation]; @@ -3702,13 +3709,13 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex } } } else { - BOOL targetOurself = [target isEqualNoCase:myNick]; + BOOL targetOurself = [target isEqualNoCase:self.myNick]; if ([ignoreChecks ignorePMHighlights] == YES) { - if (type == LINE_TYPE_ACTION) { - type = LINE_TYPE_ACTION_NH; - } else if (type == LINE_TYPE_PRIVMSG) { - type = LINE_TYPE_PRIVMSG_NH; + if (type == TVCLogLineActionType) { + type = TVCLogLineActionNoHighlightType; + } else if (type == TVCLogLinePrivateMessageType) { + type = TVCLogLinePrivateMessageNoHighlightType; } } @@ -3719,8 +3726,8 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex if (NSObjectIsEmpty(anick)) { [self printBoth:nil type:type text:text receivedAt:m.receivedAt]; } else if ([anick isNickname] == NO) { - if (type == LINE_TYPE_NOTICE) { - if (hasIRCopAccess) { + if (type == TVCLogLineNoticeType) { + if (self.hasIRCopAccess) { if ([text hasPrefix:@"*** Notice -- Client connecting"] || [text hasPrefix:@"*** Notice -- Client exiting"] || [text hasPrefix:@"*** You are connected to"] || @@ -3759,21 +3766,23 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex [self handleUserTrackingNotification:ignoreChecks nickname:snick hostmask:host - langitem:@"USER_TRACKING_HOSTMASK_CONNECTED"]; + langitem:@"UserTrackingHostmaskConnected"]; } } else { - if ([Preferences handleServerNotices]) { - if ([Preferences handleIRCopAlerts] && [text containsIgnoringCase:[Preferences IRCopAlertMatch]]) { - IRCChannel *c = [world selectedChannelOn:self]; + if ([TPCPreferences handleServerNotices]) { + if ([TPCPreferences handleIRCopAlerts] && [text containsIgnoringCase:[TPCPreferences IRCopAlertMatch]]) { + IRCChannel *c = [self.world selectedChannelOn:self]; [self setUnreadState:c]; - [self printBoth:c type:LINE_TYPE_NOTICE text:text receivedAt:m.receivedAt]; + + [self printBoth:c type:TVCLogLineNoticeType text:text receivedAt:m.receivedAt]; } else { - IRCChannel *c = [self findChannelOrCreate:TXTLS(@"SERVER_NOTICES_WINDOW_TITLE") useTalk:YES]; + IRCChannel *c = [self findChannelOrCreate:TXTLS(@"ServerNoticeTreeItemTitle") useTalk:YES]; c.isUnread = YES; [self setUnreadState:c]; + [self printBoth:c type:type text:text receivedAt:m.receivedAt]; } } else { @@ -3799,84 +3808,85 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex BOOL newTalk = NO; - if (PointerIsEmpty(c) && NSDissimilarObjects(type, LINE_TYPE_NOTICE)) { + if (PointerIsEmpty(c) && NSDissimilarObjects(type, TVCLogLineNoticeType)) { if (targetOurself) { - c = [world createTalk:anick client:self]; + c = [self.world createTalk:anick client:self]; } else { - c = [world createTalk:target client:self]; + c = [self.world createTalk:target client:self]; } newTalk = YES; } - if (type == LINE_TYPE_NOTICE) { + if (type == TVCLogLineNoticeType) { if ([ignoreChecks ignoreNotices] == YES) { return; } - if ([Preferences locationToSendNotices] == NOTICES_SENDTO_CURCHAN) { - c = [world selectedChannelOn:self]; + if ([TPCPreferences locationToSendNotices] == TXNoticeSendCurrentChannelType) { + c = [self.world selectedChannelOn:self]; } [self printBoth:c type:type nick:anick text:text identified:identified receivedAt:m.receivedAt]; if ([anick isEqualNoCase:@"NickServ"]) { if ([text hasPrefix:@"This nickname is registered"]) { - if (NSObjectIsNotEmpty(config.nickPassword) && isIdentifiedWithSASL == NO) { - serverHasNickServ = YES; + if (NSObjectIsNotEmpty(self.config.nickPassword) && self.isIdentifiedWithSASL == NO) { + self.serverHasNickServ = YES; - [self send:IRCCI_PRIVMSG, @"NickServ", [NSString stringWithFormat:@"IDENTIFY %@", config.nickPassword], nil]; + [self send:IRCCommandIndexPrivmsg, @"NickServ", [NSString stringWithFormat:@"IDENTIFY %@", self.config.nickPassword], nil]; } } else if ([text hasPrefix:@"This nick is owned by someone else"]) { - if ([config.server hasSuffix:@"dal.net"]) { - if (NSObjectIsNotEmpty(config.nickPassword)) { - serverHasNickServ = YES; + if ([self.config.server hasSuffix:@"dal.net"]) { + if (NSObjectIsNotEmpty(self.config.nickPassword)) { + self.serverHasNickServ = YES; - [self send:IRCCI_PRIVMSG, @"NickServ@services.dal.net", [NSString stringWithFormat:@"IDENTIFY %@", config.nickPassword], nil]; + [self send:IRCCommandIndexPrivmsg, @"NickServ@services.dal.net", [NSString stringWithFormat:@"IDENTIFY %@", self.config.nickPassword], nil]; } } } else { - if ([Preferences autojoinWaitForNickServ]) { + if ([TPCPreferences autojoinWaitForNickServ]) { if ([text hasPrefix:@"You are now identified"] || [text hasPrefix:@"You are already identified"] || [text hasSuffix:@"you are now recognized."] || [text hasPrefix:@"Password accepted for"]) { - if (autojoinInitialized == NO && serverHasNickServ) { - autojoinInitialized = YES; + if (self.autojoinInitialized == NO && self.serverHasNickServ) { + self.autojoinInitialized = YES; [self performAutoJoin]; } } } else { - autojoinInitialized = YES; + self.autojoinInitialized = YES; } } } if (targetOurself) { [self setUnreadState:c]; - [self notifyText:NOTIFICATION_TALK_NOTICE lineType:type target:c nick:anick text:text]; + + [self notifyText:TXNotificationQueryNoticeType lineType:type target:c nick:anick text:text]; } } else { BOOL highlight = [self printBoth:c type:type nick:anick text:text identified:identified receivedAt:m.receivedAt]; BOOL postevent = NO; if (highlight) { - postevent = [self notifyText:NOTIFICATION_HIGHLIGHT lineType:type target:c nick:anick text:text]; + postevent = [self notifyText:TXNotificationHighlightType lineType:type target:c nick:anick text:text]; if (postevent) { [self setKeywordState:c]; } } else if (targetOurself) { if (newTalk) { - postevent = [self notifyText:NOTIFICATION_NEW_TALK lineType:type target:c nick:anick text:text]; + postevent = [self notifyText:TXNotificationNewQueryType lineType:type target:c nick:anick text:text]; if (postevent) { [self setNewTalkState:c]; } } else { - postevent = [self notifyText:NOTIFICATION_TALK_MSG lineType:type target:c nick:anick text:text]; + postevent = [self notifyText:TXNotificationQueryMessageType lineType:type target:c nick:anick text:text]; } } @@ -3887,8 +3897,8 @@ - (void)receiveText:(IRCMessage *)m command:(NSString *)cmd text:(NSString *)tex NSString *hostTopic = m.sender.raw; if ([hostTopic isEqualNoCase:c.topic] == NO) { - [c setTopic:hostTopic]; - [c.log setTopic:hostTopic]; + [c setTopic:hostTopic]; + [c.log setTopic:hostTopic]; } } } @@ -3899,77 +3909,78 @@ - (void)receiveCTCPQuery:(IRCMessage *)m text:(NSString *)text { NSString *nick = m.sender.nick; - NSMutableString *s = [text mutableCopy]; - NSString *command = [[s getToken] uppercaseString]; + NSMutableString *s = text.mutableCopy; + + NSString *command = s.getToken.uppercaseString; - if ([Preferences replyToCTCPRequests] == NO) { - [self printDebugInformationToConsole:TXTFLS(@"IRC_HAS_IGNORED_CTCP", command, nick)]; + if ([TPCPreferences replyToCTCPRequests] == NO) { + [self printDebugInformationToConsole:TXTFLS(@"IRCCTCPRequestIgnored", command, nick)]; return; } - AddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw + IRCAddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw withMatches:[NSArray arrayWithObjects:@"ignoreCTCP", nil]]; if ([ignoreChecks ignoreCTCP] == YES) { return; } - if ([command isEqualToString:IRCCI_DCC]) { - [self printDebugInformationToConsole:TXTLS(@"DCC_REQUEST_ERROR_MESSAGE")]; + if ([command isEqualToString:IRCCommandIndexDcc]) { + [self printDebugInformationToConsole:TXTLS(@"DCCRequestErrorMessage")]; } else { IRCChannel *target = nil; - if ([Preferences locationToSendNotices] == NOTICES_SENDTO_CURCHAN) { - target = [world selectedChannelOn:self]; + if ([TPCPreferences locationToSendNotices] == TXNoticeSendCurrentChannelType) { + target = [self.world selectedChannelOn:self]; } - NSString *text = TXTFLS(@"IRC_RECIEVED_CTCP_REQUEST", command, nick); + NSString *text = TXTFLS(@"IRCRecievedCTCPRequest", command, nick); - if ([command isEqualToString:IRCCI_LAGCHECK] == NO) { - [self printBoth:target type:LINE_TYPE_CTCP text:text receivedAt:m.receivedAt]; + if ([command isEqualToString:IRCCommandIndexLagcheck] == NO) { + [self printBoth:target type:TVCLogLineCTCPType text:text receivedAt:m.receivedAt]; } - if ([command isEqualToString:IRCCI_PING]) { + if ([command isEqualToString:IRCCommandIndexPing]) { [self sendCTCPReply:nick command:command text:s]; - } else if ([command isEqualToString:IRCCI_TIME]) { + } else if ([command isEqualToString:IRCCommandIndexTime]) { [self sendCTCPReply:nick command:command text:[[NSDate date] descriptionWithLocale:[NSLocale currentLocale]]]; - } else if ([command isEqualToString:IRCCI_VERSION]) { - NSString *ref = [Preferences gitBuildReference]; - NSString *text = [NSString stringWithFormat:TXTLS(@"IRC_CTCP_VERSION_INFO"), - [[Preferences textualInfoPlist] objectForKey:@"CFBundleName"], - [[Preferences textualInfoPlist] objectForKey:@"CFBundleVersion"], - ((NSObjectIsEmpty(ref)) ? @"Unknown" : ref)]; + } else if ([command isEqualToString:IRCCommandIndexVersion]) { + NSString *ref = [TPCPreferences gitBuildReference]; + NSString *name = [TPCPreferences applicationName]; + NSString *vers = [[TPCPreferences textualInfoPlist] objectForKey:@"CFBundleVersion"]; + + NSString *text = [NSString stringWithFormat:TXTLS(@"IRCCTCPVersionInfo"), name, vers, ((NSObjectIsEmpty(ref)) ? TXTLS(@"Unknown") : ref)]; [self sendCTCPReply:nick command:command text:text]; - } else if ([command isEqualToString:IRCCI_USERINFO]) { - [self sendCTCPReply:nick command:command text:NSNullObject]; - } else if ([command isEqualToString:IRCCI_CLIENTINFO]) { - [self sendCTCPReply:nick command:command text:TXTLS(@"IRC_CTCP_CLIENT_INFO")]; - } else if ([command isEqualToString:IRCCI_LAGCHECK]) { - if (lastLagCheck == 0) { - [self printDebugInformationToConsole:TXTFLS(@"IRC_HAS_IGNORED_CTCP", command, nick)]; + } else if ([command isEqualToString:IRCCommandIndexUserinfo]) { + [self sendCTCPReply:nick command:command text:NSStringEmptyPlaceholder]; + } else if ([command isEqualToString:IRCCommandIndexClientinfo]) { + [self sendCTCPReply:nick command:command text:TXTLS(@"IRCCTCPSupportedReplies")]; + } else if ([command isEqualToString:IRCCommandIndexLagcheck]) { + if (self.lastLagCheck == 0) { + [self printDebugInformationToConsole:TXTFLS(@"IRCCTCPRequestIgnored", command, nick)]; } - NSDoubleN time = CFAbsoluteTimeGetCurrent(); + TXNSDouble time = CFAbsoluteTimeGetCurrent(); - if (time >= lastLagCheck) { - NSDoubleN delta = (time - lastLagCheck); + if (time >= self.lastLagCheck) { + TXNSDouble delta = (time - self.lastLagCheck); - text = TXTFLS(@"LAG_CHECK_REQUEST_REPLY_MESSAGE", config.server, delta); + text = TXTFLS(@"LagCheckRequestReplyMessage", self.config.server, delta); } else { - text = TXTLS(@"LAG_CHECK_REQUEST_UNKNOWN_REPLY_MESSAGE"); + text = TXTLS(@"LagCheckRequestUnknownReply"); } - if (sendLagcheckToChannel) { + if (self.sendLagcheckToChannel) { [self sendPrivmsgToSelectedChannel:text]; - sendLagcheckToChannel = NO; + self.sendLagcheckToChannel = NO; } else { [self printDebugInformation:text]; } - lastLagCheck = 0; + self.lastLagCheck = 0; } } } @@ -3978,10 +3989,11 @@ - (void)receiveCTCPReply:(IRCMessage *)m text:(NSString *)text { NSString *nick = m.sender.nick; - NSMutableString *s = [text mutableCopy]; - NSString *command = [[s getToken] uppercaseString]; + NSMutableString *s = text.mutableCopy; + + NSString *command = s.getToken.uppercaseString; - AddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw + IRCAddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw withMatches:[NSArray arrayWithObjects:@"ignoreCTCP", nil]]; if ([ignoreChecks ignoreCTCP] == YES) { @@ -3990,25 +4002,25 @@ - (void)receiveCTCPReply:(IRCMessage *)m text:(NSString *)text IRCChannel *c = nil; - if ([Preferences locationToSendNotices] == NOTICES_SENDTO_CURCHAN) { - c = [world selectedChannelOn:self]; + if ([TPCPreferences locationToSendNotices] == TXNoticeSendCurrentChannelType) { + c = [self.world selectedChannelOn:self]; } - if ([command isEqualToString:IRCCI_PING]) { + if ([command isEqualToString:IRCCommandIndexPing]) { uint64_t delta = (mach_absolute_time() - [s longLongValue]); mach_timebase_info_data_t info; mach_timebase_info(&info); - NSDoubleN nano = (1e-9 * ((NSDoubleN)info.numer / (NSDoubleN)info.denom)); - NSDoubleN seconds = ((NSDoubleN)delta * nano); + TXNSDouble nano = (1e-9 * ((TXNSDouble)info.numer / (TXNSDouble)info.denom)); + TXNSDouble seconds = ((TXNSDouble)delta * nano); - text = TXTFLS(@"IRC_RECIEVED_CTCP_PING_REPLY", nick, command, seconds); + text = TXTFLS(@"IRCRecievedCTCPPingReply", nick, command, seconds); } else { - text = TXTFLS(@"IRC_RECIEVED_CTCP_REPLY", nick, command, s); + text = TXTFLS(@"IRCRecievedCTCPReply", nick, command, s); } - [self printBoth:c type:LINE_TYPE_CTCP text:text receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineCTCPType text:text receivedAt:m.receivedAt]; } - (void)requestUserHosts:(IRCChannel *)c @@ -4016,11 +4028,12 @@ - (void)requestUserHosts:(IRCChannel *)c if ([c.name isChannelName]) { [c setIsModeInit:YES]; - [self send:IRCCI_MODE, c.name, nil]; + [self send:IRCCommandIndexMode, c.name, nil]; - if (userhostInNames == NO) { - // We can skip requesting WHO, we already have this information - [self send:IRCCI_WHO, c.name, nil, nil]; + if (self.userhostInNames == NO) { + // We can skip requesting WHO, we already have this information. + + [self send:IRCCommandIndexWho, c.name, nil, nil]; } } } @@ -4031,10 +4044,11 @@ - (void)receiveJoin:(IRCMessage *)m NSString *chname = [m paramAt:0]; BOOL njoin = NO; - BOOL myself = [nick isEqualNoCase:myNick]; + BOOL myself = [nick isEqualNoCase:self.myNick]; if ([chname hasSuffix:@"\x07o"]) { njoin = YES; + chname = [chname safeSubstringToIndex:(chname.length - 2)]; } @@ -4045,15 +4059,16 @@ - (void)receiveJoin:(IRCMessage *)m [self reloadTree]; - myHost = m.sender.raw; + self.myHost = m.sender.raw; - if (autojoinInitialized == NO && [autoJoinTimer isActive] == NO) { + if (self.autojoinInitialized == NO && [self.autoJoinTimer isActive] == NO) { [world select:c]; + [world.serverList expandItem:c]; } if (NSObjectIsNotEmpty(c.config.encryptionKey)) { - [c.client printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_STARTED") channel:c]; + [c.client printDebugInformation:TXTLS(@"BlowfishEncryptionStarted") channel:c]; } } @@ -4064,43 +4079,43 @@ - (void)receiveJoin:(IRCMessage *)m u.nick = nick; u.username = m.sender.user; u.address = m.sender.address; - u.supportInfo = isupport; + u.supportInfo = self.isupport; [c addMember:u]; } - AddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw + IRCAddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw withMatches:[NSArray arrayWithObjects:@"ignoreJPQE", @"notifyJoins", nil]]; if ([ignoreChecks ignoreJPQE] == YES && myself == NO) { return; } - if (hasIRCopAccess == NO) { + if (self.hasIRCopAccess == NO) { if ([ignoreChecks notifyJoins] == YES) { NSString *tracker = [ignoreChecks trackingNickname]; - BOOL ison = [trackedUsers boolForKey:tracker]; + BOOL ison = [self.trackedUsers boolForKey:tracker]; if (ison == NO) { [self handleUserTrackingNotification:ignoreChecks nickname:m.sender.nick hostmask:[m.sender.raw hostmaskFromRawString] - langitem:@"USER_TRACKING_HOSTMASK_NOW_AVAILABLE"]; + langitem:@"UserTrackingHostmaskNowAvailable"]; - [trackedUsers setBool:YES forKey:tracker]; + [self.trackedUsers setBool:YES forKey:tracker]; } } } - if ([Preferences showJoinLeave]) { + if ([TPCPreferences showJoinLeave]) { if (c.config.iJPQActivity) { return; } - NSString *text = TXTFLS(@"IRC_USER_JOINED_CHANNEL", nick, m.sender.user, m.sender.address); + NSString *text = TXTFLS(@"IRCUserJoinedChannel", nick, m.sender.user, m.sender.address); - [self printBoth:c type:LINE_TYPE_JOIN text:text receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineJoinType text:text receivedAt:m.receivedAt]; } } @@ -4113,7 +4128,7 @@ - (void)receivePart:(IRCMessage *)m IRCChannel *c = [self findChannel:chname]; if (c) { - if ([nick isEqualNoCase:myNick]) { + if ([nick isEqualNoCase:self.myNick]) { [c deactivate]; [self reloadTree]; @@ -4121,25 +4136,25 @@ - (void)receivePart:(IRCMessage *)m [c removeMember:nick]; - if ([Preferences showJoinLeave]) { + if ([TPCPreferences showJoinLeave]) { if (c.config.iJPQActivity) { return; } - AddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw + IRCAddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw withMatches:[NSArray arrayWithObjects:@"ignoreJPQE", nil]]; if ([ignoreChecks ignoreJPQE] == YES) { return; } - NSString *message = TXTFLS(@"IRC_USER_PARTED_CHANNEL", nick, m.sender.user, m.sender.address); + NSString *message = TXTFLS(@"IRCUserPartedChannel", nick, m.sender.user, m.sender.address); if (NSObjectIsNotEmpty(comment)) { message = [message stringByAppendingFormat:@" (%@)", comment]; } - [self printBoth:c type:LINE_TYPE_PART text:message receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLinePartType text:message receivedAt:m.receivedAt]; } } } @@ -4156,32 +4171,32 @@ - (void)receiveKick:(IRCMessage *)m if (c) { [c removeMember:target]; - if ([Preferences showJoinLeave]) { + if ([TPCPreferences showJoinLeave]) { if (c.config.iJPQActivity) { return; } - AddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw + IRCAddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw withMatches:[NSArray arrayWithObjects:@"ignoreJPQE", nil]]; if ([ignoreChecks ignoreJPQE] == YES) { return; } - NSString *message = TXTFLS(@"IRC_USER_KICKED_FROM_CHANNEL", nick, target, comment); + NSString *message = TXTFLS(@"IRCUserKickedFromChannel", nick, target, comment); - [self printBoth:c type:LINE_TYPE_KICK text:message receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineKickType text:message receivedAt:m.receivedAt]; } - if ([target isEqualNoCase:myNick]) { + if ([target isEqualNoCase:self.myNick]) { [c deactivate]; [self reloadTree]; - [self notifyEvent:NOTIFICATION_KICKED lineType:LINE_TYPE_KICK target:c nick:nick text:comment]; + [self notifyEvent:TXNotificationKickType lineType:TVCLogLineKickType target:c nick:nick text:comment]; - if ([Preferences rejoinOnKick] && c.errLastJoin == NO) { - [self printDebugInformation:TXTLS(@"IRC_CHANNEL_PREPARING_REJOIN") channel:c]; + if ([TPCPreferences rejoinOnKick] && c.errLastJoin == NO) { + [self printDebugInformation:TXTLS(@"IRCChannelPreparingRejoinAttempt") channel:c]; [self performSelector:@selector(_joinKickedChannel:) withObject:c afterDelay:3.0]; } @@ -4194,27 +4209,27 @@ - (void)receiveQuit:(IRCMessage *)m NSString *nick = m.sender.nick; NSString *comment = [[m paramAt:0] trim]; - BOOL myself = [nick isEqualNoCase:myNick]; + BOOL myself = [nick isEqualNoCase:self.myNick]; - AddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw + IRCAddressBook *ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw withMatches:[NSArray arrayWithObjects:@"ignoreJPQE", nil]]; - NSString *text = TXTFLS(@"IRC_USER_DISCONNECTED", nick, m.sender.user, m.sender.address); + NSString *text = TXTFLS(@"IRCUserDisconnected", nick, m.sender.user, m.sender.address); if (NSObjectIsNotEmpty(comment)) { - if ([TXRegularExpression string:comment + if ([TLORegularExpression string:comment isMatchedByRegex:@"^((([a-zA-Z0-9-_\\.\\*]+)\\.([a-zA-Z0-9-_]+)) (([a-zA-Z0-9-_\\.\\*]+)\\.([a-zA-Z0-9-_]+)))$"]) { - comment = TXTFLS(@"IRC_SERVER_HAD_NETSPLIT", comment); + comment = TXTFLS(@"IRCServerHadNetsplitQuitMessage", comment); } text = [text stringByAppendingFormat:@" (%@)", comment]; } - for (IRCChannel *c in channels) { + for (IRCChannel *c in self.channels) { if ([c findMember:nick]) { - if ([Preferences showJoinLeave] && c.config.iJPQActivity == NO && [ignoreChecks ignoreJPQE] == NO) { - [self printChannel:c type:LINE_TYPE_QUIT text:text receivedAt:m.receivedAt]; + if ([TPCPreferences showJoinLeave] && c.config.iJPQActivity == NO && [ignoreChecks ignoreJPQE] == NO) { + [self printChannel:c type:TVCLogLineQuitType text:text receivedAt:m.receivedAt]; } [c removeMember:nick]; @@ -4226,26 +4241,26 @@ - (void)receiveQuit:(IRCMessage *)m } if (myself == NO) { - if ([nick isEqualNoCase:config.nick]) { - [self changeNick:config.nick]; + if ([nick isEqualNoCase:self.config.nick]) { + [self changeNick:self.config.nick]; } } - [world reloadTree]; + [self.world reloadTree]; - if (hasIRCopAccess == NO) { + if (self.hasIRCopAccess == NO) { if ([ignoreChecks notifyJoins] == YES) { NSString *tracker = [ignoreChecks trackingNickname]; - BOOL ison = [trackedUsers boolForKey:tracker]; + BOOL ison = [self.trackedUsers boolForKey:tracker]; if (ison) { - [trackedUsers setBool:NO forKey:tracker]; + [self.trackedUsers setBool:NO forKey:tracker]; [self handleUserTrackingNotification:ignoreChecks nickname:m.sender.nick hostmask:[m.sender.raw hostmaskFromRawString] - langitem:@"USER_TRACKING_HOSTMASK_NO_LONGER_AVAILABLE"]; + langitem:@"UserTrackingHostmaskNoLongerAvailable"]; } } } @@ -4255,7 +4270,7 @@ - (void)receiveKill:(IRCMessage *)m { NSString *target = [m paramAt:0]; - for (IRCChannel *c in channels) { + for (IRCChannel *c in self.channels) { if ([c findMember:target]) { [c removeMember:target]; } @@ -4264,7 +4279,7 @@ - (void)receiveKill:(IRCMessage *)m - (void)receiveNick:(IRCMessage *)m { - AddressBook *ignoreChecks; + IRCAddressBook *ignoreChecks; NSString *nick = m.sender.nick; NSString *toNick = [m paramAt:0]; @@ -4273,43 +4288,43 @@ - (void)receiveNick:(IRCMessage *)m return; } - BOOL myself = [nick isEqualNoCase:myNick]; + BOOL myself = [nick isEqualNoCase:self.myNick]; if (myself) { - myNick = toNick; + self.myNick = toNick; } else { ignoreChecks = [self checkIgnoreAgainstHostmask:m.sender.raw withMatches:[NSArray arrayWithObjects:@"ignoreJPQE", nil]]; - if (hasIRCopAccess == NO) { + if (self.hasIRCopAccess == NO) { if ([ignoreChecks notifyJoins] == YES) { NSString *tracker = [ignoreChecks trackingNickname]; - BOOL ison = [trackedUsers boolForKey:tracker]; + BOOL ison = [self.trackedUsers boolForKey:tracker]; if (ison) { [self handleUserTrackingNotification:ignoreChecks nickname:m.sender.nick hostmask:[m.sender.raw hostmaskFromRawString] - langitem:@"USER_TRACKING_HOSTMASK_NO_LONGER_AVAILABLE"]; + langitem:@"UserTrackingHostmaskNoLongerAvailable"]; } else { [self handleUserTrackingNotification:ignoreChecks nickname:m.sender.nick hostmask:[m.sender.raw hostmaskFromRawString] - langitem:@"USER_TRACKING_HOSTMASK_NOW_AVAILABLE"]; + langitem:@"UserTrackingHostmaskNowAvailable"]; } - [trackedUsers setBool:BOOLReverseValue(ison) forKey:tracker]; + [self.trackedUsers setBool:BOOLReverseValue(ison) forKey:tracker]; } } } - for (IRCChannel *c in channels) { + for (IRCChannel *c in self.channels) { if ([c findMember:nick]) { if ((myself == NO && [ignoreChecks ignoreJPQE] == NO) || myself == YES) { - NSString *text = TXTFLS(@"IRC_USER_CHANGED_NICKNAME", nick, toNick); + NSString *text = TXTFLS(@"IRCUserChangedNickname", nick, toNick); - [self printChannel:c type:LINE_TYPE_NICK text:text receivedAt:m.receivedAt]; + [self printChannel:c type:TVCLogLineNickType text:text receivedAt:m.receivedAt]; } [c renameMember:nick to:toNick]; @@ -4322,7 +4337,7 @@ - (void)receiveNick:(IRCMessage *)m IRCChannel *t = [self findChannel:toNick]; if (t) { - [world destroyChannel:t]; + [self.world destroyChannel:t]; } c.name = toNick; @@ -4342,24 +4357,25 @@ - (void)receiveMode:(IRCMessage *)m if (c) { NSArray *info = [c.mode update:modeStr]; + BOOL performWho = NO; for (IRCModeInfo *h in info) { [c changeMember:h.param mode:h.mode value:h.plus]; - if (h.plus == NO && multiPrefix == NO) { + if (h.plus == NO && self.multiPrefix == NO) { performWho = YES; } } if (performWho) { - [self send:IRCCI_WHO, c.name, nil, nil]; + [self send:IRCCommandIndexWho, c.name, nil, nil]; } - [self printBoth:c type:LINE_TYPE_MODE text:TXTFLS(@"IRC_MDOE_SET", nick, modeStr) receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineModeType text:TXTFLS(@"IRCModeSet", nick, modeStr) receivedAt:m.receivedAt]; } } else { - [self printBoth:nil type:LINE_TYPE_MODE text:TXTFLS(@"IRC_MDOE_SET", nick, modeStr) receivedAt:m.receivedAt]; + [self printBoth:nil type:TVCLogLineModeType text:TXTFLS(@"IRCModeSet", nick, modeStr) receivedAt:m.receivedAt]; } } @@ -4374,10 +4390,10 @@ - (void)receiveTopic:(IRCMessage *)m [self decryptIncomingMessage:&topic channel:c]; if (c) { - [c setTopic:topic]; - [c.log setTopic:topic]; + [c setTopic:topic]; + [c.log setTopic:topic]; - [self printBoth:c type:LINE_TYPE_TOPIC text:TXTFLS(@"IRC_CHANNEL_TOPIC_CHANGED", nick, topic) receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineTopicType text:TXTFLS(@"IRCChannelTopicChanged", nick, topic) receivedAt:m.receivedAt]; } } @@ -4386,12 +4402,13 @@ - (void)receiveInvite:(IRCMessage *)m NSString *nick = m.sender.nick; NSString *chname = [m paramAt:1]; - NSString *text = TXTFLS(@"IRC_USER_INVITED_YOU_TO", nick, m.sender.user, m.sender.address, chname); + NSString *text = TXTFLS(@"IRCUserInvitedYouToJoinChannel", nick, m.sender.user, m.sender.address, chname); + + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineInviteType text:text receivedAt:m.receivedAt]; - [self printBoth:self type:LINE_TYPE_INVITE text:text receivedAt:m.receivedAt]; - [self notifyEvent:NOTIFICATION_INVITED lineType:LINE_TYPE_INVITE target:nil nick:nick text:chname]; + [self notifyEvent:TXNotificationInviteType lineType:TVCLogLineInviteType target:nil nick:nick text:chname]; - if ([Preferences autoJoinOnInvite]) { + if ([TPCPreferences autoJoinOnInvite]) { [self joinUnlistedChannel:chname]; } } @@ -4403,27 +4420,27 @@ - (void)receiveError:(IRCMessage *)m - (void)sendNextCap { - if (capPaused == NO) { - if (pendingCaps && [pendingCaps count]) { - NSString *cap = [pendingCaps lastObject]; + if (self.capPaused == NO) { + if (self.pendingCaps && [self.pendingCaps count]) { + NSString *cap = [self.pendingCaps lastObject]; - [self send:IRCCI_CAP, @"REQ", cap, nil]; + [self send:IRCCommandIndexCap, @"REQ", cap, nil]; - [pendingCaps removeLastObject]; + [self.pendingCaps removeLastObject]; } else { - [self send:IRCCI_CAP, @"END", nil]; + [self send:IRCCommandIndexCap, @"END", nil]; } } } - (void)pauseCap { - capPaused++; + self.capPaused++; } - (void)resumeCap { - capPaused--; + self.capPaused--; [self sendNextCap]; } @@ -4435,25 +4452,25 @@ - (BOOL)isCapAvailable:(NSString*)cap [cap isEqualNoCase:@"multi-prefix"] || [cap isEqualNoCase:@"userhost-in-names"] || //[cap isEqualNoCase:@"znc.in/server-time"] || - ([cap isEqualNoCase:@"sasl"] && NSObjectIsNotEmpty(config.nickPassword))); + ([cap isEqualNoCase:@"sasl"] && NSObjectIsNotEmpty(self.config.nickPassword))); } - (void)cap:(NSString*)cap result:(BOOL)supported { if (supported) { if ([cap isEqualNoCase:@"sasl"]) { - inSASLRequest = YES; + self.inSASLRequest = YES; [self pauseCap]; - [self send:IRCCI_AUTHENTICATE, @"PLAIN", nil]; + [self send:IRCCommandIndexAuthenticate, @"PLAIN", nil]; } else if ([cap isEqualNoCase:@"userhost-in-names"]) { - userhostInNames = YES; + self.userhostInNames = YES; } else if ([cap isEqualNoCase:@"multi-prefix"]) { - multiPrefix = YES; + self.multiPrefix = YES; } else if ([cap isEqualNoCase:@"identify-msg"]) { - identifyMsg = YES; + self.identifyMsg = YES; } else if ([cap isEqualNoCase:@"identify-ctcp"]) { - identifyCTCP = YES; + self.identifyCTCP = YES; } } } @@ -4470,20 +4487,20 @@ - (void)receiveCapacityOrAuthenticationRequest:(IRCMessage *)m star = [star trim]; action = [action trim]; - if ([command isEqualNoCase:IRCCI_CAP]) { + if ([command isEqualNoCase:IRCCommandIndexCap]) { if ([base isEqualNoCase:@"LS"]) { NSArray *caps = [action componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; for (NSString *cap in caps) { if ([self isCapAvailable:cap]) { - [pendingCaps addObject:cap]; + [self.pendingCaps addObject:cap]; } } } else if ([base isEqualNoCase:@"ACK"]) { NSArray *caps = [action componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; for (NSString *cap in caps) { - [acceptedCaps addObject:cap]; + [self.acceptedCaps addObject:cap]; [self cap:cap result:YES]; } @@ -4498,24 +4515,24 @@ - (void)receiveCapacityOrAuthenticationRequest:(IRCMessage *)m [self sendNextCap]; } else { if ([star isEqualToString:@"+"]) { - NSData *usernameData = [config.nick dataUsingEncoding:config.encoding allowLossyConversion:YES]; + NSData *usernameData = [self.config.nick dataUsingEncoding:self.config.encoding allowLossyConversion:YES]; NSMutableData *authenticateData = [usernameData mutableCopy]; [authenticateData appendBytes:"\0" length:1]; [authenticateData appendData:usernameData]; [authenticateData appendBytes:"\0" length:1]; - [authenticateData appendData:[config.nickPassword dataUsingEncoding:config.encoding allowLossyConversion:YES]]; + [authenticateData appendData:[self.config.nickPassword dataUsingEncoding:self.config.encoding allowLossyConversion:YES]]; NSString *authString = [authenticateData base64EncodingWithLineLength:400]; NSArray *authStrings = [authString componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]]; for (NSString *string in authStrings) { - [self send:IRCCI_AUTHENTICATE, string, nil]; + [self send:IRCCommandIndexAuthenticate, string, nil]; } if (NSObjectIsEmpty(authStrings) || [(NSString *)[authStrings lastObject] length] == 400) { - [self send:IRCCI_AUTHENTICATE, @"+", nil]; + [self send:IRCCommandIndexAuthenticate, @"+", nil]; } } } @@ -4523,7 +4540,7 @@ - (void)receiveCapacityOrAuthenticationRequest:(IRCMessage *)m - (void)receivePing:(IRCMessage *)m { - [self send:IRCCI_PONG, [m sequence:0], nil]; + [self send:IRCCommandIndexPong, [m sequence:0], nil]; } - (void)receiveInit:(IRCMessage *)m @@ -4532,19 +4549,18 @@ - (void)receiveInit:(IRCMessage *)m [self stopRetryTimer]; [self stopAutoJoinTimer]; - sendLagcheckToChannel = serverHasNickServ = NO; - isLoggedIn = conn.loggedIn = inFirstISONRun = YES; - isAway = isConnecting = hasIRCopAccess = NO; + self.sendLagcheckToChannel = self.serverHasNickServ = NO; + self.isLoggedIn = self.conn.loggedIn = self.inFirstISONRun = YES; + self.isAway = self.isConnecting = self.hasIRCopAccess = NO; - tryingNickNumber = -1; + self.tryingNickNumber = -1; - serverHostname = m.sender.raw; + self.serverHostname = m.sender.raw; + self.myNick = [m paramAt:0]; - myNick = [m paramAt:0]; + [self notifyEvent:TXNotificationConnectType lineType:TVCLogLineSystemType]; - [self notifyEvent:NOTIFICATION_LOGIN lineType:LINE_TYPE_SYSTEM]; - - for (__strong NSString *s in config.loginCommands) { + for (__strong NSString *s in self.config.loginCommands) { if ([s hasPrefix:@"/"]) { s = [s safeSubstringFromIndex:1]; } @@ -4552,26 +4568,26 @@ - (void)receiveInit:(IRCMessage *)m [self sendCommand:s completeTarget:NO target:nil]; } - for (IRCChannel *c in channels) { + for (IRCChannel *c in self.channels) { if (c.isTalk) { [c activate]; IRCUser *m; m = [[IRCUser alloc] init]; - m.supportInfo = isupport; - m.nick = myNick; + m.supportInfo = self.isupport; + m.nick = self.myNick; [c addMember:m]; m = [[IRCUser alloc] init]; - m.supportInfo = isupport; + m.supportInfo = self.isupport; m.nick = c.name; [c addMember:m]; } } [self reloadTree]; - [self populateISONTrackedUsersList:config.ignores]; + [self populateISONTrackedUsersList:self.config.ignores]; #ifdef IS_TRIAL_BINARY [self startTrialPeriodTimer]; @@ -4601,10 +4617,8 @@ - (void)receiveNumericReply:(IRCMessage *)m } case 2 ... 4: { - if (NSObjectIsEmpty(config.server)) { - if ([m.sender.nick isNickname] == NO) { - [config setServer:m.sender.nick]; - } + if ([m.sender.nick isNickname] == NO) { + [self.config setServer:m.sender.nick]; } [self printReply:m]; @@ -4613,13 +4627,11 @@ - (void)receiveNumericReply:(IRCMessage *)m } case 5: { - [isupport update:[m sequence:1] client:self]; + [self.isupport update:[m sequence:1] client:self]; - if (NSObjectIsNotEmpty(isupport.networkName)) { - [config setNetwork:TXTFLS(@"IRC_HAS_NETWORK_NAME", isupport.networkName)]; + [self.config setNetwork:TXTFLS(@"IRCServerNetworkName", self.isupport.networkName)]; - [world updateTitle]; - } + [self.world updateTitle]; break; } @@ -4638,7 +4650,7 @@ - (void)receiveNumericReply:(IRCMessage *)m case 376: case 422: { - if ([Preferences displayServerMOTD]) { + if ([TPCPreferences displayServerMOTD]) { [self printReply:m]; } @@ -4650,7 +4662,7 @@ - (void)receiveNumericReply:(IRCMessage *)m if ([modeStr isEqualToString:@"+"]) return; - [self printBoth:nil type:LINE_TYPE_REPLY text:TXTFLS(@"IRC_YOU_HAVE_UMODES", modeStr) receivedAt:m.receivedAt]; + [self printBoth:nil type:TVCLogLineReplyType text:TXTFLS(@"IRCUserHasModes", modeStr) receivedAt:m.receivedAt]; break; } @@ -4659,9 +4671,9 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *kind = [[m paramAt:1] lowercaseString]; if ([kind isEqualToString:@"identify-msg"]) { - identifyMsg = YES; + self.identifyMsg = YES; } else if ([kind isEqualToString:@"identify-ctcp"]) { - identifyCTCP = YES; + self.identifyCTCP = YES; } [self printReply:m]; @@ -4674,19 +4686,19 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *comment = [m paramAt:2]; IRCChannel *c = [self findChannel:nick]; - IRCChannel *sc = [world selectedChannelOn:self]; + IRCChannel *sc = [self.world selectedChannelOn:self]; - NSString *text = TXTFLS(@"IRC_USER_IS_AWAY", nick, comment); + NSString *text = TXTFLS(@"IRCUserIsAway", nick, comment); if (c) { - [self printBoth:(id)nick type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:(id)nick type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } - if (whoisChannel && [whoisChannel isEqualTo:c] == NO) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel && [self.whoisChannel isEqualTo:c] == NO) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { if ([sc isEqualTo:c] == NO) { - [self printBoth:sc type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:sc type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } } @@ -4694,7 +4706,7 @@ - (void)receiveNumericReply:(IRCMessage *)m } case 305: { - isAway = NO; + self.isAway = NO; [self printUnknownReply:m]; @@ -4702,7 +4714,7 @@ - (void)receiveNumericReply:(IRCMessage *)m } case 306: { - isAway = YES; + self.isAway = YES; [self printUnknownReply:m]; @@ -4718,10 +4730,10 @@ - (void)receiveNumericReply:(IRCMessage *)m { NSString *text = [NSString stringWithFormat:@"%@ %@", [m paramAt:1], [m paramAt:2]]; - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; @@ -4730,10 +4742,10 @@ - (void)receiveNumericReply:(IRCMessage *)m { NSString *text = [NSString stringWithFormat:@"%@ %@ %@", [m paramAt:1], [m sequence:3], [m paramAt:2]]; - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; @@ -4748,22 +4760,22 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *text = nil; - inWhoWasRun = (m.numericReply == 314); + self.inWhoWasRun = (m.numericReply == 314); if ([realname hasPrefix:@":"]) { realname = [realname safeSubstringFromIndex:1]; } - if (inWhoWasRun) { - text = TXTFLS(@"IRC_USER_WHOWAS_HOSTMASK", nick, username, address, realname); + if (self.inWhoWasRun) { + text = TXTFLS(@"IRCUserWhowasHostmask", nick, username, address, realname); } else { - text = TXTFLS(@"IRC_USER_WHOIS_HOSTMASK", nick, username, address, realname); + text = TXTFLS(@"IRCUserWhoisHostmask", nick, username, address, realname); } - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; @@ -4776,16 +4788,17 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *text = nil; - if (inWhoWasRun) { - text = TXTFLS(@"IRC_USER_WHOWAS_CONNECTED_FROM", nick, server, [dateTimeFormatter stringFromDate:[NSDate dateWithNaturalLanguageString:serverInfo]]); + if (self.inWhoWasRun) { + text = TXTFLS(@"IRCUserWhowasConnectedFrom", nick, server, + [dateTimeFormatter stringFromDate:[NSDate dateWithNaturalLanguageString:serverInfo]]); } else { - text = TXTFLS(@"IRC_USER_WHOIS_CONNECTED_FROM", nick, server, serverInfo); + text = TXTFLS(@"IRCUserWhoisConnectedFrom", nick, server, serverInfo); } - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; @@ -4800,12 +4813,12 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *idleTime = TXReadableTime(idleStr); NSString *dateFromString = [dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:signOnStr]]; - NSString *text = TXTFLS(@"IRC_USER_WHOIS_UPTIME", nick, dateFromString, idleTime); + NSString *text = TXTFLS(@"IRCUserWhoisUptime", nick, dateFromString, idleTime); - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; @@ -4815,27 +4828,28 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *nick = [m paramAt:1]; NSString *trail = [[m paramAt:2] trim]; - NSString *text = TXTFLS(@"IRC_USER_WHOIS_CHANNELS", nick, trail); + NSString *text = TXTFLS(@"IRCUserWhoisChannels", nick, trail); - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; } case 318: { - whoisChannel = nil; + self.whoisChannel = nil; break; } case 324: { NSString *chname = [m paramAt:1]; - NSString *modeStr = [m sequence:2]; - + NSString *modeStr; + + modeStr = [m sequence:2]; modeStr = [modeStr stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; if ([modeStr isEqualToString:@"+"]) return; @@ -4850,7 +4864,7 @@ - (void)receiveNumericReply:(IRCMessage *)m c.isModeInit = YES; } - [self printBoth:c type:LINE_TYPE_MODE text:TXTFLS(@"IRC_CHANNEL_HAS_MODES", modeStr) receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineModeType text:TXTFLS(@"IRCChannelHasModes", modeStr) receivedAt:m.receivedAt]; } break; @@ -4865,10 +4879,10 @@ - (void)receiveNumericReply:(IRCMessage *)m [self decryptIncomingMessage:&topic channel:c]; if (c && c.isActive) { - [c setTopic:topic]; - [c.log setTopic:topic]; + [c setTopic:topic]; + [c.log setTopic:topic]; - [self printBoth:c type:LINE_TYPE_TOPIC text:TXTFLS(@"IRC_CHANNEL_HAS_TOPIC", topic) receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineTopicType text:TXTFLS(@"IRCChannelHasTopic", topic) receivedAt:m.receivedAt]; } break; @@ -4878,6 +4892,7 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *chname = [m paramAt:1]; NSString *setter = [m paramAt:2]; NSString *timeStr = [m paramAt:3]; + long long timeNum = [timeStr longLongValue]; NSRange r = [setter rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"!@"]]; @@ -4889,10 +4904,10 @@ - (void)receiveNumericReply:(IRCMessage *)m IRCChannel *c = [self findChannel:chname]; if (c) { - NSString *text = [NSString stringWithFormat:TXTLS(@"IRC_CHANNEL_HAS_TOPIC_AUTHOR"), setter, + NSString *text = [NSString stringWithFormat:TXTLS(@"IRCChannelHasTopicAuthor"), setter, [dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:timeNum]]]; - [self printBoth:c type:LINE_TYPE_TOPIC text:text receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineTopicType text:text receivedAt:m.receivedAt]; } break; @@ -4904,40 +4919,40 @@ - (void)receiveNumericReply:(IRCMessage *)m IRCChannel *c = [self findChannel:chname]; - [self printBoth:c type:LINE_TYPE_REPLY text:TXTFLS(@"IRC_USER_INVITED_OTHER_USER", nick, chname) receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineReplyType text:TXTFLS(@"IRCUserInvitedToJoinChannel", nick, chname) receivedAt:m.receivedAt]; break; } case 303: { - if (hasIRCopAccess) { + if (self.hasIRCopAccess) { [self printUnknownReply:m]; } else { NSArray *users = [[m sequence] componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; - for (NSString *name in trackedUsers) { + for (NSString *name in self.trackedUsers) { NSString *langkey = nil; - BOOL ison = [trackedUsers boolForKey:name]; + BOOL ison = [self.trackedUsers boolForKey:name]; if (ison) { if ([users containsObjectIgnoringCase:name] == NO) { - if (inFirstISONRun == NO) { - langkey = @"USER_TRACKING_NICKNAME_NO_LONGER_AVAILABLE"; + if (self.inFirstISONRun == NO) { + langkey = @"UserTrackingNicknameNoLongerAvailable"; } - [trackedUsers setBool:NO forKey:name]; + [self.trackedUsers setBool:NO forKey:name]; } } else { if ([users containsObjectIgnoringCase:name]) { - langkey = ((inFirstISONRun) ? @"USER_TRACKING_NICKNAME_AVAILABLE" : @"USER_TRACKING_NICKNAME_NOW_AVAILABLE"); + langkey = ((self.inFirstISONRun) ? @"UserTrackingNicknameIsAvailable" : @"UserTrackingNicknameNowAvailable"); - [trackedUsers setBool:YES forKey:name]; + [self.trackedUsers setBool:YES forKey:name]; } } if (NSObjectIsNotEmpty(langkey)) { - for (AddressBook *g in config.ignores) { + for (IRCAddressBook *g in self.config.ignores) { NSString *trname = [g trackingNickname]; if ([trname isEqualNoCase:name]) { @@ -4947,8 +4962,8 @@ - (void)receiveNumericReply:(IRCMessage *)m } } - if (inFirstISONRun) { - inFirstISONRun = NO; + if (self.inFirstISONRun) { + self.inFirstISONRun = NO; } } @@ -4964,15 +4979,15 @@ - (void)receiveNumericReply:(IRCMessage *)m [c setIsModeInit:NO]; } - if (inWhoInfoRun) { + if (self.inWhoInfoRun) { [self printUnknownReply:m]; - inWhoInfoRun = NO; + self.inWhoInfoRun = NO; } break; } - case 352: // RPL_WHOREPLY + case 352: { NSString *chname = [m paramAt:1]; @@ -4982,7 +4997,9 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *nick = [m paramAt:5]; NSString *hostmask = [m paramAt:3]; NSString *username = [m paramAt:2]; - NSString *fields = [m paramAt:6]; + NSString *fields = [m paramAt:6]; + + BOOL isIRCOp = NO; // fields = G|H *| chanprefixes // strip G or H (away status) @@ -4991,6 +5008,8 @@ - (void)receiveNumericReply:(IRCMessage *)m if ([fields hasPrefix:@"*"]) { // The nick is an oper fields = [fields substringFromIndex:1]; + + isIRCOp = YES; } IRCUser *u = [c findMember:nick]; @@ -4998,8 +5017,9 @@ - (void)receiveNumericReply:(IRCMessage *)m if (PointerIsEmpty(u)) { IRCUser *u = [[IRCUser alloc] init]; - u.supportInfo = isupport; - u.nick = nick; + u.nick = nick; + u.isIRCOp = isIRCOp; + u.supportInfo = self.isupport; } NSInteger i; @@ -5007,15 +5027,15 @@ - (void)receiveNumericReply:(IRCMessage *)m for (i = 0; i < fields.length; i++) { NSString *prefix = [fields safeSubstringWithRange:NSMakeRange(i, 1)]; - if ([prefix isEqualTo:isupport.userModeQPrefix]) { + if ([prefix isEqualTo:self.isupport.userModeQPrefix]) { u.q = YES; - } else if ([prefix isEqualTo:isupport.userModeAPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeAPrefix]) { u.a = YES; - } else if ([prefix isEqualTo:isupport.userModeOPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeOPrefix]) { u.o = YES; - } else if ([prefix isEqualTo:isupport.userModeHPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeHPrefix]) { u.h = YES; - } else if ([prefix isEqualTo:isupport.userModeVPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeVPrefix]) { u.v = YES; } else { break; @@ -5031,7 +5051,7 @@ - (void)receiveNumericReply:(IRCMessage *)m [c reloadMemberList]; } - if (inWhoInfoRun) { + if (self.inWhoInfoRun) { [self printUnknownReply:m]; } @@ -5059,15 +5079,15 @@ - (void)receiveNumericReply:(IRCMessage *)m for (i = 0; i < nick.length; i++) { NSString *prefix = [nick safeSubstringWithRange:NSMakeRange(i, 1)]; - if ([prefix isEqualTo:isupport.userModeQPrefix]) { + if ([prefix isEqualTo:self.isupport.userModeQPrefix]) { m.q = YES; - } else if ([prefix isEqualTo:isupport.userModeAPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeAPrefix]) { m.a = YES; - } else if ([prefix isEqualTo:isupport.userModeOPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeOPrefix]) { m.o = YES; - } else if ([prefix isEqualTo:isupport.userModeHPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeHPrefix]) { m.h = YES; - } else if ([prefix isEqualTo:isupport.userModeVPrefix]) { + } else if ([prefix isEqualTo:self.isupport.userModeVPrefix]) { m.v = YES; } else { break; @@ -5076,12 +5096,12 @@ - (void)receiveNumericReply:(IRCMessage *)m nick = [nick substringFromIndex:i]; - m.nick = [nick nicknameFromHostmask]; - m.username = [nick identFromHostmask]; - m.address = [nick hostFromHostmask]; + m.nick = [nick nicknameFromHostmask]; + m.username = [nick identFromHostmask]; + m.address = [nick hostFromHostmask]; - m.supportInfo = isupport; - m.isMyself = [nick isEqualNoCase:myNick]; + m.supportInfo = self.isupport; + m.isMyself = [nick isEqualNoCase:self.myNick]; [c addMember:m reload:NO]; @@ -5107,7 +5127,7 @@ - (void)receiveNumericReply:(IRCMessage *)m NSString *m = c.config.mode; if (NSObjectIsNotEmpty(m)) { - NSString *line = [NSString stringWithFormat:@"%@ %@ %@", IRCCI_MODE, chname, m]; + NSString *line = [NSString stringWithFormat:@"%@ %@ %@", IRCCommandIndexMode, chname, m]; [self sendLine:line]; } @@ -5124,12 +5144,12 @@ - (void)receiveNumericReply:(IRCMessage *)m if (NSObjectIsNotEmpty(topic)) { if ([self encryptOutgoingMessage:&topic channel:c] == YES) { - [self send:IRCCI_TOPIC, chname, topic, nil]; + [self send:IRCCommandIndexTopic, chname, topic, nil]; } } } - if ([Preferences processChannelModes]) { + if ([TPCPreferences processChannelModes]) { [self requestUserHosts:c]; } } @@ -5140,30 +5160,30 @@ - (void)receiveNumericReply:(IRCMessage *)m { NSString *text = [NSString stringWithFormat:@"%@ %@", [m paramAt:1], [m sequence:2]]; - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; } case 321: { - if (channelListDialog) { - [channelListDialog clear]; + if (self.channelListDialog) { + [self.channelListDialog clear]; } break; } case 322: { - NSString *chname = [m paramAt:1]; - NSString *countStr = [m paramAt:2]; - NSString *topic = [m sequence:3]; + NSString *chname = [m paramAt:1]; + NSString *countStr = [m paramAt:2]; + NSString *topic = [m sequence:3]; - if (channelListDialog) { - [channelListDialog addChannel:chname count:[countStr integerValue] topic:topic]; + if (self.channelListDialog) { + [self.channelListDialog addChannel:chname count:[countStr integerValue] topic:topic]; } break; @@ -5181,10 +5201,10 @@ - (void)receiveNumericReply:(IRCMessage *)m { NSString *text = [NSString stringWithFormat:@"%@ %@ %@", [m paramAt:1], [m sequence:3], [m paramAt:2]]; - if (whoisChannel) { - [self printBoth:whoisChannel type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + if (self.whoisChannel) { + [self printBoth:self.whoisChannel type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } else { - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; } break; @@ -5196,8 +5216,8 @@ - (void)receiveNumericReply:(IRCMessage *)m long long seton = [[m paramAt:4] longLongValue]; - if (chanBanListSheet) { - [chanBanListSheet addBan:mask tset:[dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:seton]] setby:owner]; + if (self.chanBanListSheet) { + [self.chanBanListSheet addBan:mask tset:[dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:seton]] setby:owner]; } break; @@ -5209,8 +5229,8 @@ - (void)receiveNumericReply:(IRCMessage *)m long long seton = [[m paramAt:4] longLongValue]; - if (inviteExceptionSheet) { - [inviteExceptionSheet addException:mask tset:[dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:seton]] setby:owner]; + if (self.inviteExceptionSheet) { + [self.inviteExceptionSheet addException:mask tset:[dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:seton]] setby:owner]; } break; @@ -5222,22 +5242,22 @@ - (void)receiveNumericReply:(IRCMessage *)m long long seton = [[m paramAt:4] longLongValue]; - if (banExceptionSheet) { - [banExceptionSheet addException:mask tset:[dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:seton]] setby:owner]; + if (self.banExceptionSheet) { + [self.banExceptionSheet addException:mask tset:[dateTimeFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:seton]] setby:owner]; } break; } case 381: { - if (hasIRCopAccess == NO) { + if (self.hasIRCopAccess == NO) { /* If we are already an IRCOp, then we do not need to see this line again. We will assume that if we are seeing it again, then it is the result of a user opening two connections to a single bouncer session. */ - [self printBoth:nil type:LINE_TYPE_REPLY text:TXTFLS(@"IRC_USER_HAS_GOOD_LIFE", m.sender.nick) receivedAt:m.receivedAt]; + [self printBoth:nil type:TVCLogLineReplyType text:TXTFLS(@"IRCUserIsNowIRCOperator", m.sender.nick) receivedAt:m.receivedAt]; - hasIRCopAccess = YES; + self.hasIRCopAccess = YES; } break; @@ -5250,24 +5270,24 @@ - (void)receiveNumericReply:(IRCMessage *)m IRCChannel *c = [self findChannel:chname]; if (c && website) { - [self printBoth:c type:LINE_TYPE_WEBSITE text:TXTFLS(@"IRC_CHANNEL_HAS_WEBSITE", website) receivedAt:m.receivedAt]; + [self printBoth:c type:TVCLogLineWebsiteType text:TXTFLS(@"IRCChannelHasWebsite", website) receivedAt:m.receivedAt]; } break; } case 369: { - inWhoWasRun = NO; + self.inWhoWasRun = NO; - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:[m sequence] receivedAt:m.receivedAt]; + [self printBoth:[self.world selectedChannelOn:self] type:TVCLogLineReplyType text:[m sequence] receivedAt:m.receivedAt]; break; } case 900: { - isIdentifiedWithSASL = YES; + self.isIdentifiedWithSASL = YES; - [self printBoth:self type:LINE_TYPE_REPLY text:[m sequence:3] receivedAt:m.receivedAt]; + [self printBoth:self type:TVCLogLineReplyType text:[m sequence:3] receivedAt:m.receivedAt]; break; } @@ -5278,13 +5298,14 @@ - (void)receiveNumericReply:(IRCMessage *)m case 907: { if (n == 903) { // success - [self printBoth:self type:LINE_TYPE_NOTICE text:[m sequence:1] receivedAt:m.receivedAt]; + [self printBoth:self type:TVCLogLineNoticeType text:[m sequence:1] receivedAt:m.receivedAt]; } else { [self printReply:m]; } - if (inSASLRequest) { - inSASLRequest = NO; + if (self.inSASLRequest) { + self.inSASLRequest = NO; + [self resumeCap]; } @@ -5292,7 +5313,7 @@ - (void)receiveNumericReply:(IRCMessage *)m } default: { - if ([world.bundlesForServerInput containsKey:[NSString stringWithInteger:m.numericReply]]) { + if ([self.world.bundlesForServerInput containsKey:[NSString stringWithInteger:m.numericReply]]) { break; } @@ -5317,22 +5338,25 @@ - (void)receiveErrorNumericReply:(IRCMessage *)m return; } - + + return; break; } case 433: // ERR_NICKNAMEINUSE case 437: // ERR_NICKTEMPUNAVAIL { - if (isLoggedIn) break; - + if (self.isLoggedIn) break; + [self receiveNickCollisionError:m]; + + return; break; } case 402: // ERR_NOSUCHSERVER { - NSString *text = TXTFLS(@"IRC_HAD_RAW_ERROR", m.numericReply, [m sequence:1]); + NSString *text = TXTFLS(@"IRCHadRawError", m.numericReply, [m sequence:1]); - [self printBoth:[world selectedChannelOn:self] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[world selectedChannelOn:self] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; return; break; @@ -5340,9 +5364,9 @@ - (void)receiveErrorNumericReply:(IRCMessage *)m case 404: // ERR_CANNOTSENDMESSAGE { NSString *chname = [m paramAt:1]; - NSString *text = TXTFLS(@"IRC_HAD_RAW_ERROR", m.numericReply, [m sequence:2]); + NSString *text = TXTFLS(@"IRCHadRawError", m.numericReply, [m sequence:2]); - [self printBoth:[self findChannel:chname] type:LINE_TYPE_REPLY text:text receivedAt:m.receivedAt]; + [self printBoth:[self findChannel:chname] type:TVCLogLineReplyType text:text receivedAt:m.receivedAt]; return; break; @@ -5368,15 +5392,15 @@ - (void)receiveErrorNumericReply:(IRCMessage *)m - (void)receiveNickCollisionError:(IRCMessage *)m { - if (config.altNicks.count && isLoggedIn == NO) { - ++tryingNickNumber; + if (self.config.altNicks.count && self.isLoggedIn == NO) { + ++self.tryingNickNumber; - NSArray *altNicks = config.altNicks; + NSArray *altNicks = self.config.altNicks; - if (tryingNickNumber < altNicks.count) { - NSString *nick = [altNicks safeObjectAtIndex:tryingNickNumber]; + if (self.tryingNickNumber < altNicks.count) { + NSString *nick = [altNicks safeObjectAtIndex:self.tryingNickNumber]; - [self send:IRCCI_NICK, nick, nil]; + [self send:IRCCommandIndexNick, nick, nil]; } else { [self tryAnotherNick]; } @@ -5387,8 +5411,8 @@ - (void)receiveNickCollisionError:(IRCMessage *)m - (void)tryAnotherNick { - if (sentNick.length >= isupport.nickLen) { - NSString *nick = [sentNick safeSubstringToIndex:isupport.nickLen]; + if (self.sentNick.length >= self.isupport.nickLen) { + NSString *nick = [self.sentNick safeSubstringToIndex:self.isupport.nickLen]; BOOL found = NO; @@ -5399,26 +5423,27 @@ - (void)tryAnotherNick found = YES; NSString *head = [nick safeSubstringToIndex:i]; + NSMutableString *s = [head mutableCopy]; - for (NSInteger i = (isupport.nickLen - s.length); i > 0; --i) { + for (NSInteger i = (self.isupport.nickLen - s.length); i > 0; --i) { [s appendString:@"_"]; } - sentNick = s; + self.sentNick = s; break; } } if (found == NO) { - sentNick = @"0"; + self.sentNick = @"0"; } } else { - sentNick = [sentNick stringByAppendingString:@"_"]; + self.sentNick = [self.sentNick stringByAppendingString:@"_"]; } - [self send:IRCCI_NICK, sentNick, nil]; + [self send:IRCCommandIndexNick, self.sentNick, nil]; } #pragma mark - @@ -5426,21 +5451,21 @@ - (void)tryAnotherNick - (void)changeStateOff { - if (isLoggedIn == NO && isConnecting == NO) return; + if (self.isLoggedIn == NO && self.isConnecting == NO) return; - BOOL prevConnected = isConnected; + BOOL prevConnected = self.isConnected; - [acceptedCaps removeAllObjects]; - capPaused = 0; + [self.acceptedCaps removeAllObjects]; + self.capPaused = 0; - userhostInNames = NO; - multiPrefix = NO; - identifyMsg = NO; - identifyCTCP = NO; + self.userhostInNames = NO; + self.multiPrefix = NO; + self.identifyMsg = NO; + self.identifyCTCP = NO; - conn = nil; + self.conn = nil; - for (IRCChannel *c in channels) { + for (IRCChannel *c in self.channels) { c.status = IRCChannelParted; } @@ -5448,31 +5473,30 @@ - (void)changeStateOff [self stopRetryTimer]; [self stopISONTimer]; - if (reconnectEnabled) { + if (self.reconnectEnabled) { [self startReconnectTimer]; } - sendLagcheckToChannel = isIdentifiedWithSASL = NO; - isConnecting = isConnected = isLoggedIn = isQuitting = NO; - hasIRCopAccess = serverHasNickServ = autojoinInitialized = NO; - + self.sendLagcheckToChannel = self.isIdentifiedWithSASL = NO; + self.isConnecting = self.isConnected = self.isLoggedIn = self.isQuitting = NO; + self.hasIRCopAccess = self.serverHasNickServ = self.autojoinInitialized = NO; - myNick = NSNullObject; - sentNick = NSNullObject; + self.myNick = NSStringEmptyPlaceholder; + self.sentNick = NSStringEmptyPlaceholder; - tryingNickNumber = -1; + self.tryingNickNumber = -1; NSString *disconnectTXTLString = nil; - switch (disconnectType) { - case DISCONNECT_NORMAL: disconnectTXTLString = @"IRC_DISCONNECTED_FROM_SERVER"; break; - case DISCONNECT_SLEEP_MODE: disconnectTXTLString = @"IRC_DISCONNECTED_FROM_SLEEP"; break; - case DISCONNECT_TRIAL_PERIOD: disconnectTXTLString = @"TRIAL_BUILD_NETWORK_DISCONNECTED"; break; + switch (self.disconnectType) { + case IRCDisconnectNormalMode: disconnectTXTLString = @"IRCDisconnectedFromServer"; break; + case IRCSleepModeDisconnectMode: disconnectTXTLString = @"IRCDisconnectedBySleepMode"; break; + case IRCTrialPeriodDisconnectMode: disconnectTXTLString = @"IRCDisconnectedByTrialPeriodTimer"; break; default: break; } if (disconnectTXTLString) { - for (IRCChannel *c in channels) { + for (IRCChannel *c in self.channels) { if (c.isActive) { [c deactivate]; @@ -5483,7 +5507,7 @@ - (void)changeStateOff [self printSystemBoth:nil text:TXTLS(disconnectTXTLString)]; if (prevConnected) { - [self notifyEvent:NOTIFICATION_DISCONNECT lineType:LINE_TYPE_SYSTEM]; + [self notifyEvent:TXNotificationDisconnectType lineType:TVCLogLineSystemType]; } } @@ -5493,71 +5517,71 @@ - (void)changeStateOff [self reloadTree]; - isAway = NO; + self.isAway = NO; } - (void)ircConnectionDidConnect:(IRCConnection *)sender { [self startRetryTimer]; - if (NSDissimilarObjects(connectType, CONNECT_BADSSL_CRT_RECONNECT)) { - [self printSystemBoth:nil text:TXTLS(@"IRC_CONNECTED_TO_SERVER")]; + if (NSDissimilarObjects(self.connectType, IRCBadSSLCertificateReconnectMode)) { + [self printSystemBoth:nil text:TXTLS(@"IRCConnectedToServer")]; } - isLoggedIn = NO; - isConnected = reconnectEnabled = YES; + self.isLoggedIn = NO; + self.isConnected = self.reconnectEnabled = YES; - encoding = config.encoding; + self.encoding = self.config.encoding; - if (NSObjectIsEmpty(inputNick)) { - inputNick = config.nick; + if (NSObjectIsEmpty(self.inputNick)) { + self.inputNick = self.config.nick; } - sentNick = inputNick; - myNick = inputNick; + self.sentNick = self.inputNick; + self.myNick = self.inputNick; - [isupport reset]; + [self.isupport reset]; - NSInteger modeParam = ((config.invisibleMode) ? 8 : 0); + NSInteger modeParam = ((self.config.invisibleMode) ? 8 : 0); - NSString *user = config.username; - NSString *realName = config.realName; + NSString *user = self.config.username; + NSString *realName = self.config.realName; if (NSObjectIsEmpty(user)) { - user = config.nick; + user = self.config.nick; } if (NSObjectIsEmpty(realName)) { - realName = config.nick; + realName = self.config.nick; } - [self send:IRCCI_CAP, @"LS", nil]; + [self send:IRCCommandIndexCap, @"LS", nil]; - if (NSObjectIsNotEmpty(config.password)) { - [self send:IRCCI_PASS, config.password, nil]; + if (NSObjectIsNotEmpty(self.config.password)) { + [self send:IRCCommandIndexPass, self.config.password, nil]; } - [self send:IRCCI_NICK, sentNick, nil]; + [self send:IRCCommandIndexNick, self.sentNick, nil]; - if (config.bouncerMode) { // Fuck psybnc — use ZNC - [self send:IRCCI_USER, user, [NSString stringWithDouble:modeParam], @"*", [@":" stringByAppendingString:realName], nil]; + if (self.config.bouncerMode) { // Fuck psybnc — use ZNC + [self send:IRCCommandIndexUser, user, [NSString stringWithDouble:modeParam], @"*", [@":" stringByAppendingString:realName], nil]; } else { - [self send:IRCCI_USER, user, [NSString stringWithDouble:modeParam], @"*", realName, nil]; + [self send:IRCCommandIndexUser, user, [NSString stringWithDouble:modeParam], @"*", realName, nil]; } - [world reloadTree]; + [self.world reloadTree]; } - (void)ircConnectionDidDisconnect:(IRCConnection *)sender { - if (disconnectType == DISCONNECT_BAD_SSL_CERT) { - NSString *suppKey = [@"Preferences.prompts.cert_trust_error." stringByAppendingString:config.guid]; + if (self.disconnectType == IRCBadSSLCertificateDisconnectMode) { + NSString *suppKey = [@"Preferences.prompts.cert_trust_error." stringByAppendingString:self.config.guid]; - if (config.isTrustedConnection == NO) { - BOOL status = [PopupPrompts dialogWindowWithQuestion:TXTLS(@"SSL_SOCKET_BAD_CERTIFICATE_ERROR_MESSAGE") - title:TXTLS(@"SSL_SOCKET_BAD_CERTIFICATE_ERROR_TITLE") - defaultButton:TXTLS(@"TRUST_BUTTON") - alternateButton:TXTLS(@"CANCEL_BUTTON") + if (self.config.isTrustedConnection == NO) { + BOOL status = [TLOPopupPrompts dialogWindowWithQuestion:TXTLS(@"SocketBadSSLCertificateErrorMessage") + title:TXTLS(@"SocketBadSSLCertificateErrorTitle") + defaultButton:TXTLS(@"TrustButton") + alternateButton:TXTLS(@"CancelButton") otherButton:nil suppressionKey:suppKey suppressionText:@"-"]; @@ -5565,9 +5589,9 @@ - (void)ircConnectionDidDisconnect:(IRCConnection *)sender [_NSUserDefaults() setBool:status forKey:suppKey]; if (status) { - config.isTrustedConnection = status; + self.config.isTrustedConnection = status; - [self connect:CONNECT_BADSSL_CRT_RECONNECT]; + [self connect:IRCBadSSLCertificateReconnectMode]; return; } @@ -5584,12 +5608,12 @@ - (void)ircConnectionDidError:(NSString *)error - (void)ircConnectionDidReceive:(NSData *)data { - lastMessageReceived = [NSDate epochTime]; + self.lastMessageReceived = [NSDate epochTime]; - NSString *s = [NSString stringWithData:data encoding:encoding]; + NSString *s = [NSString stringWithData:data encoding:self.encoding]; if (PointerIsEmpty(s)) { - s = [NSString stringWithData:data encoding:config.fallbackEncoding]; + s = [NSString stringWithData:data encoding:self.config.fallbackEncoding]; if (PointerIsEmpty(s)) { s = [NSString stringWithData:data encoding:NSUTF8StringEncoding]; @@ -5602,14 +5626,14 @@ - (void)ircConnectionDidReceive:(NSData *)data } } - world.messagesReceived++; - world.bandwidthIn += [s length]; + self.world.messagesReceived++; + self.world.bandwidthIn += [s length]; - if (rawModeEnabled) { + if (self.rawModeEnabled) { NSLog(@" >> %@", s); } - if ([Preferences removeAllFormatting]) { + if ([TPCPreferences removeAllFormatting]) { s = [s stripEffects]; } @@ -5620,7 +5644,7 @@ - (void)ircConnectionDidReceive:(NSData *)data if (m.numericReply > 0) { [self receiveNumericReply:m]; } else { - switch ([Preferences commandUIndex:cmd]) { + switch ([TPCPreferences commandUIndex:cmd]) { case 4: // Command: ERROR { [self receiveError:m]; @@ -5663,7 +5687,6 @@ - (void)ircConnectionDidReceive:(NSData *)data break; } case 15: // Command: PART - { [self receivePart:m]; break; @@ -5697,7 +5720,7 @@ - (void)ircConnectionDidReceive:(NSData *)data [m.params safeRemoveObjectAtIndex:1]; [m.params safeInsertObject:[NSString stringWithFormat:@"[%@]: %@", m.command, text] atIndex:1]; - m.command = IRCCI_NOTICE; + m.command = IRCCommandIndexNotice; [self receivePrivmsgAndNotice:m]; @@ -5712,11 +5735,11 @@ - (void)ircConnectionDidReceive:(NSData *)data } } - if ([[world bundlesForServerInput] containsKey:cmd]) { + if ([[self.world bundlesForServerInput] containsKey:cmd]) { [[self invokeInBackgroundThread] processBundlesServerMessage:m]; } - [world updateTitle]; + [self.world updateTitle]; } - (void)ircConnectionWillSend:(NSString *)line @@ -5731,11 +5754,9 @@ + (void)load if (NSDissimilarObjects(self, [IRCClient class])) return; @autoreleasepool { - dateTimeFormatter = [NSDateFormatter new]; [dateTimeFormatter setDateStyle:NSDateFormatterLongStyle]; [dateTimeFormatter setTimeStyle:NSDateFormatterLongStyle]; - } } diff --git a/Classes/IRC/IRCClientConfig.m b/Classes/IRC/IRCClientConfig.m index 8ed2ed10f2..8459f66211 100755 --- a/Classes/IRC/IRCClientConfig.m +++ b/Classes/IRC/IRCClientConfig.m @@ -56,15 +56,15 @@ - (id)init self.channels = [NSMutableArray new]; self.loginCommands = [NSMutableArray new]; - self.host = NSNullObject; + self.host = NSStringEmptyPlaceholder; self.port = 6667; - self.password = NSNullObject; - self.nickPassword = NSNullObject; + self.password = NSStringEmptyPlaceholder; + self.nickPassword = NSStringEmptyPlaceholder; - self.proxyHost = NSNullObject; + self.proxyHost = NSStringEmptyPlaceholder; self.proxyPort = 1080; - self.proxyUser = NSNullObject; - self.proxyPassword = NSNullObject; + self.proxyUser = NSStringEmptyPlaceholder; + self.proxyPassword = NSStringEmptyPlaceholder; self.prefersIPv6 = NO; @@ -72,16 +72,16 @@ - (id)init self.fallbackEncoding = NSISOLatin1StringEncoding; self.outgoingFloodControl = NO; - self.floodControlMaximumMessages = FLOOD_CONTROL_DEFAULT_MESSAGE_COUNT; - self. floodControlDelayTimerInterval = FLOOD_CONTROL_DEFAULT_DELAY_TIMER; + self.floodControlMaximumMessages = TXFloodControlDefaultMessageCount; + self. floodControlDelayTimerInterval = TXFloodControlDefaultDelayTimer; - self.name = TXTLS(@"UNTITLED_CONNECTION_NAME"); - self.nick = [Preferences defaultNickname]; - self.username = [Preferences defaultUsername]; - self.realName = [Preferences defaultRealname]; + self.name = TXTLS(@"DefaultNewConnectionName"); + self.nick = [TPCPreferences defaultNickname]; + self.username = [TPCPreferences defaultUsername]; + self.realName = [TPCPreferences defaultRealname]; - self.leavingComment = TXTLS(@"DEFAULT_QPS_MESSAGE"); - self.sleepQuitMessage = TXTLS(@"SLEEPING_APPLICATION_QUIT_MESSAGE"); + self.leavingComment = TXTLS(@"DefaultDisconnectQuitMessage"); + self.sleepQuitMessage = TXTLS(@"OSXGoingToSleepQuitMessage"); } return self; @@ -208,7 +208,7 @@ - (id)initWithDictionary:(NSDictionary *)dic self.name = [dic stringForKey:@"name"]; } - self.host = (([dic stringForKey:@"host"]) ?: NSNullObject); + self.host = (([dic stringForKey:@"host"]) ?: NSStringEmptyPlaceholder); self.port = (([dic integerForKey:@"port"]) ?: 6667); if ([dic stringForKey:@"nick"]) { @@ -227,11 +227,11 @@ - (id)initWithDictionary:(NSDictionary *)dic [self.altNicks addObjectsFromArray:[dic arrayForKey:@"alt_nicks"]]; - self.proxyType = (ProxyType)[dic integerForKey:@"proxy"]; + self.proxyType = (TXConnectionProxyType)[dic integerForKey:@"proxy"]; self.proxyPort = (([dic integerForKey:@"proxy_port"]) ?: 1080); - self.proxyHost = (([dic stringForKey:@"proxy_host"]) ?: NSNullObject); - self.proxyUser = (([dic stringForKey:@"proxy_user"]) ?: NSNullObject); - self.proxyPassword = (([dic stringForKey:@"proxy_password"]) ?: NSNullObject); + self.proxyHost = (([dic stringForKey:@"proxy_host"]) ?: NSStringEmptyPlaceholder); + self.proxyUser = (([dic stringForKey:@"proxy_user"]) ?: NSStringEmptyPlaceholder); + self.proxyPassword = (([dic stringForKey:@"proxy_password"]) ?: NSStringEmptyPlaceholder); self.autoConnect = [dic boolForKey:@"auto_connect"]; self.autoReconnect = [dic boolForKey:@"auto_reconnect"]; @@ -264,9 +264,9 @@ - (id)initWithDictionary:(NSDictionary *)dic } for (NSDictionary *e in [dic arrayForKey:@"ignores"]) { - AddressBook *ignore; + IRCAddressBook *ignore; - ignore = [AddressBook alloc]; + ignore = [IRCAddressBook alloc]; ignore = [ignore initWithDictionary:e]; ignore = ignore; @@ -279,8 +279,8 @@ - (id)initWithDictionary:(NSDictionary *)dic if (NSObjectIsNotEmpty(e)) { self.outgoingFloodControl = [e boolForKey:@"outgoing"]; - self.floodControlMaximumMessages = (([e integerForKey:@"message_count"]) ?: FLOOD_CONTROL_DEFAULT_MESSAGE_COUNT); - self.floodControlDelayTimerInterval = (([e integerForKey:@"delay_timer"]) ?: FLOOD_CONTROL_DEFAULT_DELAY_TIMER); + self.floodControlMaximumMessages = (([e integerForKey:@"message_count"]) ?: TXFloodControlDefaultMessageCount); + self.floodControlDelayTimerInterval = (([e integerForKey:@"delay_timer"]) ?: TXFloodControlDefaultDelayTimer); } } else { if ([self.host hasSuffix:@"freenode.net"]) { @@ -344,7 +344,7 @@ - (NSMutableDictionary *)dictionaryValue [channelAry safeAddObject:[e dictionaryValue]]; } - for (AddressBook *e in self.ignores) { + for (IRCAddressBook *e in self.ignores) { [ignoreAry safeAddObject:[e dictionaryValue]]; } diff --git a/Classes/IRC/IRCConnection.m b/Classes/IRC/IRCConnection.m index d1e65bb5d1..d681409df9 100755 --- a/Classes/IRC/IRCConnection.m +++ b/Classes/IRC/IRCConnection.m @@ -36,7 +36,7 @@ - (id)init self.sendQueue = [NSMutableArray new]; - self.timer = [Timer new]; + self.timer = [TLOTimer new]; self.timer.delegate = self; } @@ -55,7 +55,7 @@ - (void)open self.maxMsgCount = 0; - self.conn = [TCPClient new]; + self.conn = [TLOSocketClient new]; self.conn.delegate = self; self.conn.host = self.host; self.conn.port = self.port; @@ -210,7 +210,7 @@ - (void)timerOnTimer:(id)sender } } -- (void)tcpClientDidConnect:(TCPClient *)sender +- (void)tcpClientDidConnect:(TLOSocketClient *)sender { [self.sendQueue removeAllObjects]; @@ -219,7 +219,7 @@ - (void)tcpClientDidConnect:(TCPClient *)sender } } -- (void)tcpClient:(TCPClient *)sender error:(NSString *)error +- (void)tcpClient:(TLOSocketClient *)sender error:(NSString *)error { [self.timer stop]; @@ -230,7 +230,7 @@ - (void)tcpClient:(TCPClient *)sender error:(NSString *)error } } -- (void)tcpClientDidDisconnect:(TCPClient *)sender +- (void)tcpClientDidDisconnect:(TLOSocketClient *)sender { [self.timer stop]; @@ -241,7 +241,7 @@ - (void)tcpClientDidDisconnect:(TCPClient *)sender } } -- (void)tcpClientDidReceiveData:(TCPClient *)sender +- (void)tcpClientDidReceiveData:(TLOSocketClient *)sender { while (1 == 1) { NSData *data = [self.conn readLine]; @@ -254,7 +254,7 @@ - (void)tcpClientDidReceiveData:(TCPClient *)sender } } -- (void)tcpClientDidSendData:(TCPClient *)sender +- (void)tcpClientDidSendData:(TLOSocketClient *)sender { self.sending = NO; diff --git a/Classes/IRC/IRCExtras.m b/Classes/IRC/IRCExtras.m index fcaa40913b..e2b99002d0 100755 --- a/Classes/IRC/IRCExtras.m +++ b/Classes/IRC/IRCExtras.m @@ -73,7 +73,7 @@ - (void)parseIRCProtocolURI:(NSString *)location tempval = [tempval safeSubstringFromIndex:chopIndex]; - if ([TXRegularExpression string:tempval isMatchedByRegex:@"^([0-9]{1,6})$"]) { + if ([TLORegularExpression string:tempval isMatchedByRegex:@"^([0-9]{1,6})$"]) { port = [tempval integerValue]; } } @@ -182,14 +182,14 @@ - (void)createConnectionAndJoinChannel:(NSString *)s chan:(NSString *)c tempval = [tempval safeSubstringFromIndex:chopIndex]; - if ([TXRegularExpression string:tempval isMatchedByRegex:@"^([0-9]{1,6})$"]) { + if ([TLORegularExpression string:tempval isMatchedByRegex:@"^([0-9]{1,6})$"]) { port = [tempval integerValue]; } } else { if (NSObjectIsNotEmpty(base)) { tempval = [base getToken]; - if ([TXRegularExpression string:tempval isMatchedByRegex:@"^(\\+?[0-9]{1,6})$"]) { + if ([TLORegularExpression string:tempval isMatchedByRegex:@"^(\\+?[0-9]{1,6})$"]) { if ([tempval hasPrefix:@"+"]) { tempval = [tempval safeSubstringFromIndex:1]; useSSL = YES; @@ -221,10 +221,10 @@ - (void)createConnectionAndJoinChannel:(NSString *)s chan:(NSString *)c [dic setBool:useSSL forKey:@"ssl"]; [dic setBool:NO forKey:@"auto_connect"]; - - [dic setObject:[Preferences defaultNickname] forKey:@"nickname"]; - [dic setObject:[Preferences defaultUsername] forKey:@"username"]; - [dic setObject:[Preferences defaultRealname] forKey:@"realname"]; + + [dic setObject:[TPCPreferences defaultNickname] forKey:@"nickname"]; + [dic setObject:[TPCPreferences defaultUsername] forKey:@"username"]; + [dic setObject:[TPCPreferences defaultRealname] forKey:@"realname"]; [dic setObject:NSNumberWithLong(NSUTF8StringEncoding) forKey:@"encoding"]; diff --git a/Classes/IRC/IRCISupportInfo.m b/Classes/IRC/IRCISupportInfo.m index ee58bff9db..ce8d17c18e 100755 --- a/Classes/IRC/IRCISupportInfo.m +++ b/Classes/IRC/IRCISupportInfo.m @@ -3,8 +3,8 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define ISUPPORT_SUFFIX @" are supported by this server" -#define OP_VALUE 100 +#define _isupportSuffix @" are supported by this server" +#define _opValue 100 @interface IRCISupportInfo (Private) - (void)setValue:(NSInteger)value forMode:(unsigned char)m; @@ -36,19 +36,19 @@ - (id)init - (void)reset { - memset(modes, 0, MODES_SIZE); + memset(modes, 0, TXModesSize); self.nickLen = 9; self.modesCount = 3; - [self setValue:OP_VALUE forMode:'o']; - [self setValue:OP_VALUE forMode:'h']; - [self setValue:OP_VALUE forMode:'v']; - [self setValue:OP_VALUE forMode:'a']; - [self setValue:OP_VALUE forMode:'q']; - [self setValue:OP_VALUE forMode:'b']; - [self setValue:OP_VALUE forMode:'e']; - [self setValue:OP_VALUE forMode:'u']; + [self setValue:_opValue forMode:'o']; + [self setValue:_opValue forMode:'h']; + [self setValue:_opValue forMode:'v']; + [self setValue:_opValue forMode:'a']; + [self setValue:_opValue forMode:'q']; + [self setValue:_opValue forMode:'b']; + [self setValue:_opValue forMode:'e']; + [self setValue:_opValue forMode:'u']; [self setValue:1 forMode:'I']; [self setValue:1 forMode:'R']; @@ -68,11 +68,11 @@ - (void)reset - (BOOL)update:(NSString *)str client:(IRCClient *)client { - if ([str hasSuffix:ISUPPORT_SUFFIX]) { - str = [str safeSubstringToIndex:(str.length - [ISUPPORT_SUFFIX length])]; + if ([str hasSuffix:_isupportSuffix]) { + str = [str safeSubstringToIndex:(str.length - [_isupportSuffix length])]; } - NSArray *ary = [str split:NSWhitespaceCharacter]; + NSArray *ary = [str split:NSStringWhitespacePlaceholder]; for (NSString *s in ary) { NSString *key = s; @@ -177,7 +177,7 @@ - (BOOL)hasParamForMode:(unsigned char)m plus:(BOOL)plus case 1: return YES; break; case 2: return YES; break; case 3: return plus; break; - case OP_VALUE: return YES; break; + case _opValue: return YES; break; default: return NO; break; } } @@ -218,7 +218,7 @@ - (void)parsePrefix:(NSString *)value self.userModeVPrefix = modeChar; } - [self setValue:OP_VALUE forMode:rawKey]; + [self setValue:_opValue forMode:rawKey]; } } } @@ -273,7 +273,7 @@ - (IRCModeInfo *)createMode:(NSString *)mode m.mode = [mode characterAtIndex:0]; m.plus = NO; - m.param = NSNullObject; + m.param = NSStringEmptyPlaceholder; return m; } diff --git a/Classes/IRC/IRCMessage.m b/Classes/IRC/IRCMessage.m index 8eebdd5cfa..a042d29db1 100755 --- a/Classes/IRC/IRCMessage.m +++ b/Classes/IRC/IRCMessage.m @@ -17,7 +17,7 @@ @implementation IRCMessage - (id)init { if ((self = [super init])) { - [self parseLine:NSNullObject]; + [self parseLine:NSStringEmptyPlaceholder]; } return self; @@ -34,7 +34,7 @@ - (id)initWithLine:(NSString *)line - (void)parseLine:(NSString *)line { - self.command = NSNullObject; + self.command = NSStringEmptyPlaceholder; self.sender = [IRCPrefix new]; self.params = [NSMutableArray new]; @@ -97,7 +97,7 @@ - (NSString *)paramAt:(NSInteger)index if (index < self.params.count) { return [self.params safeObjectAtIndex:index]; } else { - return NSNullObject; + return NSStringEmptyPlaceholder; } } @@ -118,7 +118,7 @@ - (NSString *)sequence:(NSInteger)index NSString *e = [self.params safeObjectAtIndex:i]; if (NSDissimilarObjects(i, index)) { - [s appendString:NSWhitespaceCharacter]; + [s appendString:NSStringWhitespacePlaceholder]; } [s appendString:e]; @@ -135,7 +135,7 @@ - (NSString *)description [ms appendString:self.command]; for (NSString *s in self.params) { - [ms appendString:NSWhitespaceCharacter]; + [ms appendString:NSStringWhitespacePlaceholder]; [ms appendString:s]; } diff --git a/Classes/IRC/IRCPrefix.m b/Classes/IRC/IRCPrefix.m index ba57f87a19..a5fb4a416d 100755 --- a/Classes/IRC/IRCPrefix.m +++ b/Classes/IRC/IRCPrefix.m @@ -13,10 +13,10 @@ @implementation IRCPrefix - (id)init { if ((self = [super init])) { - self.raw = NSNullObject; - self.nick = NSNullObject; - self.user = NSNullObject; - self.address = NSNullObject; + self.raw = NSStringEmptyPlaceholder; + self.nick = NSStringEmptyPlaceholder; + self.user = NSStringEmptyPlaceholder; + self.address = NSStringEmptyPlaceholder; } return self; diff --git a/Classes/IRC/IRCSendingMessage.m b/Classes/IRC/IRCSendingMessage.m index 4d7b5ac948..22de4efc28 100755 --- a/Classes/IRC/IRCSendingMessage.m +++ b/Classes/IRC/IRCSendingMessage.m @@ -30,21 +30,21 @@ - (NSString *)string if (NSObjectIsEmpty(self.string)) { BOOL forceCompleteColon = NO; - if ([self.command isEqualToString:IRCCI_PRIVMSG] || - [self.command isEqualToString:IRCCI_NOTICE]) { + if ([self.command isEqualToString:IRCCommandIndexPrivmsg] || + [self.command isEqualToString:IRCCommandIndexNotice]) { forceCompleteColon = YES; - } else if ([self.command isEqualToString:IRCCI_NICK] - || [self.command isEqualToString:IRCCI_MODE] - || [self.command isEqualToString:IRCCI_JOIN] - || [self.command isEqualToString:IRCCI_NAMES] - || [self.command isEqualToString:IRCCI_WHO] - || [self.command isEqualToString:IRCCI_LIST] - || [self.command isEqualToString:IRCCI_INVITE] - || [self.command isEqualToString:IRCCI_WHOIS] - || [self.command isEqualToString:IRCCI_WHOWAS] - || [self.command isEqualToString:IRCCI_ISON] - || [self.command isEqualToString:IRCCI_USER]) { + } else if ([self.command isEqualToString:IRCCommandIndexNick] + || [self.command isEqualToString:IRCCommandIndexMode] + || [self.command isEqualToString:IRCCommandIndexJoin] + || [self.command isEqualToString:IRCCommandIndexNames] + || [self.command isEqualToString:IRCCommandIndexWho] + || [self.command isEqualToString:IRCCommandIndexList] + || [self.command isEqualToString:IRCCommandIndexInvite] + || [self.command isEqualToString:IRCCommandIndexWhois] + || [self.command isEqualToString:IRCCommandIndexWhowas] + || [self.command isEqualToString:IRCCommandIndexIson] + || [self.command isEqualToString:IRCCommandIndexUser]) { self.completeColon = NO; } @@ -59,11 +59,11 @@ - (NSString *)string for (NSInteger i = 0; i < (count - 1); ++i) { NSString *s = [self.params safeObjectAtIndex:i]; - [d appendString:NSWhitespaceCharacter]; + [d appendString:NSStringWhitespacePlaceholder]; [d appendString:s]; } - [d appendString:NSWhitespaceCharacter]; + [d appendString:NSStringWhitespacePlaceholder]; NSString *s = [self.params safeObjectAtIndex:(count - 1)]; diff --git a/Classes/IRC/IRCTreeItem.m b/Classes/IRC/IRCTreeItem.m index 9a650dcd48..5bdfa83af4 100755 --- a/Classes/IRC/IRCTreeItem.m +++ b/Classes/IRC/IRCTreeItem.m @@ -17,6 +17,9 @@ @implementation IRCTreeItem @synthesize dockUnreadCount; @synthesize currentInputHistory; +#warning "-resetLogView:withChannel:andClient:" does not function properly. \ + It does not create new view when destroying the old. + - (void)resetLogView:(IRCWorld *)world withChannel:(IRCChannel *)c andClient:(IRCClient *)u @@ -61,12 +64,12 @@ - (IRCTreeItem *)childAtIndex:(NSInteger)index - (NSString *)label { - return NSNullObject; + return NSStringEmptyPlaceholder; } - (NSString *)name { - return NSNullObject; + return NSStringEmptyPlaceholder; } @end \ No newline at end of file diff --git a/Classes/IRC/IRCUser.m b/Classes/IRC/IRCUser.m index 6bbfc39e41..0651d16992 100755 --- a/Classes/IRC/IRCUser.m +++ b/Classes/IRC/IRCUser.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define COLOR_NUMBER_MAX 30 +#define _colorNumberMax 30 @interface IRCUser (Private) - (void)decayConversation; @@ -19,6 +19,7 @@ @implementation IRCUser @synthesize h; @synthesize v; @synthesize isMyself; +@synthesize isIRCOp; @synthesize incomingWeight; @synthesize outgoingWeight; @synthesize colorNumber; @@ -44,11 +45,11 @@ - (NSString *)banMask } else { NSString *ident = ((self.username) ?: @"*"); - switch ([Preferences banFormat]) { - case HMBAN_FORMAT_WHNIN: return [NSString stringWithFormat:@"*!*@%@", self.address]; - case HMBAN_FORMAT_WHAINN: return [NSString stringWithFormat:@"*!%@@%@", ident, self.address]; - case HMBAN_FORMAT_WHANNI: return [NSString stringWithFormat:@"%@!*%@", self.nick, self.address]; - case HMBAN_FORMAT_EXACT: return [NSString stringWithFormat:@"%@!%@@%@", self.nick, ident, self.address]; + switch ([TPCPreferences banFormat]) { + case TXHostmaskBanWHNINFormat: return [NSString stringWithFormat:@"*!*@%@", self.address]; + case TXHostmaskBanWHAINNFormat: return [NSString stringWithFormat:@"*!%@@%@", ident, self.address]; + case TXHostmaskBanWHANNIFormat: return [NSString stringWithFormat:@"%@!*%@", self.nick, self.address]; + case TXHostmaskBanExactFormat: return [NSString stringWithFormat:@"%@!%@@%@", self.nick, ident, self.address]; } } @@ -80,9 +81,9 @@ - (NSInteger)colorNumber { if (colorNumber < 0) { if ([_NSUserDefaults() boolForKey:@"UUIDBasedNicknameColorHashing"]) { - self.colorNumber = (CFHash((__bridge CFTypeRef)([NSString stringWithUUID])) % COLOR_NUMBER_MAX); + self.colorNumber = (CFHash((__bridge CFTypeRef)([NSString stringWithUUID])) % _colorNumberMax); } else { - self.colorNumber = (CFHash((__bridge CFTypeRef)([self.nick lowercaseString])) % COLOR_NUMBER_MAX); + self.colorNumber = (CFHash((__bridge CFTypeRef)([self.nick lowercaseString])) % _colorNumberMax); } } diff --git a/Classes/IRC/IRCWorld.m b/Classes/IRC/IRCWorld.m index 98d6631672..fca97d313c 100755 --- a/Classes/IRC/IRCWorld.m +++ b/Classes/IRC/IRCWorld.m @@ -3,14 +3,14 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 09, 2012 -#define AUTO_CONNECT_DELAY 1 -#define RECONNECT_AFTER_WAKE_UP_DELAY 8 +#define _autoConnectDelay 1 +#define _reconnectAfterWakeupDelay 8 -#define TREE_DRAG_ITEM_TYPE @"tree" -#define TREE_DRAG_ITEM_TYPES [NSArray arrayWithObject:TREE_DRAG_ITEM_TYPE] +#define _treeDragItemType @"tree" +#define _treeDragItemTypes [NSArray arrayWithObject:_treeDragItemType] -#define TREE_CLIENT_HEIGHT 21.0 -#define TREE_CHANNEL_HEIGHT 18.0 +#define _treeClientHeight 21.0 +#define _treeChannelHeight 18.0 @interface IRCWorld (Private) - (void)storePreviousSelection; @@ -90,7 +90,7 @@ - (void)setupTree { [self.serverList setTarget:self]; [self.serverList setDoubleAction:@selector(outlineViewDoubleClicked:)]; - [self.serverList registerForDraggedTypes:TREE_DRAG_ITEM_TYPES]; + [self.serverList registerForDraggedTypes:_treeDragItemTypes]; IRCClient *client = nil; @@ -118,8 +118,8 @@ - (void)setupTree - (void)save { - [Preferences saveWorld:[self dictionaryValue]]; - [Preferences sync]; + [TPCPreferences saveWorld:[self dictionaryValue]]; + [TPCPreferences sync]; } - (NSMutableDictionary *)dictionaryValue @@ -207,12 +207,12 @@ - (void)resetLoadedBundles - (void)addHighlightInChannel:(IRCChannel *)channel withMessage:(NSString *)message { - if ([Preferences logAllHighlightsToQuery]) { + if ([TPCPreferences logAllHighlightsToQuery]) { message = [message trim]; NSString *time = [NSString stringWithInteger:[NSDate epochTime]]; NSArray *entry = [NSArray arrayWithObjects:channel.name, time, - [message attributedStringWithIRCFormatting:DefaultListViewFont], nil]; + [message attributedStringWithIRCFormatting:TXDefaultListViewControllerFont], nil]; /* We insert at head so that latest is always at top. */ [channel.client.highlights insertObject:entry atIndex:0]; @@ -233,14 +233,14 @@ - (void)autoConnectAfterWakeup:(BOOL)afterWakeUp NSInteger delay = 0; - if (afterWakeUp) delay += RECONNECT_AFTER_WAKE_UP_DELAY; + if (afterWakeUp) delay += _reconnectAfterWakeupDelay; for (IRCClient *c in self.clients) { - if ((c.disconnectType == DISCONNECT_SLEEP_MODE && afterWakeUp) || afterWakeUp == NO) { + if ((c.disconnectType == IRCSleepModeDisconnectMode && afterWakeUp) || afterWakeUp == NO) { if (c.config.autoConnect) { [c autoConnect:delay]; - delay += AUTO_CONNECT_DELAY; + delay += _autoConnectDelay; } } } @@ -256,7 +256,7 @@ - (void)terminate - (void)prepareForSleep { for (IRCClient *c in self.clients) { - c.disconnectType = DISCONNECT_SLEEP_MODE; + c.disconnectType = IRCSleepModeDisconnectMode; [c quit:c.config.sleepQuitMessage]; } @@ -285,7 +285,7 @@ - (void)markAllAsRead c.treeUnreadCount = 0; c.keywordCount = 0; - if ([Preferences autoAddScrollbackMark]) { + if ([TPCPreferences autoAddScrollbackMark]) { [c.log unmark]; [c.log mark]; } @@ -309,13 +309,13 @@ - (void)markAllScrollbacks - (void)updateIcon { - if ([Preferences displayDockBadge]) { + if ([TPCPreferences displayDockBadge]) { NSInteger messageCount = 0; NSInteger highlightCount = 0; for (IRCClient *u in self.clients) { for (IRCChannel *c in u.channels) { - if ([c.name isEqualToString:TXTLS(@"SERVER_NOTICES_WINDOW_TITLE")] == NO) { + if ([c.name isEqualToString:TXTLS(@"ServerNoticeTreeItemTitle")] == NO) { messageCount += [c dockUnreadCount]; highlightCount += [c keywordCount]; } @@ -323,9 +323,9 @@ - (void)updateIcon } if (messageCount == 0 && highlightCount == 0) { - [DockIcon drawWithoutCounts]; + [TVCDockIcon drawWithoutCounts]; } else { - [DockIcon drawWithHilightCount:highlightCount messageCount:messageCount]; + [TVCDockIcon drawWithHilightCount:highlightCount messageCount:messageCount]; } } } @@ -409,11 +409,11 @@ - (void)preferencesChanged } } -- (void)notifyOnGrowl:(NotificationType)type title:(NSString *)title +- (void)notifyOnGrowl:(TXNotificationType)type title:(NSString *)title desc:(NSString *)desc userInfo:(NSDictionary *)info { - if ([Preferences growlEnabledForEvent:type] == NO) return; - if ([Preferences stopGrowlOnActive] && [self.window isOnCurrentWorkspace]) return; + if ([TPCPreferences growlEnabledForEvent:type] == NO) return; + if ([TPCPreferences stopGrowlOnActive] && [self.window isOnCurrentWorkspace]) return; [self.growl notify:type title:title desc:desc userInfo:info]; } @@ -424,7 +424,7 @@ - (void)notifyOnGrowl:(NotificationType)type title:(NSString *)title - (void)updateTitle { if (PointerIsEmpty(selected)) { - [window setTitle:[Preferences applicationName]]; + [window setTitle:[TPCPreferences applicationName]]; return; } @@ -480,12 +480,12 @@ - (void)updateTitle } if (c.isChannel) { - [title appendFormat:TXTLS(@"CHANNEL_APPLICATION_TITLE_USERS"), [c.members count]]; + [title appendFormat:TXTLS(@"ChannelApplicationTitleUserCount"), [c.members count]]; NSString *modes = [c.mode titleString]; if ([modes length] >= 2) { - [title appendFormat:TXTLS(@"CHANNEL_APPLICATION_TITLE_MODES"), modes]; + [title appendFormat:TXTLS(@"ChannelApplicationTitleModeValue"), modes]; } } @@ -627,7 +627,7 @@ - (void)selectClientAt:(NSInteger)n - (void)reloadTheme { - self.viewTheme.name = [Preferences themeName]; + self.viewTheme.name = [TPCPreferences themeName]; NSMutableArray *logs = [NSMutableArray array]; @@ -639,7 +639,7 @@ - (void)reloadTheme } } - for (LogController *log in logs) { + for (TVCLogController *log in logs) { [log reloadTheme]; } } @@ -690,8 +690,8 @@ - (IRCClient *)createClient:(IRCClientConfig *)seed reload:(BOOL)reload c.uid = ++self.itemId; c.world = self; - if ([Preferences inputHistoryIsChannelSpecific]) { - c.inputHistory = [InputHistory new]; + if ([TPCPreferences inputHistoryIsChannelSpecific]) { + c.inputHistory = [TLOInputHistory new]; } c.log = [self createLogWithClient:c channel:nil]; @@ -724,8 +724,8 @@ - (IRCChannel *)createChannel:(IRCChannelConfig *)seed client:(IRCClient *)clien c.client = client; c.mode.isupport = client.isupport; - if ([Preferences inputHistoryIsChannelSpecific]) { - c.inputHistory = [InputHistory new]; + if ([TPCPreferences inputHistoryIsChannelSpecific]) { + c.inputHistory = [TLOInputHistory new]; } [c setup:seed]; @@ -733,7 +733,7 @@ - (IRCChannel *)createChannel:(IRCChannelConfig *)seed client:(IRCClient *)clien c.log = [self createLogWithClient:client channel:c]; switch (seed.type) { - case CHANNEL_TYPE_CHANNEL: + case IRCChannelNormalType: { NSInteger n = [client indexOfTalkChannel]; @@ -759,7 +759,7 @@ - (IRCChannel *)createTalk:(NSString *)nick client:(IRCClient *)client IRCChannelConfig *seed = [[IRCChannelConfig alloc] init]; seed.name = nick; - seed.type = CHANNEL_TYPE_TALK; + seed.type = IRCChannelPrivateMessageType; IRCChannel *c = [self createChannel:seed client:client reload:YES adjust:YES]; @@ -891,9 +891,9 @@ - (void)destroyChannel:(IRCChannel *)c part:(BOOL)forcePart } } -- (LogController *)createLogWithClient:(IRCClient *)client channel:(IRCChannel *)channel +- (TVCLogController *)createLogWithClient:(IRCClient *)client channel:(IRCChannel *)channel { - LogController *c = [LogController new]; + TVCLogController *c = [TVCLogController new]; c.menu = self.logMenu; c.urlMenu = self.urlMenu; @@ -903,7 +903,7 @@ - (LogController *)createLogWithClient:(IRCClient *)client channel:(IRCChannel * c.world = self; c.client = client; c.channel = channel; - c.maxLines = [Preferences maxLogLines]; + c.maxLines = [TPCPreferences maxLogLines]; c.theme = self.viewTheme; @@ -922,8 +922,8 @@ - (void)logKeyDown:(NSEvent *)e [self focusInputText]; switch (e.keyCode) { - case KEY_RETURN: - case KEY_ENTER: + case TXKeyReturnCode: + case TXKeyEnterCode: return; } @@ -974,11 +974,11 @@ - (void)outlineViewDoubleClicked:(id)sender if (PointerIsEmpty(c)) { if (u.isConnecting || u.isConnected || u.isLoggedIn) { - if ([Preferences disconnectOnDoubleclick]) { + if ([TPCPreferences disconnectOnDoubleclick]) { [u quit]; } } else { - if ([Preferences connectOnDoubleclick]) { + if ([TPCPreferences connectOnDoubleclick]) { [u connect]; } } @@ -987,11 +987,11 @@ - (void)outlineViewDoubleClicked:(id)sender } else { if (u.isLoggedIn) { if (c.isActive) { - if ([Preferences leaveOnDoubleclick]) { + if ([TPCPreferences leaveOnDoubleclick]) { [u partChannel:c]; } } else { - if ([Preferences joinOnDoubleclick]) { + if ([TPCPreferences joinOnDoubleclick]) { [u joinChannel:c]; } } @@ -1031,13 +1031,13 @@ - (void)outlineViewSelectionIsChanging:(NSNotification *)note - (CGFloat)outlineView:(NSOutlineView *)outlineView heightOfRowByItem:(IRCTreeItem *)item { if (PointerIsEmpty(item) || item.isClient) { - return TREE_CLIENT_HEIGHT; + return _treeClientHeight; } - return TREE_CHANNEL_HEIGHT; + return _treeChannelHeight; } -- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(ServerListCell *)cell forTableColumn:(NSTableColumn *)tableColumn item:(IRCTreeItem *)item +- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(TVCServerListCell *)cell forTableColumn:(NSTableColumn *)tableColumn item:(IRCTreeItem *)item { cell.parent = self.serverList; cell.cellItem = item; @@ -1082,7 +1082,7 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)note [self.selected resetState]; - LogController *log = [self.selected log]; + TVCLogController *log = [self.selected log]; self.logBase.contentView = [log view]; [log notifyDidBecomeVisible]; @@ -1108,19 +1108,19 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)note [self.selected.log.view clearSelection]; - if ([Preferences inputHistoryIsChannelSpecific]) { + if ([TPCPreferences inputHistoryIsChannelSpecific]) { NSAttributedString *inputValue = [self.text attributedStringValue]; self.master.inputHistory = self.selected.inputHistory; IRCTreeItem *previous = [self previouslySelectedItem]; - InputHistory *oldHistory = previous.inputHistory; - InputHistory *newHistory = self.selected.inputHistory; + TLOInputHistory *oldHistory = previous.inputHistory; + TLOInputHistory *newHistory = self.selected.inputHistory; [oldHistory setLastHistoryItem:inputValue]; - [self.text setStringValue:NSNullObject]; + [self.text setStringValue:NSStringEmptyPlaceholder]; if (NSObjectIsNotEmpty(newHistory.lastHistoryItem)) { [self.text setAttributedStringValue:newHistory.lastHistoryItem]; @@ -1156,9 +1156,9 @@ - (BOOL)outlineView:(NSOutlineView *)sender writeItems:(NSArray *)items toPasteb s = [NSString stringWithFormat:@"%ld-%ld", c.client.uid, c.uid]; } - [pboard declareTypes:TREE_DRAG_ITEM_TYPES owner:self]; + [pboard declareTypes:_treeDragItemTypes owner:self]; - [pboard setPropertyList:s forType:TREE_DRAG_ITEM_TYPE]; + [pboard setPropertyList:s forType:_treeDragItemType]; return YES; } @@ -1182,9 +1182,9 @@ - (NSDragOperation)outlineView:(NSOutlineView *)sender validateDrop:(id < NSDrag if (index < 0) return NSDragOperationNone; NSPasteboard *pboard = [info draggingPasteboard]; - if (PointerIsEmpty([pboard availableTypeFromArray:TREE_DRAG_ITEM_TYPES])) return NSDragOperationNone; + if (PointerIsEmpty([pboard availableTypeFromArray:_treeDragItemTypes])) return NSDragOperationNone; - NSString *infoStr = [pboard propertyListForType:TREE_DRAG_ITEM_TYPE]; + NSString *infoStr = [pboard propertyListForType:_treeDragItemType]; if (PointerIsEmpty(infoStr)) return NSDragOperationNone; IRCTreeItem *i = [self findItemFromInfo:infoStr]; @@ -1234,9 +1234,9 @@ - (BOOL)outlineView:(NSOutlineView *)sender acceptDrop:(id < NSDraggingInfo >)in if (index < 0) return NO; NSPasteboard *pboard = [info draggingPasteboard]; - if (PointerIsEmpty([pboard availableTypeFromArray:TREE_DRAG_ITEM_TYPES])) return NO; + if (PointerIsEmpty([pboard availableTypeFromArray:_treeDragItemTypes])) return NO; - NSString *infoStr = [pboard propertyListForType:TREE_DRAG_ITEM_TYPE]; + NSString *infoStr = [pboard propertyListForType:_treeDragItemType]; if (PointerIsEmpty(infoStr)) return NO; IRCTreeItem *i = [self findItemFromInfo:infoStr]; diff --git a/Classes/IRC/TimerCommand.m b/Classes/IRC/TLOTimerCommand.m similarity index 89% rename from Classes/IRC/TimerCommand.m rename to Classes/IRC/TLOTimerCommand.m index 3f323be902..e7b17cac3e 100755 --- a/Classes/IRC/TimerCommand.m +++ b/Classes/IRC/TLOTimerCommand.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation TimerCommand +@implementation TLOTimerCommand @synthesize time; @synthesize cid; @synthesize input; diff --git a/Classes/Library/AGKeychain.m b/Classes/Library/AGKeychain.m index 8b9499169a..2a653ac8c1 100755 --- a/Classes/Library/AGKeychain.m +++ b/Classes/Library/AGKeychain.m @@ -247,13 +247,13 @@ + (NSString *)getPasswordFromKeychainItem:(NSString *)keychainItemName DevNullDestroyObject(YES, result); - NSString *password = NSNullObject; + NSString *password = NSStringEmptyPlaceholder; if (SecKeychainSearchCopyNext(search, &item) == noErr) { password = [self getPasswordFromSecKeychainItemRef:item]; if (NSObjectIsEmpty(password)) { - password = NSNullObject; + password = NSStringEmptyPlaceholder; } CFRelease(item); @@ -269,7 +269,7 @@ + (NSString *)getPasswordFromSecKeychainItemRef:(SecKeychainItemRef)item UInt32 length; char *password; - NSString *fpass = NSNullObject; + NSString *fpass = NSStringEmptyPlaceholder; OSStatus status = SecKeychainItemCopyContent(item, NULL, NULL, &length, (void **)&password); @@ -286,7 +286,7 @@ + (NSString *)getPasswordFromSecKeychainItemRef:(SecKeychainItemRef)item SecKeychainItemFreeContent(NULL, password); } } else { - fpass = NSNullObject; + fpass = NSStringEmptyPlaceholder; } return fpass; diff --git a/Classes/Library/AsyncSocketExtensions.m b/Classes/Library/GCDAsyncSocketExtensions.m similarity index 97% rename from Classes/Library/AsyncSocketExtensions.m rename to Classes/Library/GCDAsyncSocketExtensions.m index 830d053699..fe28e03fcf 100755 --- a/Classes/Library/AsyncSocketExtensions.m +++ b/Classes/Library/GCDAsyncSocketExtensions.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -static NSString *txCFStreamErrorDomainSSL = @"kCFStreamErrorDomainSSL"; +#define TXkCFStreamErrorDomainSSL @"kCFStreamErrorDomainSSL" @implementation GCDAsyncSocket (GCDsyncSocketExtensions) @@ -36,7 +36,7 @@ + (BOOL)badSSLCertErrorFound:(NSError *)error NSInteger code = [error code]; NSString *domain = [error domain]; - if ([domain isEqualToString:txCFStreamErrorDomainSSL]) { + if ([domain isEqualToString:TXkCFStreamErrorDomainSSL]) { NSArray *errorCodes = [NSArray arrayWithObjects: NSNumberWithInteger(errSSLBadCert), NSNumberWithInteger(errSSLNoRootCert), diff --git a/Classes/Library/IRCColorFormat.m b/Classes/Library/IRCColorFormat.m index 197f436081..0ca1a8ff24 100755 --- a/Classes/Library/IRCColorFormat.m +++ b/Classes/Library/IRCColorFormat.m @@ -5,7 +5,7 @@ @implementation NSAttributedString (IRCTextFormatter) #pragma mark - -#pragma mark General Calls +#pragma mark Text Truncation - (NSString *)attributedStringToASCIIFormatting { @@ -59,8 +59,13 @@ - (NSString *)attributedStringToASCIIFormatting return result; } +#warning "-attributedStringToASCIIFormatting:lineType:channel:hostmask:" is dangerous \ + to call. Its results cannot be guaranteed and are generally inaccurate. + +/* TODO: Fix text truncation while also supporting formatting. */ + - (NSString *)attributedStringToASCIIFormatting:(NSMutableAttributedString **)string - lineType:(LogLineType)type + lineType:(TVCLogLineType)type channel:(NSString *)chan hostmask:(NSString *)host { @@ -75,8 +80,8 @@ - (NSString *)attributedStringToASCIIFormatting:(NSMutableAttributedString **)st NSInteger baseMath = (chan.length + host.length + 14); NSInteger baseLength = (base.length + baseMath); - if (baseLength > MAXIMUM_IRC_BODY_LEN) { - baseLength -= (baseLength - MAXIMUM_IRC_BODY_LEN); + if (baseLength > TXMaximumIRCBodyLength) { + baseLength -= (baseLength - TXMaximumIRCBodyLength); } NSRange deleteRange; @@ -114,9 +119,9 @@ - (NSString *)attributedStringToASCIIFormatting:(NSMutableAttributedString **)st NSInteger newLength = (baseMath + result.length + newChars); - NSString *cake = NSNullObject; // variable names make no sense + NSString *cake = NSStringEmptyPlaceholder; // variable names make no sense - if (newLength > MAXIMUM_IRC_BODY_LEN) { + if (newLength > TXMaximumIRCBodyLength) { if (effectiveRange.length < newChars) { deleteRange.length = effectiveRange.location; @@ -127,11 +132,11 @@ - (NSString *)attributedStringToASCIIFormatting:(NSMutableAttributedString **)st } } - if (effectiveRange.length == (MAXIMUM_IRC_BODY_LEN - baseMath)) { // max + if (effectiveRange.length == (TXMaximumIRCBodyLength - baseMath)) { // max cake = [base.string safeSubstringWithRange:effectiveRange]; - if ([cake contains:NSWhitespaceCharacter]) { - NSInteger spaceIndex = [cake rangeOfString:NSWhitespaceCharacter options:NSBackwardsSearch range:effectiveRange].location; + if ([cake contains:NSStringWhitespacePlaceholder]) { + NSInteger spaceIndex = [cake rangeOfString:NSStringWhitespacePlaceholder options:NSBackwardsSearch range:effectiveRange].location; NSInteger charDiff = (effectiveRange.length - spaceIndex); if (charDiff <= 100) { @@ -178,7 +183,10 @@ - (NSString *)attributedStringToASCIIFormatting:(NSMutableAttributedString **)st @end -@implementation TextField (TextFieldFormattingHelper) +#pragma mark - +#pragma mark General Formatting Calls + +@implementation TVCTextField (TextFieldFormattingHelper) - (BOOL)IRCFormatterAttributeSetInRange:(IRCTextFormatterEffectType)effect range:(NSRange)limitRange @@ -221,7 +229,7 @@ - (BOOL)IRCFormatterAttributeSetInRange:(IRCTextFormatterEffectType)effect { NSColor *foregroundColor = [dict objectForKey:NSForegroundColorAttributeName]; - if (PointerIsNotEmpty(foregroundColor) && [foregroundColor isEqual:DefaultTextFieldFontColor] == NO) { + if (PointerIsNotEmpty(foregroundColor) && [foregroundColor isEqual:TXTXDefaultTextFieldFontColor] == NO) { return YES; } @@ -258,15 +266,15 @@ - (void)sanitizeIRCCompatibleAttributedString:(BOOL)clearAttributes NSMutableDictionary *attrs = [NSMutableDictionary dictionary]; - [attrs setObject:DefaultTextFieldFont forKey:NSFontAttributeName]; - [attrs setObject:DefaultTextFieldFontColor forKey:NSForegroundColorAttributeName]; + [attrs setObject:TXDefaultTextFieldFont forKey:NSFontAttributeName]; + [attrs setObject:TXTXDefaultTextFieldFontColor forKey:NSForegroundColorAttributeName]; - (void)[stringv initWithString:TXTLS(@"INPUT_TEXT_FIELD_PLACE_HOLDER") attributes:attrs]; + (void)[stringv initWithString:TXTLS(@"InputTextFieldPlaceholderValue") attributes:attrs]; [self setAttributedStringValue:stringv]; [self setAttributedStringValue:stringn]; } else { - [self setFont:DefaultTextFieldFont]; + [self setFont:TXDefaultTextFieldFont]; } } diff --git a/Classes/Library/RegexKitLite.m b/Classes/Library/RegexKitLite.m index a8c6ac0e91..41ec0f7815 100755 --- a/Classes/Library/RegexKitLite.m +++ b/Classes/Library/RegexKitLite.m @@ -54,12 +54,7 @@ #define RKL_GC_VOLATILE #endif // __OBJC_GC__ -#if (defined(TARGET_OS_EMBEDDED) && (TARGET_OS_EMBEDDED != 0)) || (defined(TARGET_OS_IPHONE) && (TARGET_OS_IPHONE != 0)) || (defined(MAC_OS_X_VERSION_MIN_REQUIRED) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)) -//#include -#else #include -#endif - #include #include #include @@ -687,9 +682,9 @@ +(void)lowMemoryWarning:(id)notification { #define rkl_dtrace_incrementEventID() do { rkl_dtrace_eventID++; } while(0) #define rkl_dtrace_incrementAndGetEventID(v) do { rkl_dtrace_eventID++; v = rkl_dtrace_eventID; } while(0) -#define rkl_dtrace_compiledRegexCache(a0, a1, a2, a3, a4, a5) do { int _a3 = (a3); rkl_dtrace_compiledCacheLookups++; if(_a3 == 1) { rkl_dtrace_compiledCacheHits++; } if(RKL_EXPECTED(REGEXKITLITE_COMPILEDREGEXCACHE_ENABLED(), 0L)) { double hitRate = 0.0; if(rkl_dtrace_compiledCacheLookups > 0UL) { hitRate = ((NSDoubleN)rkl_dtrace_compiledCacheHits / (NSDoubleN)rkl_dtrace_compiledCacheLookups) * 100.0; } REGEXKITLITE_COMPILEDREGEXCACHE(rkl_dtrace_eventID, a0, a1, a2, _a3, a4, a5, &hitRate); } } while(0) -#define rkl_dtrace_utf16ConversionCache(a0, a1, a2, a3, a4) do { unsigned int _a0 = (a0); if((_a0 & RKLConversionRequiredLookupFlag) != 0U) { rkl_dtrace_conversionBufferLookups++; if((_a0 & RKLCacheHitLookupFlag) != 0U) { rkl_dtrace_conversionBufferHits++; } } if(RKL_EXPECTED(REGEXKITLITE_CONVERTEDSTRINGU16CACHE_ENABLED(), 0L)) { double hitRate = 0.0; if(rkl_dtrace_conversionBufferLookups > 0UL) { hitRate = ((NSDoubleN)rkl_dtrace_conversionBufferHits / (NSDoubleN)rkl_dtrace_conversionBufferLookups) * 100.0; } REGEXKITLITE_CONVERTEDSTRINGU16CACHE(rkl_dtrace_eventID, _a0, &hitRate, a1, a2, a3, a4); } } while(0) -#define rkl_dtrace_utf16ConversionCacheWithEventID(c0, a0, a1, a2, a3, a4) do { unsigned int _a0 = (a0); if((_a0 & RKLConversionRequiredLookupFlag) != 0U) { rkl_dtrace_conversionBufferLookups++; if((_a0 & RKLCacheHitLookupFlag) != 0U) { rkl_dtrace_conversionBufferHits++; } } if(RKL_EXPECTED(REGEXKITLITE_CONVERTEDSTRINGU16CACHE_ENABLED(), 0L)) { double hitRate = 0.0; if(rkl_dtrace_conversionBufferLookups > 0UL) { hitRate = ((NSDoubleN)rkl_dtrace_conversionBufferHits / (NSDoubleN)rkl_dtrace_conversionBufferLookups) * 100.0; } REGEXKITLITE_CONVERTEDSTRINGU16CACHE(c0, _a0, &hitRate, a1, a2, a3, a4); } } while(0) +#define rkl_dtrace_compiledRegexCache(a0, a1, a2, a3, a4, a5) do { int _a3 = (a3); rkl_dtrace_compiledCacheLookups++; if(_a3 == 1) { rkl_dtrace_compiledCacheHits++; } if(RKL_EXPECTED(REGEXKITLITE_COMPILEDREGEXCACHE_ENABLED(), 0L)) { double hitRate = 0.0; if(rkl_dtrace_compiledCacheLookups > 0UL) { hitRate = ((TXNSDouble)rkl_dtrace_compiledCacheHits / (TXNSDouble)rkl_dtrace_compiledCacheLookups) * 100.0; } REGEXKITLITE_COMPILEDREGEXCACHE(rkl_dtrace_eventID, a0, a1, a2, _a3, a4, a5, &hitRate); } } while(0) +#define rkl_dtrace_utf16ConversionCache(a0, a1, a2, a3, a4) do { unsigned int _a0 = (a0); if((_a0 & RKLConversionRequiredLookupFlag) != 0U) { rkl_dtrace_conversionBufferLookups++; if((_a0 & RKLCacheHitLookupFlag) != 0U) { rkl_dtrace_conversionBufferHits++; } } if(RKL_EXPECTED(REGEXKITLITE_CONVERTEDSTRINGU16CACHE_ENABLED(), 0L)) { double hitRate = 0.0; if(rkl_dtrace_conversionBufferLookups > 0UL) { hitRate = ((TXNSDouble)rkl_dtrace_conversionBufferHits / (TXNSDouble)rkl_dtrace_conversionBufferLookups) * 100.0; } REGEXKITLITE_CONVERTEDSTRINGU16CACHE(rkl_dtrace_eventID, _a0, &hitRate, a1, a2, a3, a4); } } while(0) +#define rkl_dtrace_utf16ConversionCacheWithEventID(c0, a0, a1, a2, a3, a4) do { unsigned int _a0 = (a0); if((_a0 & RKLConversionRequiredLookupFlag) != 0U) { rkl_dtrace_conversionBufferLookups++; if((_a0 & RKLCacheHitLookupFlag) != 0U) { rkl_dtrace_conversionBufferHits++; } } if(RKL_EXPECTED(REGEXKITLITE_CONVERTEDSTRINGU16CACHE_ENABLED(), 0L)) { double hitRate = 0.0; if(rkl_dtrace_conversionBufferLookups > 0UL) { hitRate = ((TXNSDouble)rkl_dtrace_conversionBufferHits / (TXNSDouble)rkl_dtrace_conversionBufferLookups) * 100.0; } REGEXKITLITE_CONVERTEDSTRINGU16CACHE(c0, _a0, &hitRate, a1, a2, a3, a4); } } while(0) // \342\200\246 == UTF8 for HORIZONTAL ELLIPSIS, aka triple dots '...' diff --git a/Classes/Library/FileLogger.m b/Classes/Library/TLOFileLogger.m similarity index 94% rename from Classes/Library/FileLogger.m rename to Classes/Library/TLOFileLogger.m index e1d88f6b2e..614fbe30b8 100755 --- a/Classes/Library/FileLogger.m +++ b/Classes/Library/TLOFileLogger.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation FileLogger +@implementation TLOFileLogger @synthesize client; @synthesize channel; @@ -33,7 +33,7 @@ - (void)writeLine:(NSString *)s [self open]; if (self.file) { - s = [s stringByAppendingString:NSNewlineCharacter]; + s = [s stringByAppendingString:NSStringNewlinePlaceholder]; NSData *data = [s dataUsingEncoding:self.client.encoding]; @@ -85,7 +85,7 @@ - (void)open - (NSString *)buildPath { - NSString *base = [Preferences transcriptFolder]; + NSString *base = [TPCPreferences transcriptFolder]; NSString *serv = [[self.client name] safeFileName]; NSString *chan = [[self.channel name] safeFileName]; diff --git a/Classes/Library/InputHistory.m b/Classes/Library/TLOInputHistory.m similarity index 92% rename from Classes/Library/InputHistory.m rename to Classes/Library/TLOInputHistory.m index 308895a698..692cf56ed1 100755 --- a/Classes/Library/InputHistory.m +++ b/Classes/Library/TLOInputHistory.m @@ -2,9 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define INPUT_HISTORY_MAX 50 +#define _inputHistoryMax 50 -@implementation InputHistory +@implementation TLOInputHistory @synthesize buf; @synthesize pos; @@ -30,7 +30,7 @@ - (void)add:(NSAttributedString *)s [self.buf safeAddObject:s]; - if (self.buf.count > INPUT_HISTORY_MAX) { + if (self.buf.count > _inputHistoryMax) { [self.buf safeRemoveObjectAtIndex:0]; } @@ -49,7 +49,7 @@ - (NSAttributedString *)up:(NSAttributedString *)s if (NSObjectIsEmpty(cur) || [cur.string isEqualToString:s.string] == NO) { [self.buf safeAddObject:s]; - if (self.buf.count > INPUT_HISTORY_MAX) { + if (self.buf.count > _inputHistoryMax) { [self.buf safeRemoveObjectAtIndex:0]; --self.pos; diff --git a/Classes/Library/KeyEventHandler.m b/Classes/Library/TLOKeyEventHandler.m similarity index 82% rename from Classes/Library/KeyEventHandler.m rename to Classes/Library/TLOKeyEventHandler.m index f6a86b2b48..2c878ae555 100755 --- a/Classes/Library/KeyEventHandler.m +++ b/Classes/Library/TLOKeyEventHandler.m @@ -2,7 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation KeyEventHandler +#import + +@implementation TLOKeyEventHandler @synthesize target; @synthesize codeHandlerMap; @@ -11,8 +13,8 @@ @implementation KeyEventHandler - (id)init { if ((self = [super init])) { - self.codeHandlerMap = [NSMutableDictionary new]; - self.characterHandlerMap = [NSMutableDictionary new]; + self.codeHandlerMap = [NSMutableDictionary new]; + self.characterHandlerMap = [NSMutableDictionary new]; } return self; @@ -21,6 +23,7 @@ - (id)init - (void)registerSelector:(SEL)selector key:(NSInteger)code modifiers:(NSUInteger)mods { NSNumber *modsKey = [NSNumber numberWithUnsignedInteger:mods]; + NSMutableDictionary *map = [self.codeHandlerMap objectForKey:modsKey]; if (NSObjectIsEmpty(map)) { @@ -35,6 +38,7 @@ - (void)registerSelector:(SEL)selector key:(NSInteger)code modifiers:(NSUInteger - (void)registerSelector:(SEL)selector character:(UniChar)c modifiers:(NSUInteger)mods { NSNumber *modsKey = [NSNumber numberWithUnsignedInteger:mods]; + NSMutableDictionary *map = [self.characterHandlerMap objectForKey:modsKey]; if (NSObjectIsEmpty(map)) { @@ -49,6 +53,7 @@ - (void)registerSelector:(SEL)selector character:(UniChar)c modifiers:(NSUIntege - (void)registerSelector:(SEL)selector characters:(NSRange)characterRange modifiers:(NSUInteger)mods { NSNumber *modsKey = [NSNumber numberWithUnsignedInteger:mods]; + NSMutableDictionary *map = [self.characterHandlerMap objectForKey:modsKey]; if (NSObjectIsEmpty(map)) { @@ -72,8 +77,11 @@ - (BOOL)processKeyEvent:(NSEvent *)e NSInputManager *im = [NSInputManager currentInputManager]; if (im && [im markedRange].length > 0) return NO; - NSUInteger m = [e modifierFlags]; + NSUInteger m; + + m = [e modifierFlags]; m &= (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask); + NSNumber *modsKey = [NSNumber numberWithUnsignedInteger:m]; NSMutableDictionary *codeMap = [self.codeHandlerMap objectForKey:modsKey]; @@ -82,11 +90,7 @@ - (BOOL)processKeyEvent:(NSEvent *)e NSString *selectorName = [codeMap objectForKey:NSNumberWithInteger([e keyCode])]; if (selectorName) { - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - [self.target performSelector:NSSelectorFromString(selectorName) withObject:e]; -#pragma clang diagnostic pop + objc_msgSend(self.target, NSSelectorFromString(selectorName), e); return YES; } @@ -101,11 +105,7 @@ - (BOOL)processKeyEvent:(NSEvent *)e NSString *selectorName = [characterMap objectForKey:NSNumberWithInteger([str characterAtIndex:0])]; if (selectorName) { - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - [self.target performSelector:NSSelectorFromString(selectorName) withObject:e]; -#pragma clang diagnostic pop + objc_msgSend(self.target, NSSelectorFromString(selectorName), e); return YES; } diff --git a/Classes/Library/LanguagePreferences.m b/Classes/Library/TLOLanguagePreferences.m similarity index 96% rename from Classes/Library/LanguagePreferences.m rename to Classes/Library/TLOLanguagePreferences.m index 65d7acbe99..bc19fd6071 100755 --- a/Classes/Library/LanguagePreferences.m +++ b/Classes/Library/TLOLanguagePreferences.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation LanguagePreferences +@implementation TLOLanguagePreferences static NSDictionary *themeLocalizations = nil; diff --git a/Classes/Library/URLParser.m b/Classes/Library/TLOLinkParser.m similarity index 89% rename from Classes/Library/URLParser.m rename to Classes/Library/TLOLinkParser.m index c8f25a93c5..5de56c6592 100755 --- a/Classes/Library/URLParser.m +++ b/Classes/Library/TLOLinkParser.m @@ -2,9 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#import - -@implementation URLParser +@implementation TLOLinkParser + (NSArray *)locatedLinksForString:(NSString *)body { diff --git a/Classes/Library/PopupPrompts.m b/Classes/Library/TLOPopupPrompts.m similarity index 84% rename from Classes/Library/PopupPrompts.m rename to Classes/Library/TLOPopupPrompts.m index 895067429d..6ff7bf3e20 100755 --- a/Classes/Library/PopupPrompts.m +++ b/Classes/Library/TLOPopupPrompts.m @@ -2,13 +2,15 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation PopupPrompts +#import + +@implementation TLOPopupPrompts #pragma mark - #pragma mark Alert Sheets -@synthesize _targetClass; -@synthesize _actionSelector; +@synthesize target; +@synthesize selector; @synthesize _suppressionKey; - (void)sheetWindowWithQuestion:(NSWindow *)window @@ -27,7 +29,7 @@ - (void)sheetWindowWithQuestion:(NSWindow *)window NSString *__suppressionKey = @""; if (NSObjectIsNotEmpty(suppressKey)) { - __suppressionKey = [PopupPromptSuppressionPrefix stringByAppendingString:suppressKey]; + __suppressionKey = [TXPopupPromptSuppressionPrefix stringByAppendingString:suppressKey]; useSupression = YES; @@ -38,7 +40,7 @@ - (void)sheetWindowWithQuestion:(NSWindow *)window if (useSupression) { if (NSObjectIsEmpty(suppressText)) { - suppressText = TXTLS(@"SUPPRESSION_BUTTON_DEFAULT_TITLE"); + suppressText = TXTLS(@"PromptSuppressionButtonDefaultTitle"); } } else { suppressText = nil; @@ -57,8 +59,8 @@ - (void)sheetWindowWithQuestion:(NSWindow *)window [[alert suppressionButton] setTitle:suppressText]; - self._targetClass = targetClass; - self._actionSelector = actionSelector; + self.target = targetClass; + self.selector = actionSelector; self._suppressionKey = __suppressionKey; [alert beginSheetModalForWindow:window modalDelegate:self @@ -75,16 +77,11 @@ - (void)_sheetWindowWithQuestionCallback:(NSAlert *)alert returnCode:(NSInteger) [_NSUserDefaults() setBool:[button state] forKey:self._suppressionKey]; } - if ([self._targetClass isKindOfClass:[self class]]) { + if ([self.target isKindOfClass:[self class]]) { return; } -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - [self._targetClass performSelector:self._actionSelector - withObject:[NSNumber numberWithInteger:returnCode]]; -#pragma clang diagnostic pop - + objc_msgSend(self.target, self.selector, [NSNumber numberWithInteger:returnCode]); } + (void)sheetWindowWithQuestion:(NSWindow *)window @@ -98,7 +95,7 @@ + (void)sheetWindowWithQuestion:(NSWindow *)window suppressionKey:(NSString *)suppressKey suppressionText:(NSString *)suppressText { - PopupPrompts *prompt = [PopupPrompts new]; + TLOPopupPrompts *prompt = [TLOPopupPrompts new]; [prompt sheetWindowWithQuestion:window target:targetClass @@ -133,7 +130,7 @@ + (BOOL)dialogWindowWithQuestion:(NSString *)bodyText NSString *_suppressKey = @""; if (NSObjectIsNotEmpty(suppressKey) && [suppressText isEqualToString:@"-"] == NO) { - _suppressKey = [PopupPromptSuppressionPrefix stringByAppendingString:suppressKey]; + _suppressKey = [TXPopupPromptSuppressionPrefix stringByAppendingString:suppressKey]; useSupression = YES; @@ -154,7 +151,7 @@ + (BOOL)dialogWindowWithQuestion:(NSString *)bodyText if (useSupression) { if (NSObjectIsEmpty(suppressText)) { - suppressText = TXTLS(@"SUPPRESSION_BUTTON_DEFAULT_TITLE"); + suppressText = TXTLS(@"PromptSuppressionButtonDefaultTitle"); } [button setTitle:suppressText]; @@ -177,7 +174,7 @@ + (NSString *)dialogWindowWithInput:(NSString *)bodyText alternateButton:(NSString *)buttonAlternate defaultInput:(NSString *)defaultValue { - InputPromptDialog *dialog = [InputPromptDialog new]; + TVCInputPromptDialog *dialog = [TVCInputPromptDialog new]; [dialog alertWithMessageText:titleText defaultButton:buttonDefault diff --git a/Classes/Library/TXRegularExpression.m b/Classes/Library/TLORegularExpression.m similarity index 90% rename from Classes/Library/TXRegularExpression.m rename to Classes/Library/TLORegularExpression.m index 4bc21b6d27..e8ec650bf3 100755 --- a/Classes/Library/TXRegularExpression.m +++ b/Classes/Library/TLORegularExpression.m @@ -6,15 +6,15 @@ of Mac OS X that support NSRegularExpression let us use it instead of relying on open source libraries to do the work for us. */ -@interface TXRegularExpression (Private) +@interface TLORegularExpression (Private) + (BOOL)useNewRegularExpressionEngine; @end -@implementation TXRegularExpression +@implementation TLORegularExpression + (BOOL)useNewRegularExpressionEngine { - return [Preferences featureAvailableToOSXLion]; + return [TPCPreferences featureAvailableToOSXLion]; } + (BOOL)string:(NSString *)haystack isMatchedByRegex:(NSString *)needle @@ -26,7 +26,7 @@ + (BOOL)string:(NSString *)haystack isMatchedByRegex:(NSString *)needle withoutC { NSRange strRange = NSMakeRange(0, [haystack length]); -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable if ([self useNewRegularExpressionEngine]) { NSRegularExpression *regex; @@ -48,7 +48,7 @@ + (BOOL)string:(NSString *)haystack isMatchedByRegex:(NSString *)needle withoutC return [haystack isMatchedByRegex:needle]; } -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable } #endif } @@ -62,7 +62,7 @@ + (NSRange)string:(NSString *)haystack rangeOfRegex:(NSString *)needle withoutCa { NSRange strRange = NSMakeRange(0, [haystack length]); -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable if ([self useNewRegularExpressionEngine]) { NSRegularExpression *regex; @@ -84,14 +84,14 @@ + (NSRange)string:(NSString *)haystack rangeOfRegex:(NSString *)needle withoutCa return [haystack rangeOfRegex:needle]; } -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable } #endif } + (NSString *)string:(NSString *)haystack replacedByRegex:(NSString *)needle withString:(NSString *)puppy { -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable if ([self useNewRegularExpressionEngine]) { NSRange strRange = NSMakeRange(0, [haystack length]); @@ -105,7 +105,7 @@ + (NSString *)string:(NSString *)haystack replacedByRegex:(NSString *)needle wit return [haystack stringByReplacingOccurrencesOfRegex:needle withString:puppy]; -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable } #endif } @@ -119,7 +119,7 @@ + (NSArray *)matchesInString:(NSString *)haystack withRegex:(NSString *)needle w { NSRange strRange = NSMakeRange(0, [haystack length]); -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable if ([self useNewRegularExpressionEngine]) { NSRegularExpression *regex; @@ -151,7 +151,7 @@ + (NSArray *)matchesInString:(NSString *)haystack withRegex:(NSString *)needle w return [haystack componentsSeparatedByRegex:needle]; } -#ifdef _USES_MODERN_REGULAR_EXPRESSION +#ifdef TXNativeRegularExpressionAvailable } #endif } diff --git a/Classes/Library/TCPClient.m b/Classes/Library/TLOSocketClient.m similarity index 97% rename from Classes/Library/TCPClient.m rename to Classes/Library/TLOSocketClient.m index 982b1ea120..89a4eca3b5 100755 --- a/Classes/Library/TCPClient.m +++ b/Classes/Library/TLOSocketClient.m @@ -2,10 +2,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define LF 0xa -#define CR 0xd +#define _LF 0xa +#define _CR 0xd -@implementation TCPClient +@implementation TLOSocketClient @synthesize active; @synthesize buffer; @@ -134,7 +134,7 @@ - (NSData *)readLine if (len < 1) return nil; const char *bytes = [self.buffer bytes]; - char *p = memchr(bytes, LF, len); + char *p = memchr(bytes, _LF, len); if (p == NULL) return nil; @@ -143,7 +143,7 @@ - (NSData *)readLine if (n > 0) { char prev = *(p - 1); - if (prev == CR) { + if (prev == _CR) { --n; } } @@ -231,7 +231,7 @@ - (void)onSocket:(id)sender willDisconnectWithError:(NSError *)error if ([GCDAsyncSocket badSSLCertErrorFound:error]) { IRCClient *client = [self.delegate performSelector:@selector(delegate)]; - client.disconnectType = DISCONNECT_BAD_SSL_CERT; + client.disconnectType = IRCBadSSLCertificateDisconnectMode; } else { if ([domain isEqualToString:NSPOSIXErrorDomain]) { msg = [GCDAsyncSocket posixErrorStringFromErrno:[error code]]; diff --git a/Classes/Library/Timer.m b/Classes/Library/TLOTimer.m similarity index 84% rename from Classes/Library/Timer.m rename to Classes/Library/TLOTimer.m index 497f8b1822..77f5f55485 100755 --- a/Classes/Library/Timer.m +++ b/Classes/Library/TLOTimer.m @@ -2,7 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation Timer +#import + +@implementation TLOTimer @synthesize delegate; @synthesize reqeat; @@ -57,12 +59,7 @@ - (void)onTimer:(id)sender } if ([self.delegate respondsToSelector:self.selector]) { - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - [self.delegate performSelector:self.selector withObject:self]; -#pragma clang diagnostic pop - + objc_msgSend(self.delegate, self.selector, self); } } diff --git a/Classes/Library/GlobalModels.m b/Classes/Library/TXGlobalModels.m similarity index 83% rename from Classes/Library/GlobalModels.m rename to Classes/Library/TXGlobalModels.m index 27527cf6f2..eedfd6c674 100755 --- a/Classes/Library/GlobalModels.m +++ b/Classes/Library/TXGlobalModels.m @@ -2,7 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -#define TIME_BUFFER_SIZE 256 +#import + +#define _timeBufferSize 256 BOOL NSObjectIsEmpty(id obj) { @@ -29,13 +31,13 @@ void DevNullDestroyObject(BOOL condition, ...) // lol NSString *TXTLS(NSString *key) { - return [LanguagePreferences localizedStringWithKey:key]; + return [TLOLanguagePreferences localizedStringWithKey:key]; } NSString *TXTFLS(NSString *key, ...) { NSString *formattedString = [NSString alloc]; - NSString *languageString = [LanguagePreferences localizedStringWithKey:key]; + NSString *languageString = [TLOLanguagePreferences localizedStringWithKey:key]; va_list args; va_start(args, key); @@ -49,7 +51,7 @@ void DevNullDestroyObject(BOOL condition, ...) // lol NSString *TXFormattedTimestampWithOverride(NSDate *date, NSString *format, NSString *override) { - if (NSObjectIsEmpty(format)) format = @"[%H:%M:%S]"; + if (NSObjectIsEmpty(format)) format = TXDefaultTextualTimestampFormat; if (NSObjectIsNotEmpty(override)) format = override; return [NSString stringWithFormat:@"%@", [date dateWithCalendarFormat:format timeZone:nil]]; @@ -80,21 +82,19 @@ void DevNullDestroyObject(BOOL condition, ...) // lol NSMutableString *finalResult = [NSMutableString string]; for (NSString *unit in orderMatrix) { - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - NSInteger total = (NSInteger)[breakdownInfo performSelector:NSSelectorFromString(unit)]; -#pragma clang diagnostic pop + NSInteger total = (NSInteger)objc_msgSend(breakdownInfo, NSSelectorFromString(unit)); if (total < 0) { total *= -1; } if (total >= 1) { - NSString *languageKey = [@"TIME_CONVERT_" stringByAppendingString:[unit uppercaseString]]; - + NSString *languageKey; + if (total > 1 || total < 1) { - languageKey = [languageKey stringByAppendingString:@"_PLURAL"]; + languageKey = [NSString stringWithFormat:@"TimeConvertPlural[%@]", unit.uppercaseString]; + } else { + languageKey = [NSString stringWithFormat:@"TimeConvert[%@]", unit.uppercaseString]; } if (shortValue) { diff --git a/Classes/Preferences/FileWithContent.m b/Classes/Preferences/TLOFileWithContent.m similarity index 90% rename from Classes/Preferences/FileWithContent.m rename to Classes/Preferences/TLOFileWithContent.m index b867cc5359..b03bb85c67 100755 --- a/Classes/Preferences/FileWithContent.m +++ b/Classes/Preferences/TLOFileWithContent.m @@ -3,11 +3,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface FileWithContent (Private) +@interface TLOFileWithContent (Private) - (void)reload; @end -@implementation FileWithContent +@implementation TLOFileWithContent @synthesize filename; @synthesize content; diff --git a/Classes/Preferences/OtherTheme.m b/Classes/Preferences/TPCOtherTheme.m similarity index 92% rename from Classes/Preferences/OtherTheme.m rename to Classes/Preferences/TPCOtherTheme.m index a24784029c..50a53224a1 100755 --- a/Classes/Preferences/OtherTheme.m +++ b/Classes/Preferences/TPCOtherTheme.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface OtherTheme (Private) +@interface TPCOtherTheme (Private) - (NSColor *)processColorStringValue:(NSString *)value def:(NSString *)defaultv; - (NSString *)processNSStringValue:(NSString *)value def:(NSString *)defaultv; - (NSInteger)processIntegerValue:(NSInteger)value def:(NSInteger)defaultv; @@ -15,7 +15,7 @@ - (NSFont *)processFontValue:(NSString *)style_value overrode:(BOOL *)overr; @end -@implementation OtherTheme +@implementation TPCOtherTheme @synthesize path; @synthesize channelViewFont; @@ -94,7 +94,7 @@ - (NSFont *)processFontValue:(NSString *)style_value - (void)reload { self.channelViewFontOverrode = NO; - self.indentationOffset = THEME_DISABLED_INDENTATION_OFFSET; + self.indentationOffset = TXThemeDisabledIndentationOffset; // ====================================================== // @@ -121,8 +121,8 @@ - (void)reload self.channelViewFont = [self processFontValue:[prefOChannelFont objectForKey:@"Font Name"] size:[prefOChannelFont integerForKey:@"Font Size"] - defaultv:[NSFont fontWithName:[Preferences themeChannelViewFontName] size:[Preferences themeChannelViewFontSize]] - preferred:[NSFont fontWithName:DEFAULT_TEXTUAL_FONT size:12.0] + defaultv:[NSFont fontWithName:[TPCPreferences themeChannelViewFontName] size:[TPCPreferences themeChannelViewFontSize]] + preferred:[NSFont fontWithName:TXDefaultTextualLogFont size:12.0] allowCustom:YES overrode:&channelViewFontOverrode]; diff --git a/Classes/Preferences/Preferences.m b/Classes/Preferences/TPCPreferences.m similarity index 65% rename from Classes/Preferences/Preferences.m rename to Classes/Preferences/TPCPreferences.m index 40083eaa7b..dd52062bd2 100755 --- a/Classes/Preferences/Preferences.m +++ b/Classes/Preferences/TPCPreferences.m @@ -3,7 +3,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation Preferences +@implementation TPCPreferences #pragma mark - #pragma mark Version Dictonaries @@ -33,104 +33,105 @@ + (NSDictionary *)commandIndexList + (void)populateCommandIndex { + /* This needs to be redesigned… */ commandIndex = [NSMutableDictionary new]; - [commandIndex setObject:@"3" forKey:IRCCI_AWAY]; - [commandIndex setObject:@"4" forKey:IRCCI_ERROR]; - [commandIndex setObject:@"5" forKey:IRCCI_INVITE]; - [commandIndex setObject:@"6" forKey:IRCCI_ISON]; - [commandIndex setObject:@"7" forKey:IRCCI_JOIN]; - [commandIndex setObject:@"8" forKey:IRCCI_KICK]; - [commandIndex setObject:@"9" forKey:IRCCI_KILL]; - [commandIndex setObject:@"10" forKey:IRCCI_LIST]; - [commandIndex setObject:@"11" forKey:IRCCI_MODE]; - [commandIndex setObject:@"12" forKey:IRCCI_NAMES]; - [commandIndex setObject:@"13" forKey:IRCCI_NICK]; - [commandIndex setObject:@"14" forKey:IRCCI_NOTICE]; - [commandIndex setObject:@"15" forKey:IRCCI_PART]; - [commandIndex setObject:@"16" forKey:IRCCI_PASS]; - [commandIndex setObject:@"17" forKey:IRCCI_PING]; - [commandIndex setObject:@"18" forKey:IRCCI_PONG]; - [commandIndex setObject:@"19" forKey:IRCCI_PRIVMSG]; - [commandIndex setObject:@"20" forKey:IRCCI_QUIT]; - [commandIndex setObject:@"21" forKey:IRCCI_TOPIC]; - [commandIndex setObject:@"22" forKey:IRCCI_USER]; - [commandIndex setObject:@"23" forKey:IRCCI_WHO]; - [commandIndex setObject:@"24" forKey:IRCCI_WHOIS]; - [commandIndex setObject:@"25" forKey:IRCCI_WHOWAS]; - [commandIndex setObject:@"27" forKey:IRCCI_ACTION]; - [commandIndex setObject:@"28" forKey:IRCCI_DCC]; - [commandIndex setObject:@"29" forKey:IRCCI_SEND]; - [commandIndex setObject:@"31" forKey:IRCCI_CLIENTINFO]; - [commandIndex setObject:@"32" forKey:IRCCI_CTCP]; - [commandIndex setObject:@"33" forKey:IRCCI_CTCPREPLY]; - [commandIndex setObject:@"34" forKey:IRCCI_TIME]; - [commandIndex setObject:@"35" forKey:IRCCI_USERINFO]; - [commandIndex setObject:@"36" forKey:IRCCI_VERSION]; - [commandIndex setObject:@"38" forKey:IRCCI_OMSG]; - [commandIndex setObject:@"39" forKey:IRCCI_ONOTICE]; - [commandIndex setObject:@"41" forKey:IRCCI_BAN]; - [commandIndex setObject:@"42" forKey:IRCCI_CLEAR]; - [commandIndex setObject:@"43" forKey:IRCCI_CLOSE]; - [commandIndex setObject:@"44" forKey:IRCCI_CYCLE]; - [commandIndex setObject:@"45" forKey:IRCCI_DEHALFOP]; - [commandIndex setObject:@"46" forKey:IRCCI_DEOP]; - [commandIndex setObject:@"47" forKey:IRCCI_DEVOICE]; - [commandIndex setObject:@"48" forKey:IRCCI_HALFOP]; - [commandIndex setObject:@"49" forKey:IRCCI_HOP]; - [commandIndex setObject:@"50" forKey:IRCCI_IGNORE]; - [commandIndex setObject:@"51" forKey:IRCCI_J]; - [commandIndex setObject:@"52" forKey:IRCCI_LEAVE]; - [commandIndex setObject:@"53" forKey:IRCCI_M]; - [commandIndex setObject:@"54" forKey:IRCCI_ME]; - [commandIndex setObject:@"55" forKey:IRCCI_MSG]; - [commandIndex setObject:@"56" forKey:IRCCI_OP]; - [commandIndex setObject:@"57" forKey:IRCCI_RAW]; - [commandIndex setObject:@"58" forKey:IRCCI_REJOIN]; - [commandIndex setObject:@"59" forKey:IRCCI_QUERY]; - [commandIndex setObject:@"60" forKey:IRCCI_QUOTE]; - [commandIndex setObject:@"61" forKey:IRCCI_T]; - [commandIndex setObject:@"62" forKey:IRCCI_TIMER]; - [commandIndex setObject:@"63" forKey:IRCCI_VOICE]; - [commandIndex setObject:@"64" forKey:IRCCI_UNBAN]; - [commandIndex setObject:@"65" forKey:IRCCI_UNIGNORE]; - [commandIndex setObject:@"66" forKey:IRCCI_UMODE]; - [commandIndex setObject:@"67" forKey:IRCCI_VERSION]; - [commandIndex setObject:@"68" forKey:IRCCI_WEIGHTS]; - [commandIndex setObject:@"69" forKey:IRCCI_ECHO]; - [commandIndex setObject:@"70" forKey:IRCCI_DEBUG]; - [commandIndex setObject:@"71" forKey:IRCCI_CLEARALL]; - [commandIndex setObject:@"72" forKey:IRCCI_AMSG]; - [commandIndex setObject:@"73" forKey:IRCCI_AME]; - [commandIndex setObject:@"74" forKey:IRCCI_MUTE]; - [commandIndex setObject:@"75" forKey:IRCCI_UNMUTE]; - [commandIndex setObject:@"76" forKey:IRCCI_UNLOAD_PLUGINS]; - [commandIndex setObject:@"77" forKey:IRCCI_REMOVE]; - [commandIndex setObject:@"79" forKey:IRCCI_KICKBAN]; - [commandIndex setObject:@"80" forKey:IRCCI_WALLOPS]; - [commandIndex setObject:@"81" forKey:IRCCI_ICBADGE]; - [commandIndex setObject:@"82" forKey:IRCCI_SERVER]; - [commandIndex setObject:@"83" forKey:IRCCI_CONN]; - [commandIndex setObject:@"84" forKey:IRCCI_MYVERSION]; - [commandIndex setObject:@"85" forKey:IRCCI_CHATOPS]; - [commandIndex setObject:@"86" forKey:IRCCI_GLOBOPS]; - [commandIndex setObject:@"87" forKey:IRCCI_LOCOPS]; - [commandIndex setObject:@"88" forKey:IRCCI_NACHAT]; - [commandIndex setObject:@"89" forKey:IRCCI_ADCHAT]; - [commandIndex setObject:@"91" forKey:IRCCI_LOAD_PLUGINS]; - [commandIndex setObject:@"92" forKey:IRCCI_SME]; - [commandIndex setObject:@"93" forKey:IRCCI_SMSG]; - [commandIndex setObject:@"94" forKey:IRCCI_LAGCHECK]; - [commandIndex setObject:@"95" forKey:IRCCI_MYLAG]; - [commandIndex setObject:@"96" forKey:IRCCI_ZLINE]; - [commandIndex setObject:@"97" forKey:IRCCI_GLINE]; - [commandIndex setObject:@"98" forKey:IRCCI_GZLINE]; - [commandIndex setObject:@"99" forKey:IRCCI_SHUN]; - [commandIndex setObject:@"100" forKey:IRCCI_TEMPSHUN]; - [commandIndex setObject:@"101" forKey:IRCCI_AUTHENTICATE]; - [commandIndex setObject:@"102" forKey:IRCCI_CAP]; - [commandIndex setObject:@"103" forKey:IRCCI_CAPS]; - [commandIndex setObject:@"104" forKey:IRCCI_CCBADGE]; + [commandIndex setObject:@"3" forKey:IRCCommandIndexAway]; + [commandIndex setObject:@"4" forKey:IRCCommandIndexError]; + [commandIndex setObject:@"5" forKey:IRCCommandIndexInvite]; + [commandIndex setObject:@"6" forKey:IRCCommandIndexIson]; + [commandIndex setObject:@"7" forKey:IRCCommandIndexJoin]; + [commandIndex setObject:@"8" forKey:IRCCommandIndexKick]; + [commandIndex setObject:@"9" forKey:IRCCommandIndexKill]; + [commandIndex setObject:@"10" forKey:IRCCommandIndexList]; + [commandIndex setObject:@"11" forKey:IRCCommandIndexMode]; + [commandIndex setObject:@"12" forKey:IRCCommandIndexNames]; + [commandIndex setObject:@"13" forKey:IRCCommandIndexNick]; + [commandIndex setObject:@"14" forKey:IRCCommandIndexNotice]; + [commandIndex setObject:@"15" forKey:IRCCommandIndexPart]; + [commandIndex setObject:@"16" forKey:IRCCommandIndexPass]; + [commandIndex setObject:@"17" forKey:IRCCommandIndexPing]; + [commandIndex setObject:@"18" forKey:IRCCommandIndexPong]; + [commandIndex setObject:@"19" forKey:IRCCommandIndexPrivmsg]; + [commandIndex setObject:@"20" forKey:IRCCommandIndexQuit]; + [commandIndex setObject:@"21" forKey:IRCCommandIndexTopic]; + [commandIndex setObject:@"22" forKey:IRCCommandIndexUser]; + [commandIndex setObject:@"23" forKey:IRCCommandIndexWho]; + [commandIndex setObject:@"24" forKey:IRCCommandIndexWhois]; + [commandIndex setObject:@"25" forKey:IRCCommandIndexWhowas]; + [commandIndex setObject:@"27" forKey:IRCCommandIndexAction]; + [commandIndex setObject:@"28" forKey:IRCCommandIndexDcc]; + [commandIndex setObject:@"29" forKey:IRCCommandIndexSend]; + [commandIndex setObject:@"31" forKey:IRCCommandIndexClientinfo]; + [commandIndex setObject:@"32" forKey:IRCCommandIndexCtcp]; + [commandIndex setObject:@"33" forKey:IRCCommandIndexCtcpreply]; + [commandIndex setObject:@"34" forKey:IRCCommandIndexTime]; + [commandIndex setObject:@"35" forKey:IRCCommandIndexUserinfo]; + [commandIndex setObject:@"36" forKey:IRCCommandIndexVersion]; + [commandIndex setObject:@"38" forKey:IRCCommandIndexOmsg]; + [commandIndex setObject:@"39" forKey:IRCCommandIndexOnotice]; + [commandIndex setObject:@"41" forKey:IRCCommandIndexBan]; + [commandIndex setObject:@"42" forKey:IRCCommandIndexClear]; + [commandIndex setObject:@"43" forKey:IRCCommandIndexClose]; + [commandIndex setObject:@"44" forKey:IRCCommandIndexCycle]; + [commandIndex setObject:@"45" forKey:IRCCommandIndexDehalfop]; + [commandIndex setObject:@"46" forKey:IRCCommandIndexDeop]; + [commandIndex setObject:@"47" forKey:IRCCommandIndexDevoice]; + [commandIndex setObject:@"48" forKey:IRCCommandIndexHalfop]; + [commandIndex setObject:@"49" forKey:IRCCommandIndexHop]; + [commandIndex setObject:@"50" forKey:IRCCommandIndexIgnore]; + [commandIndex setObject:@"51" forKey:IRCCommandIndexJ]; + [commandIndex setObject:@"52" forKey:IRCCommandIndexLeave]; + [commandIndex setObject:@"53" forKey:IRCCommandIndexM]; + [commandIndex setObject:@"54" forKey:IRCCommandIndexMe]; + [commandIndex setObject:@"55" forKey:IRCCommandIndexMsg]; + [commandIndex setObject:@"56" forKey:IRCCommandIndexOp]; + [commandIndex setObject:@"57" forKey:IRCCommandIndexRaw]; + [commandIndex setObject:@"58" forKey:IRCCommandIndexRejoin]; + [commandIndex setObject:@"59" forKey:IRCCommandIndexQuery]; + [commandIndex setObject:@"60" forKey:IRCCommandIndexQuote]; + [commandIndex setObject:@"61" forKey:IRCCommandIndexT]; + [commandIndex setObject:@"62" forKey:IRCCommandIndexTimer]; + [commandIndex setObject:@"63" forKey:IRCCommandIndexVoice]; + [commandIndex setObject:@"64" forKey:IRCCommandIndexUnban]; + [commandIndex setObject:@"65" forKey:IRCCommandIndexUnignore]; + [commandIndex setObject:@"66" forKey:IRCCommandIndexUmode]; + //[commandIndex setObject:@"67" forKey:IRCCommandIndexVersion]; — Deprecated index. Duplicate. + [commandIndex setObject:@"68" forKey:IRCCommandIndexWeights]; + [commandIndex setObject:@"69" forKey:IRCCommandIndexEcho]; + [commandIndex setObject:@"70" forKey:IRCCommandIndexDebug]; + [commandIndex setObject:@"71" forKey:IRCCommandIndexClearall]; + [commandIndex setObject:@"72" forKey:IRCCommandIndexAmsg]; + [commandIndex setObject:@"73" forKey:IRCCommandIndexAme]; + [commandIndex setObject:@"74" forKey:IRCCommandIndexMute]; + [commandIndex setObject:@"75" forKey:IRCCommandIndexUnmute]; + [commandIndex setObject:@"76" forKey:IRCCommandIndexUnloadPlugins]; + [commandIndex setObject:@"77" forKey:IRCCommandIndexRemove]; + [commandIndex setObject:@"79" forKey:IRCCommandIndexKickban]; + [commandIndex setObject:@"80" forKey:IRCCommandIndexWallops]; + [commandIndex setObject:@"81" forKey:IRCCommandIndexIcbadge]; + [commandIndex setObject:@"82" forKey:IRCCommandIndexServer]; + [commandIndex setObject:@"83" forKey:IRCCommandIndexConn]; + [commandIndex setObject:@"84" forKey:IRCCommandIndexMyversion]; + [commandIndex setObject:@"85" forKey:IRCCommandIndexChatops]; + [commandIndex setObject:@"86" forKey:IRCCommandIndexGlobops]; + [commandIndex setObject:@"87" forKey:IRCCommandIndexLocops]; + [commandIndex setObject:@"88" forKey:IRCCommandIndexNachat]; + [commandIndex setObject:@"89" forKey:IRCCommandIndexAdchat]; + [commandIndex setObject:@"91" forKey:IRCCommandIndexLoadPlugins]; + [commandIndex setObject:@"92" forKey:IRCCommandIndexSme]; + [commandIndex setObject:@"93" forKey:IRCCommandIndexSmsg]; + [commandIndex setObject:@"94" forKey:IRCCommandIndexLagcheck]; + [commandIndex setObject:@"95" forKey:IRCCommandIndexMylag]; + [commandIndex setObject:@"96" forKey:IRCCommandIndexZline]; + [commandIndex setObject:@"97" forKey:IRCCommandIndexGline]; + [commandIndex setObject:@"98" forKey:IRCCommandIndexGzline]; + [commandIndex setObject:@"99" forKey:IRCCommandIndexShun]; + [commandIndex setObject:@"100" forKey:IRCCommandIndexTempshun]; + [commandIndex setObject:@"101" forKey:IRCCommandIndexAuthenticate]; + [commandIndex setObject:@"102" forKey:IRCCommandIndexCap]; + [commandIndex setObject:@"103" forKey:IRCCommandIndexCaps]; + [commandIndex setObject:@"104" forKey:IRCCommandIndexCcbadge]; } + (NSInteger)commandUIndex:(NSString *)command @@ -237,10 +238,10 @@ + (NSString *)whereScriptsLocalPath return [[self whereResourcePath] stringByAppendingPathComponent:@"Scripts"]; } -#ifdef _USES_APPLICATION_SCRIPTS_FOLDER +#ifdef TXUserScriptsFolderAvailable + (NSString *)whereScriptsUnsupervisedPath { - if ([Preferences featureAvailableToOSXMountainLion]) { + if ([TPCPreferences featureAvailableToOSXMountainLion]) { return [_NSFileManager() URLForDirectory:NSApplicationScriptsDirectory inDomain:NSUserDomainMask appropriateForURL:nil @@ -310,7 +311,7 @@ + (void)setTranscriptFolder:(NSString *)value + (BOOL)sandboxEnabled { - NSString *suffix = [NSString stringWithFormat:@"Containers/%@/Data", [Preferences applicationBundleIdentifier]]; + NSString *suffix = [NSString stringWithFormat:@"Containers/%@/Data", [TPCPreferences applicationBundleIdentifier]]; return [NSHomeDirectory() hasSuffix:suffix]; } @@ -433,17 +434,17 @@ + (NSString *)completionSuffix return [_NSUserDefaults() objectForKey:@"Preferences.General.completion_suffix"]; } -+ (HostmaskBanFormat)banFormat ++ (TXHostmaskBanFormat)banFormat { - return (HostmaskBanFormat)[_NSUserDefaults() integerForKey:@"Preferences.General.banformat"]; + return (TXHostmaskBanFormat)[_NSUserDefaults() integerForKey:@"Preferences.General.banformat"]; } -+ (NSDoubleN)viewLoopConsoleDelay ++ (TXNSDouble)viewLoopConsoleDelay { return [_NSUserDefaults() doubleForKey:@"Preferences.Experimental.view_loop_console_delay"]; } -+ (NSDoubleN)viewLoopChannelDelay ++ (TXNSDouble)viewLoopChannelDelay { return [_NSUserDefaults() doubleForKey:@"Preferences.Experimental.view_loop_channel_delay"]; } @@ -553,9 +554,9 @@ + (BOOL)countPublicMessagesInIconBadge return [_NSUserDefaults() boolForKey:@"Preferences.General.dockbadge_countpub"]; } -+ (TabActionType)tabAction ++ (TXTabKeyActionType)tabAction { - return (TabActionType)[_NSUserDefaults() integerForKey:@"Preferences.General.tab_action"]; + return (TXTabKeyActionType)[_NSUserDefaults() integerForKey:@"Preferences.General.tab_action"]; } + (BOOL)keywordCurrentNick @@ -568,9 +569,9 @@ + (NSArray *)keywordDislikeWords return [_NSUserDefaults() objectForKey:@"Preferences.Keyword.dislike_words"]; } -+ (KeywordMatchType)keywordMatchingMethod ++ (TXNicknameHighlightMatchType)keywordMatchingMethod { - return (KeywordMatchType)[_NSUserDefaults() integerForKey:@"Preferences.Keyword.matching_method"]; + return (TXNicknameHighlightMatchType)[_NSUserDefaults() integerForKey:@"Preferences.Keyword.matching_method"]; } + (NSArray *)keywordWords @@ -578,19 +579,19 @@ + (NSArray *)keywordWords return [_NSUserDefaults() objectForKey:@"Preferences.Keyword.words"]; } -+ (UserDoubleClickAction)userDoubleClickOption ++ (TXUserDoubleClickAction)userDoubleClickOption { - return (UserDoubleClickAction)[_NSUserDefaults() integerForKey:@"Preferences.General.user_doubleclick_action"]; + return (TXUserDoubleClickAction)[_NSUserDefaults() integerForKey:@"Preferences.General.user_doubleclick_action"]; } -+ (NoticesSendToLocation)locationToSendNotices ++ (TXNoticeSendLocationType)locationToSendNotices { - return (NoticesSendToLocation)[_NSUserDefaults() integerForKey:@"Preferences.General.notices_sendto_location"]; + return (TXNoticeSendLocationType)[_NSUserDefaults() integerForKey:@"Preferences.General.notices_sendto_location"]; } -+ (CmdWShortcutResponseType)cmdWResponseType ++ (TXCmdWShortcutResponseType)cmdWResponseType { - return (CmdWShortcutResponseType)[_NSUserDefaults() integerForKey:@"Preferences.General.keyboard_cmdw_response"]; + return (TXCmdWShortcutResponseType)[_NSUserDefaults() integerForKey:@"Preferences.General.keyboard_cmdw_response"]; } #pragma mark - @@ -616,12 +617,12 @@ + (void)setThemeChannelViewFontName:(NSString *)value [_NSUserDefaults() setObject:value forKey:@"Preferences.Theme.log_font_name"]; } -+ (NSDoubleN)themeChannelViewFontSize ++ (TXNSDouble)themeChannelViewFontSize { return [_NSUserDefaults() doubleForKey:@"Preferences.Theme.log_font_size"]; } -+ (void)setThemeChannelViewFontSize:(NSDoubleN)value ++ (void)setThemeChannelViewFontSize:(TXNSDouble)value { [_NSUserDefaults() setDouble:value forKey:@"Preferences.Theme.log_font_size"]; } @@ -641,7 +642,7 @@ + (NSString *)themeTimestampFormat return [_NSUserDefaults() objectForKey:@"Preferences.Theme.timestamp_format"]; } -+ (NSDoubleN)themeTransparency ++ (TXNSDouble)themeTransparency { return [_NSUserDefaults() doubleForKey:@"Preferences.Theme.transparency"]; } @@ -683,47 +684,47 @@ + (void)setMaxLogLines:(NSInteger)value #pragma mark - #pragma mark Events -+ (NSString *)titleForEvent:(NotificationType)event ++ (NSString *)titleForEvent:(TXNotificationType)event { switch (event) { - case NOTIFICATION_HIGHLIGHT: return TXTLS(@"NOTIFICATION_HIGHLIGHT"); - case NOTIFICATION_NEW_TALK: return TXTLS(@"NOTIFICATION_NEW_TALK"); - case NOTIFICATION_CHANNEL_MSG: return TXTLS(@"NOTIFICATION_CHANNEL_MSG"); - case NOTIFICATION_CHANNEL_NOTICE: return TXTLS(@"NOTIFICATION_CHANNEL_NOTICE"); - case NOTIFICATION_TALK_MSG: return TXTLS(@"NOTIFICATION_TALK_MSG"); - case NOTIFICATION_TALK_NOTICE: return TXTLS(@"NOTIFICATION_TALK_NOTICE"); - case NOTIFICATION_KICKED: return TXTLS(@"NOTIFICATION_KICKED"); - case NOTIFICATION_INVITED: return TXTLS(@"NOTIFICATION_INVITED"); - case NOTIFICATION_LOGIN: return TXTLS(@"NOTIFICATION_LOGIN"); - case NOTIFICATION_DISCONNECT: return TXTLS(@"NOTIFICATION_DISCONNECT"); - case NOTIFICATION_ADDRESS_BOOK_MATCH: return TXTLS(@"NOTIFICATION_ADDRESS_BOOK_MATCH"); + case TXNotificationHighlightType: return TXTLS(@"TXNotificationHighlightType"); + case TXNotificationNewQueryType: return TXTLS(@"TXNotificationNewQueryType"); + case TXNotificationChannelMessageType: return TXTLS(@"TXNotificationChannelMessageType"); + case TXNotificationChannelNoticeType: return TXTLS(@"TXNotificationChannelNoticeType"); + case TXNotificationQueryMessageType: return TXTLS(@"TXNotificationQueryMessageType"); + case TXNotificationQueryNoticeType: return TXTLS(@"TXNotificationQueryNoticeType"); + case TXNotificationKickType: return TXTLS(@"TXNotificationKickType"); + case TXNotificationInviteType: return TXTLS(@"TXNotificationInviteType"); + case TXNotificationConnectType: return TXTLS(@"TXNotificationConnectType"); + case TXNotificationDisconnectType: return TXTLS(@"TXNotificationDisconnectType"); + case TXNotificationAddressBookMatchType: return TXTLS(@"TXNotificationAddressBookMatchType"); default: return nil; } return nil; } -+ (NSString *)keyForEvent:(NotificationType)event ++ (NSString *)keyForEvent:(TXNotificationType)event { switch (event) { - case NOTIFICATION_HIGHLIGHT: return @"eventHighlight"; - case NOTIFICATION_NEW_TALK: return @"eventNewtalk"; - case NOTIFICATION_CHANNEL_MSG: return @"eventChannelText"; - case NOTIFICATION_CHANNEL_NOTICE: return @"eventChannelNotice"; - case NOTIFICATION_TALK_MSG: return @"eventTalkText"; - case NOTIFICATION_TALK_NOTICE: return @"eventTalkNotice"; - case NOTIFICATION_KICKED: return @"eventKicked"; - case NOTIFICATION_INVITED: return @"eventInvited"; - case NOTIFICATION_LOGIN: return @"eventLogin"; - case NOTIFICATION_DISCONNECT: return @"eventDisconnect"; - case NOTIFICATION_ADDRESS_BOOK_MATCH: return @"eventAddressBookMatch"; + case TXNotificationHighlightType: return @"eventHighlight"; + case TXNotificationNewQueryType: return @"eventNewtalk"; + case TXNotificationChannelMessageType: return @"eventChannelText"; + case TXNotificationChannelNoticeType: return @"eventChannelNotice"; + case TXNotificationQueryMessageType: return @"eventTalkText"; + case TXNotificationQueryNoticeType: return @"eventTalkNotice"; + case TXNotificationKickType: return @"eventKicked"; + case TXNotificationInviteType: return @"eventInvited"; + case TXNotificationConnectType: return @"eventLogin"; + case TXNotificationDisconnectType: return @"eventDisconnect"; + case TXNotificationAddressBookMatchType: return @"eventAddressBookMatch"; default: return nil; } return nil; } -+ (NSString *)soundForEvent:(NotificationType)event ++ (NSString *)soundForEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -736,7 +737,7 @@ + (NSString *)soundForEvent:(NotificationType)event return [_NSUserDefaults() objectForKey:key]; } -+ (void)setSound:(NSString *)value forEvent:(NotificationType)event ++ (void)setSound:(NSString *)value forEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -749,7 +750,7 @@ + (void)setSound:(NSString *)value forEvent:(NotificationType)event [_NSUserDefaults() setObject:value forKey:key]; } -+ (BOOL)growlEnabledForEvent:(NotificationType)event ++ (BOOL)growlEnabledForEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -762,7 +763,7 @@ + (BOOL)growlEnabledForEvent:(NotificationType)event return [_NSUserDefaults() boolForKey:key]; } -+ (void)setGrowlEnabled:(BOOL)value forEvent:(NotificationType)event ++ (void)setGrowlEnabled:(BOOL)value forEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -775,7 +776,7 @@ + (void)setGrowlEnabled:(BOOL)value forEvent:(NotificationType)event [_NSUserDefaults() setBool:value forKey:key]; } -+ (BOOL)growlStickyForEvent:(NotificationType)event ++ (BOOL)growlStickyForEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -788,7 +789,7 @@ + (BOOL)growlStickyForEvent:(NotificationType)event return [_NSUserDefaults() boolForKey:key]; } -+ (void)setGrowlSticky:(BOOL)value forEvent:(NotificationType)event ++ (void)setGrowlSticky:(BOOL)value forEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -801,7 +802,7 @@ + (void)setGrowlSticky:(BOOL)value forEvent:(NotificationType)event [_NSUserDefaults() setBool:value forKey:key]; } -+ (BOOL)disableWhileAwayForEvent:(NotificationType)event ++ (BOOL)disableWhileAwayForEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -814,7 +815,7 @@ + (BOOL)disableWhileAwayForEvent:(NotificationType)event return [_NSUserDefaults() boolForKey:key]; } -+ (void)setDisableWhileAway:(BOOL)value forEvent:(NotificationType)event ++ (void)setDisableWhileAway:(BOOL)value forEvent:(TXNotificationType)event { NSString *okey = [self keyForEvent:event]; @@ -1019,13 +1020,13 @@ + (void)defaultIRCClientPrompt NSBundle *defaultClientBundle = [NSBundle bundleWithURL:CFBridgingRelease(ircAppURL)]; if ([[defaultClientBundle bundleIdentifier] isNotEqualTo:[mainBundle bundleIdentifier]]) { - [PopupPrompts sheetWindowWithQuestion:[NSApp keyWindow] + [TLOPopupPrompts sheetWindowWithQuestion:[NSApp keyWindow] target:self action:@selector(defaultIRCClientSheetCallback:) - body:TXTLS(@"DEFAULT_IRC_CLIENT_PROMPT_MESSAGE") - title:TXTLS(@"DEFAULT_IRC_CLIENT_PROMPT_TITLE") - defaultButton:TXTLS(@"YES_BUTTON") - alternateButton:TXTLS(@"NO_BUTTON") + body:TXTLS(@"SetAsDefaultIRCClientPromptMessage") + title:TXTLS(@"SetAsDefaultIRCClientPromptTitle") + defaultButton:TXTLS(@"YesButton") + alternateButton:TXTLS(@"NoButton") otherButton:nil suppressionKey:@"default_irc_client" suppressionText:nil]; @@ -1072,7 +1073,7 @@ + (void)initPreferences [d setBool:YES forKey:@"Preferences.General.reply_ctcp_requests"]; [d setBool:YES forKey:@"Preferences.General.log_antialiasing"]; [d setBool:NO forKey:@"AutoSpellCorrection"]; - [d setBool:NO forKey:DeveloperEnvironmentToken]; + [d setBool:NO forKey:TXDeveloperEnvironmentToken]; [d setBool:NO forKey:@"Preferences.General.log_transcript"]; [d setBool:NO forKey:@"ForceServerListBadgeLocalization"]; [d setBool:NO forKey:@"Preferences.General.copyonselect"]; @@ -1099,30 +1100,30 @@ + (void)initPreferences [d setBool:NO forKey:@"Preferences.General.dockbadge_countpub"]; [d setBool:NO forKey:@"Preferences.General.disable_nickname_colors"]; - [d setObject:@"Glass" forKey:@"eventHighlightSound"]; - [d setObject:@"ircop alert" forKey:@"Preferences.General.ircop_alert_match"]; - [d setObject:@"Guest" forKey:@"Preferences.Identity.nickname"]; - [d setObject:@"textual" forKey:@"Preferences.Identity.username"]; - [d setObject:@"Textual User" forKey:@"Preferences.Identity.realname"]; - [d setObject:TXTLS(@"SHUN_REASON") forKey:@"Preferences.General.ircop_shun_message"]; - [d setObject:TXTLS(@"KILL_REASON") forKey:@"Preferences.General.ircop_kill_message"]; - [d setObject:TXTLS(@"GLINE_REASON") forKey:@"Preferences.General.ircop_gline_message"]; - [d setObject:TXTLS(@"KICK_REASON") forKey:@"Preferences.General.kick_message"]; - [d setObject:DEFAULT_TEXTUAL_STYLE forKey:@"Preferences.Theme.name"]; - [d setObject:DEFAULT_TEXTUAL_FONT forKey:@"Preferences.Theme.log_font_name"]; - [d setObject:@"<%@%n>" forKey:@"Preferences.Theme.nick_format"]; - [d setObject:@"[%H:%M:%S]" forKey:@"Preferences.Theme.timestamp_format"]; - [d setObject:@"~/Documents/Textual Logs" forKey:@"Preferences.General.transcript_folder"]; - - [d setInteger:2 forKey:@"Preferences.General.autojoin_maxchans"]; - [d setInteger:300 forKey:@"Preferences.General.max_log_lines"]; - [d setInteger:300 forKey:@"Preferences.General.inline_image_width"]; - [d setInteger:TAB_COMPLETE_NICK forKey:@"Preferences.General.tab_action"]; - [d setInteger:KEYWORD_MATCH_EXACT forKey:@"Preferences.Keyword.matching_method"]; - [d setInteger:HMBAN_FORMAT_WHAINN forKey:@"Preferences.General.banformat"]; - [d setInteger:NOTICES_SENDTO_CONSOLE forKey:@"Preferences.General.notices_sendto_location"]; - [d setInteger:USERDC_ACTION_QUERY forKey:@"Preferences.General.user_doubleclick_action"]; - [d setInteger:CMDWKEY_SHORTCUT_CLOSE forKey:@"Preferences.General.keyboard_cmdw_response"]; + [d setObject:@"Glass" forKey:@"eventHighlightSound"]; + [d setObject:@"ircop alert" forKey:@"Preferences.General.ircop_alert_match"]; + [d setObject:@"Guest" forKey:@"Preferences.Identity.nickname"]; + [d setObject:@"textual" forKey:@"Preferences.Identity.username"]; + [d setObject:@"Textual User" forKey:@"Preferences.Identity.realname"]; + [d setObject:TXTLS(@"ShunReason") forKey:@"Preferences.General.ircop_shun_message"]; + [d setObject:TXTLS(@"KillReason") forKey:@"Preferences.General.ircop_kill_message"]; + [d setObject:TXTLS(@"GlineReason") forKey:@"Preferences.General.ircop_gline_message"]; + [d setObject:TXTLS(@"KickReason") forKey:@"Preferences.General.kick_message"]; + [d setObject:TXDefaultTextualLogStyle forKey:@"Preferences.Theme.name"]; + [d setObject:TXDefaultTextualLogFont forKey:@"Preferences.Theme.log_font_name"]; + [d setObject:TXDefaultTextualNicknameFormat forKey:@"Preferences.Theme.nick_format"]; + [d setObject:TXDefaultTextualTimestampFormat forKey:@"Preferences.Theme.timestamp_format"]; + [d setObject:@"~/Documents/Textual Logs" forKey:@"Preferences.General.transcript_folder"]; + + [d setInteger:2 forKey:@"Preferences.General.autojoin_maxchans"]; + [d setInteger:300 forKey:@"Preferences.General.max_log_lines"]; + [d setInteger:300 forKey:@"Preferences.General.inline_image_width"]; + [d setInteger:TXTabKeyActionNickCompleteType forKey:@"Preferences.General.tab_action"]; + [d setInteger:TXNicknameHighlightExactMatchType forKey:@"Preferences.Keyword.matching_method"]; + [d setInteger:TXHostmaskBanWHAINNFormat forKey:@"Preferences.General.banformat"]; + [d setInteger:TXNoticeSendServerConsoleType forKey:@"Preferences.General.notices_sendto_location"]; + [d setInteger:TXUserDoubleClickQueryAction forKey:@"Preferences.General.user_doubleclick_action"]; + [d setInteger:TXCmdWShortcutCloseWindowType forKey:@"Preferences.General.keyboard_cmdw_response"]; [d setDouble:0.05 forKey:@"Preferences.Experimental.view_loop_console_delay"]; [d setDouble:0.07 forKey:@"Preferences.Experimental.view_loop_channel_delay"]; @@ -1149,24 +1150,24 @@ + (void)initPreferences /* Sandbox Check */ - [_NSUserDefaults() setBool:[Preferences sandboxEnabled] forKey:@"Preferences.security.sandbox_enabled"]; + [_NSUserDefaults() setBool:[TPCPreferences sandboxEnabled] forKey:@"Preferences.security.sandbox_enabled"]; /* Font Check */ - if ([NSFont fontIsAvailable:[Preferences themeChannelViewFontName]] == NO) { - [_NSUserDefaults() setObject:DEFAULT_TEXTUAL_FONT forKey:@"Preferences.Theme.log_font_name"]; + if ([NSFont fontIsAvailable:[TPCPreferences themeChannelViewFontName]] == NO) { + [_NSUserDefaults() setObject:TXDefaultTextualLogFont forKey:@"Preferences.Theme.log_font_name"]; } /* Theme Check */ - NSString *themeName = [ViewTheme extractThemeName:[Preferences themeName]]; - NSString *themePath = [[Preferences whereThemesPath] stringByAppendingPathComponent:themeName]; + NSString *themeName = [TPCViewTheme extractThemeName:[TPCPreferences themeName]]; + NSString *themePath = [[TPCPreferences whereThemesPath] stringByAppendingPathComponent:themeName]; if ([_NSFileManager() fileExistsAtPath:themePath] == NO) { - themePath = [[Preferences whereThemesLocalPath] stringByAppendingPathComponent:themeName]; + themePath = [[TPCPreferences whereThemesLocalPath] stringByAppendingPathComponent:themeName]; if ([_NSFileManager() fileExistsAtPath:themePath] == NO) { - [_NSUserDefaults() setObject:DEFAULT_TEXTUAL_STYLE forKey:@"Preferences.Theme.name"]; + [_NSUserDefaults() setObject:TXDefaultTextualLogStyle forKey:@"Preferences.Theme.name"]; } else { NSString *newName = [NSString stringWithFormat:@"resource:%@", themeName]; diff --git a/Classes/Preferences/ViewTheme.m b/Classes/Preferences/TPCViewTheme.m similarity index 74% rename from Classes/Preferences/ViewTheme.m rename to Classes/Preferences/TPCViewTheme.m index 95f517a029..d6cfa5e5c9 100755 --- a/Classes/Preferences/ViewTheme.m +++ b/Classes/Preferences/TPCViewTheme.m @@ -3,11 +3,11 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@interface ViewTheme (Private) +@interface TPCViewTheme (Private) - (void)load; @end -@implementation ViewTheme +@implementation TPCViewTheme @synthesize baseUrl; @synthesize core_js; @@ -18,10 +18,10 @@ @implementation ViewTheme - (id)init { if ((self = [super init])) { - self.other = [OtherTheme new]; + self.other = [TPCOtherTheme new]; - self.core_js = [FileWithContent new]; - self.core_js.filename = [[Preferences whereResourcePath] stringByAppendingPathComponent:@"/JavaScript/API/core.js"]; + self.core_js = [TLOFileWithContent new]; + self.core_js.filename = [[TPCPreferences whereResourcePath] stringByAppendingPathComponent:@"/JavaScript/API/core.js"]; } return self; @@ -39,19 +39,19 @@ - (void)setName:(NSString *)value - (void)validateFilePathExistanceAndReload:(BOOL)reload { if (self.name) { - NSString *kind = [ViewTheme extractThemeSource:[Preferences themeName]]; - NSString *filename = [ViewTheme extractThemeName:[Preferences themeName]]; + NSString *kind = [TPCViewTheme extractThemeSource:[TPCPreferences themeName]]; + NSString *filename = [TPCViewTheme extractThemeName:[TPCPreferences themeName]]; if (NSObjectIsNotEmpty(kind) && NSObjectIsNotEmpty(filename)) { if ([kind isEqualToString:@"resource"]) { - path = [[Preferences whereThemesLocalPath] stringByAppendingPathComponent:filename]; + path = [[TPCPreferences whereThemesLocalPath] stringByAppendingPathComponent:filename]; } else { - path = [[Preferences whereThemesPath] stringByAppendingPathComponent:filename]; + path = [[TPCPreferences whereThemesPath] stringByAppendingPathComponent:filename]; } if ([_NSFileManager() fileExistsAtPath:path] == NO) { if ([kind isEqualToString:@"resource"] == NO) { - path = [[Preferences whereThemesLocalPath] stringByAppendingPathComponent:filename]; + path = [[TPCPreferences whereThemesLocalPath] stringByAppendingPathComponent:filename]; if (reload) [self reload]; } diff --git a/Classes/Views/Log/LogRenderer.m b/Classes/Views/Log/LVCLogRenderer.m similarity index 72% rename from Classes/Views/Log/LogRenderer.m rename to Classes/Views/Log/LVCLogRenderer.m index 6220b31ef4..a678f7015a 100755 --- a/Classes/Views/Log/LogRenderer.m +++ b/Classes/Views/Log/LVCLogRenderer.m @@ -3,30 +3,29 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define URL_ATTR (1 << 31) -#define ADDRESS_ATTR (1 << 30) // deprecated -#define CHANNEL_NAME_ATTR (1 << 29) -#define BOLD_ATTR (1 << 28) -#define UNDERLINE_ATTR (1 << 27) -#define ITALIC_ATTR (1 << 26) -#define TEXT_COLOR_ATTR (1 << 25) -#define BACKGROUND_COLOR_ATTR (1 << 24) -#define CONVERSATION_TRKR_ATTR (1 << 23) -#define HIGHLIGHT_KEYWORD_ATTR (1 << 22) +#define _rendererURLAttribute (1 << 31) +#define _rendererAddressAttribute (1 << 30) // deprecated +#define _rendererChannelNameAttribute (1 << 29) +#define _rendererBoldFormatAttribute (1 << 28) +#define _rendererUnderlineFormatAttribute (1 << 27) +#define _rendererItalicFormatAttribute (1 << 26) +#define _rendererTextColorAttribute (1 << 25) +#define _rendererBackgroundColorAttribute (1 << 24) +#define _rendererConversationTrackerAttribute (1 << 23) +#define _rendererKeywordHighlightAttribute (1 << 22) -#define BACKGROUND_COLOR_MASK (0xF0) -#define TEXT_COLOR_MASK (0x0F) - -#define EFFECT_MASK (BOLD_ATTR | UNDERLINE_ATTR | ITALIC_ATTR | TEXT_COLOR_ATTR | BACKGROUND_COLOR_ATTR) +#define _backgroundColorMask (0xF0) +#define _textColorMask (0x0F) +#define _effectMask (_rendererBoldFormatAttribute | _rendererUnderlineFormatAttribute | _rendererItalicFormatAttribute | _rendererTextColorAttribute | _rendererBackgroundColorAttribute) NSComparisonResult nicknameLengthSort(IRCUser *s1, IRCUser *s2, void *context); typedef uint32_t attr_t; -static void setFlag(attr_t* attrBuf, attr_t flag, NSInteger start, NSInteger len) +static void setFlag(attr_t *attrBuf, attr_t flag, NSInteger start, NSInteger len) { - attr_t* target = attrBuf + start; - attr_t* end = target + len; + attr_t *target = (attrBuf + start); + attr_t *end = (target + len); while (target < end) { *target |= flag; @@ -34,20 +33,21 @@ static void setFlag(attr_t* attrBuf, attr_t flag, NSInteger start, NSInteger len } } -static BOOL isClear(attr_t* attrBuf, attr_t flag, NSInteger start, NSInteger len) +static BOOL isClear(attr_t *attrBuf, attr_t flag, NSInteger start, NSInteger len) { - attr_t* target = attrBuf + start; - attr_t* end = target + len; + attr_t *target = (attrBuf + start); + attr_t *end = (target + len); while (target < end) { if (*target & flag) return NO; + ++target; } return YES; } -static NSInteger getNextAttributeRange(attr_t* attrBuf, NSInteger start, NSInteger len) +static NSInteger getNextAttributeRange(attr_t *attrBuf, NSInteger start, NSInteger len) { attr_t target = attrBuf[start]; @@ -55,21 +55,21 @@ static NSInteger getNextAttributeRange(attr_t* attrBuf, NSInteger start, NSInteg attr_t t = attrBuf[i]; if (NSDissimilarObjects(t, target)) { - return i - start; + return (i - start); } } - return len - start; + return (len - start); } NSComparisonResult nicknameLengthSort(IRCUser *s1, IRCUser *s2, void *context) { - return ([s1.nick length] <= [s2.nick length]); + return (s1.nick.length <= s2.nick.length); } NSString *logEscape(NSString *s) { - return [[s gtm_stringByEscapingForHTML] stringByReplacingOccurrencesOfString:@" " withString:@"  "]; + return [s.gtm_stringByEscapingForHTML stringByReplacingOccurrencesOfString:@" " withString:@"  "]; } NSString *logEscapeWithNil(NSString *s) @@ -77,7 +77,7 @@ NSComparisonResult nicknameLengthSort(IRCUser *s1, IRCUser *s2, void *context) NSString *escaped = logEscape(s); if (NSObjectIsEmpty(escaped)) { - return NSNullObject; + return NSStringEmptyPlaceholder; } return escaped; @@ -103,8 +103,8 @@ NSInteger mapColorValue(NSColor *color) CGFloat greenc = [mapped greenComponent]; CGFloat alphac = [mapped alphaComponent]; - if (DirtyCGFloatsMatch(_redc, redc) && DirtyCGFloatsMatch(_bluec, bluec) && - DirtyCGFloatsMatch(_greenc, greenc) && DirtyCGFloatsMatch(_alphac, alphac)) { + if (TXDirtyCGFloatsMatch(_redc, redc) && TXDirtyCGFloatsMatch(_bluec, bluec) && + TXDirtyCGFloatsMatch(_greenc, greenc) && TXDirtyCGFloatsMatch(_alphac, alphac)) { return i; } @@ -158,14 +158,14 @@ NSInteger mapColorValue(NSColor *color) { NSRange r = NSMakeRange(start, len); - if (attr & EFFECT_MASK) { + if (attr & _effectMask) { NSFont *boldItalic = font; - if (attr & BOLD_ATTR) { + if (attr & _rendererBoldFormatAttribute) { boldItalic = [_NSFontManager() convertFont:boldItalic toHaveTrait:NSBoldFontMask]; } - if (attr & ITALIC_ATTR) { + if (attr & _rendererItalicFormatAttribute) { boldItalic = [_NSFontManager() convertFont:boldItalic toHaveTrait:NSItalicFontMask]; if ([boldItalic fontTraitSet:NSItalicFontMask] == NO) { @@ -177,18 +177,18 @@ NSInteger mapColorValue(NSColor *color) [body addAttribute:NSFontAttributeName value:boldItalic range:r]; } - if (attr & UNDERLINE_ATTR) { + if (attr & _rendererUnderlineFormatAttribute) { [body addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInt:NSSingleUnderlineStyle] range:r]; } - if (attr & TEXT_COLOR_ATTR) { - NSInteger colorCode = (attr & TEXT_COLOR_MASK); + if (attr & _rendererTextColorAttribute) { + NSInteger colorCode = (attr & _textColorMask); [body addAttribute:NSForegroundColorAttributeName value:mapColorCode(colorCode) range:r]; } - if (attr & BACKGROUND_COLOR_ATTR) { - NSInteger colorCode = ((attr & BACKGROUND_COLOR_MASK) >> 4); + if (attr & _rendererBackgroundColorAttribute) { + NSInteger colorCode = ((attr & _backgroundColorMask) >> 4); [body addAttribute:NSBackgroundColorAttributeName value:mapColorCode(colorCode) range:r]; } @@ -197,11 +197,11 @@ NSInteger mapColorValue(NSColor *color) return body; } -static NSString *renderRange(NSString *body, attr_t attr, NSInteger start, NSInteger len, LogController *log) +static NSString *renderRange(NSString *body, attr_t attr, NSInteger start, NSInteger len, TVCLogController *log) { NSString *content = [body safeSubstringWithRange:NSMakeRange(start, len)]; - if (attr & URL_ATTR) { + if (attr & _rendererURLAttribute) { NSString *link = content; if ([link contains:@"://"] == NO) { @@ -209,7 +209,7 @@ NSInteger mapColorValue(NSColor *color) } return [NSString stringWithFormat:@"%@", link, logEscape(content)]; - } else if (attr & CHANNEL_NAME_ATTR) { + } else if (attr & _rendererChannelNameAttribute) { return [NSString stringWithFormat:@"%@", logEscape(content)]; } else { BOOL matchedUser = NO; @@ -218,7 +218,7 @@ NSInteger mapColorValue(NSColor *color) NSMutableString *s = [NSMutableString string]; - if (attr & CONVERSATION_TRKR_ATTR) { + if (attr & _rendererConversationTrackerAttribute) { IRCClient *client = log.client; IRCUser *user = [log.channel findMember:content options:NSCaseInsensitiveSearch]; @@ -231,17 +231,17 @@ NSInteger mapColorValue(NSColor *color) } } - if (attr & EFFECT_MASK) { + if (attr & _effectMask) { [s appendString:@"> 4]; + if (attr & _rendererTextColorAttribute) [s appendFormat:@" color-number=\"%d\"", (attr & _textColorMask)]; + if (attr & _rendererBackgroundColorAttribute) [s appendFormat:@" bgcolor-number=\"%d\"", (attr & _backgroundColorMask) >> 4]; [s appendFormat:@">%@", content]; } else { @@ -260,19 +260,19 @@ NSInteger mapColorValue(NSColor *color) } } -@implementation LogRenderer +@implementation LVCLogRenderer + (NSString *)renderBody:(NSString *)body - controller:(LogController *)log - renderType:(LogRendererType)drawingType + controller:(TVCLogController *)log + renderType:(TVCLogRendererType)drawingType properties:(NSDictionary *)inputDictionary resultInfo:(NSDictionary **)outputDictionary { NSMutableDictionary *resultInfo = [NSMutableDictionary dictionary]; BOOL renderLinks = [inputDictionary boolForKey:@"renderLinks"]; - BOOL exactWordMatching = ([Preferences keywordMatchingMethod] == KEYWORD_MATCH_EXACT); - BOOL regexWordMatching = ([Preferences keywordMatchingMethod] == KEYWORD_MATCH_REGEX); + BOOL exactWordMatching = ([TPCPreferences keywordMatchingMethod] == TXNicknameHighlightExactMatchType); + BOOL regexWordMatching = ([TPCPreferences keywordMatchingMethod] == TXNicknameHighlightRegularExpressionMatchType); NSArray *keywords = [inputDictionary arrayForKey:@"keywords"]; NSArray *excludeWords = [inputDictionary arrayForKey:@"excludeWords"]; @@ -300,10 +300,10 @@ + (NSString *)renderBody:(NSString *)body switch (c) { case 0x02: { - if (currentAttr & BOLD_ATTR) { - currentAttr &= ~BOLD_ATTR; + if (currentAttr & _rendererBoldFormatAttribute) { + currentAttr &= ~_rendererBoldFormatAttribute; } else { - currentAttr |= BOLD_ATTR; + currentAttr |= _rendererBoldFormatAttribute; } continue; @@ -316,7 +316,7 @@ + (NSString *)renderBody:(NSString *)body if ((i + 1) < len) { c = source[i+1]; - if (IsNumeric(c)) { + if (TXIsNumeric(c)) { ++i; textColor = (c - '0'); @@ -324,7 +324,7 @@ + (NSString *)renderBody:(NSString *)body if ((i + 1) < len) { c = source[i+1]; - if (IsIRCColor(c, textColor)) { + if (TXIsIRCColor(c, textColor)) { ++i; textColor = (textColor * 10 + c - '0'); @@ -339,7 +339,7 @@ + (NSString *)renderBody:(NSString *)body if ((i + 1) < len) { c = source[i+1]; - if (IsNumeric(c)) { + if (TXIsNumeric(c)) { ++i; backgroundColor = (c - '0'); @@ -347,7 +347,7 @@ + (NSString *)renderBody:(NSString *)body if ((i + 1) < len) { c = source[i+1]; - if (IsIRCColor(c, backgroundColor)) { + if (TXIsIRCColor(c, backgroundColor)) { ++i; backgroundColor = (backgroundColor * 10 + c - '0'); @@ -362,24 +362,24 @@ + (NSString *)renderBody:(NSString *)body } } - currentAttr &= ~(TEXT_COLOR_ATTR | BACKGROUND_COLOR_ATTR | 0xFF); + currentAttr &= ~(_rendererTextColorAttribute | _rendererBackgroundColorAttribute | 0xFF); if (backgroundColor >= 0) { backgroundColor %= 16; - currentAttr |= BACKGROUND_COLOR_ATTR; - currentAttr |= (backgroundColor << 4) & BACKGROUND_COLOR_MASK; + currentAttr |= _rendererBackgroundColorAttribute; + currentAttr |= (backgroundColor << 4) & _backgroundColorMask; } else { - currentAttr &= ~(BACKGROUND_COLOR_ATTR | BACKGROUND_COLOR_MASK); + currentAttr &= ~(_rendererBackgroundColorAttribute | _backgroundColorMask); } if (textColor >= 0) { textColor %= 16; - currentAttr |= TEXT_COLOR_ATTR; - currentAttr |= textColor & TEXT_COLOR_MASK; + currentAttr |= _rendererTextColorAttribute; + currentAttr |= textColor & _textColorMask; } else { - currentAttr &= ~(TEXT_COLOR_ATTR | TEXT_COLOR_MASK); + currentAttr &= ~(_rendererTextColorAttribute | _textColorMask); } } continue; @@ -391,20 +391,20 @@ + (NSString *)renderBody:(NSString *)body } case 0x16: { - if (currentAttr & ITALIC_ATTR) { - currentAttr &= ~ITALIC_ATTR; + if (currentAttr & _rendererItalicFormatAttribute) { + currentAttr &= ~_rendererItalicFormatAttribute; } else { - currentAttr |= ITALIC_ATTR; + currentAttr |= _rendererItalicFormatAttribute; } continue; } case 0x1F: { - if (currentAttr & UNDERLINE_ATTR) { - currentAttr &= ~UNDERLINE_ATTR; + if (currentAttr & _rendererUnderlineFormatAttribute) { + currentAttr &= ~_rendererUnderlineFormatAttribute; } else { - currentAttr |= UNDERLINE_ATTR; + currentAttr |= _rendererUnderlineFormatAttribute; } continue; @@ -419,20 +419,20 @@ + (NSString *)renderBody:(NSString *)body len = n; body = [NSString stringWithCharacters:dest length:n]; - if (drawingType == ASCII_TO_HTML) { + if (drawingType == TVCLogRendererHTMLType) { /* Links */ if (renderLinks) { NSMutableArray *urlAry = [NSMutableArray array]; - NSArray *urlAryRanges = [URLParser locatedLinksForString:body]; + NSArray *urlAryRanges = [TLOLinkParser locatedLinksForString:body]; if (NSObjectIsNotEmpty(urlAryRanges)) { for (NSString *rn in urlAryRanges) { NSRange r = NSRangeFromString(rn); if (r.length >= 1) { - setFlag(attrBuf, URL_ATTR, r.location, r.length); + setFlag(attrBuf, _rendererURLAttribute, r.location, r.length); [urlAry safeAddObject:[NSValue valueWithRange:r]]; } @@ -470,7 +470,7 @@ + (NSString *)renderBody:(NSString *)body if (regexWordMatching) { for (NSString *keyword in keywords) { - NSRange matchRange = [TXRegularExpression string:body rangeOfRegex:keyword withoutCase:YES]; + NSRange matchRange = [TLORegularExpression string:body rangeOfRegex:keyword withoutCase:YES]; if (matchRange.location == NSNotFound) { continue; @@ -486,7 +486,7 @@ + (NSString *)renderBody:(NSString *)body } if (enabled) { - setFlag(attrBuf, HIGHLIGHT_KEYWORD_ATTR, matchRange.location, matchRange.length); + setFlag(attrBuf, _rendererKeywordHighlightAttribute, matchRange.location, matchRange.length); foundKeyword = YES; @@ -511,7 +511,7 @@ + (NSString *)renderBody:(NSString *)body keyword = [keyword safeSubstringToIndex:atsrange.location]; - NSArray *excldlist = [excludeList split:NSWhitespaceCharacter]; + NSArray *excldlist = [excludeList split:NSStringWhitespacePlaceholder]; for (NSString *exchan in excldlist) { if ([exchan hasPrefix:@"-"] == NO && [exchan hasPrefix:@"+"] == NO) { @@ -564,13 +564,13 @@ + (NSString *)renderBody:(NSString *)body if (enabled) { UniChar c = [body characterAtIndex:r.location]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { NSInteger prev = (r.location - 1); if (0 <= prev && prev < len) { UniChar c = [body characterAtIndex:prev]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { enabled = NO; } } @@ -580,13 +580,13 @@ + (NSString *)renderBody:(NSString *)body if (enabled) { UniChar c = [body characterAtIndex:(NSMaxRange(r) - 1)]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { NSInteger next = NSMaxRange(r); if (next < len) { UniChar c = [body characterAtIndex:next]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { enabled = NO; } } @@ -595,8 +595,8 @@ + (NSString *)renderBody:(NSString *)body } if (enabled) { - if (isClear(attrBuf, URL_ATTR, r.location, r.length)) { - setFlag(attrBuf, HIGHLIGHT_KEYWORD_ATTR, r.location, r.length); + if (isClear(attrBuf, _rendererURLAttribute, r.location, r.length)) { + setFlag(attrBuf, _rendererKeywordHighlightAttribute, r.location, r.length); foundKeyword = YES; @@ -625,8 +625,8 @@ + (NSString *)renderBody:(NSString *)body break; } - if (isClear(attrBuf, URL_ATTR, r.location, r.length)) { - setFlag(attrBuf, CHANNEL_NAME_ATTR, r.location, r.length); + if (isClear(attrBuf, _rendererURLAttribute, r.location, r.length)) { + setFlag(attrBuf, _rendererChannelNameAttribute, r.location, r.length); } start = (NSMaxRange(r) + 1); @@ -634,7 +634,7 @@ + (NSString *)renderBody:(NSString *)body /* Conversation Tracking */ - if ([Preferences trackConversations]) { + if ([TPCPreferences trackConversations]) { if (log) { IRCChannel *log_channel = log.channel; @@ -658,13 +658,13 @@ + (NSString *)renderBody:(NSString *)body UniChar c = [body characterAtIndex:r.location]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { NSInteger prev = (r.location - 1); if (0 <= prev && prev < len) { UniChar c = [body characterAtIndex:prev]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { cleanMatch = NO; } } @@ -673,13 +673,13 @@ + (NSString *)renderBody:(NSString *)body if (cleanMatch) { UniChar c = [body characterAtIndex:(NSMaxRange(r) - 1)]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { NSInteger next = NSMaxRange(r); if (next < len) { UniChar c = [body characterAtIndex:next]; - if ([UnicodeHelper isAlphabeticalCodePoint:c]) { + if ([THOUnicodeHelper isAlphabeticalCodePoint:c]) { cleanMatch = NO; } } @@ -687,10 +687,10 @@ + (NSString *)renderBody:(NSString *)body } if (cleanMatch) { - if (isClear(attrBuf, URL_ATTR, r.location, r.length) && - isClear(attrBuf, HIGHLIGHT_KEYWORD_ATTR, r.location, r.length)) { + if (isClear(attrBuf, _rendererURLAttribute, r.location, r.length) && + isClear(attrBuf, _rendererKeywordHighlightAttribute, r.location, r.length)) { - setFlag(attrBuf, CONVERSATION_TRKR_ATTR, r.location, r.length); + setFlag(attrBuf, _rendererConversationTrackerAttribute, r.location, r.length); } } @@ -711,7 +711,7 @@ + (NSString *)renderBody:(NSString *)body id result = nil; - if (drawingType == ASCII_TO_ATTRIBUTED_STRING) { + if (drawingType == TVCLogRendererAttributedStringType) { result = [[NSMutableAttributedString alloc] initWithString:body]; } else { result = [NSMutableString string]; @@ -726,7 +726,7 @@ + (NSString *)renderBody:(NSString *)body attr_t t = attrBuf[start]; - if (drawingType == ASCII_TO_ATTRIBUTED_STRING) { + if (drawingType == TVCLogRendererAttributedStringType) { result = renderAttributedRange(result, t, start, n, attributedStringFont); } else { [result appendString:renderRange(body, t, start, n, log)]; diff --git a/Classes/Views/Log/LogLine.m b/Classes/Views/Log/LogLine.m deleted file mode 100755 index 49c8ebaec2..0000000000 --- a/Classes/Views/Log/LogLine.m +++ /dev/null @@ -1,59 +0,0 @@ -// Created by Satoshi Nakagawa -// Modifications by Codeux Software -// You can redistribute it and/or modify it under the new BSD license. -// Converted to ARC Support on Thursday, June 07, 2012 - -@implementation LogLine - -@synthesize receivedAt; -@synthesize time; -@synthesize nick; -@synthesize body; -@synthesize lineType; -@synthesize keywords; -@synthesize nickInfo; -@synthesize identified; -@synthesize memberType; -@synthesize excludeWords; -@synthesize nickColorNumber; - -+ (NSString *)lineTypeString:(LogLineType)type -{ - switch (type) { - case LINE_TYPE_SYSTEM: return @"system"; - case LINE_TYPE_ERROR: return @"error"; - case LINE_TYPE_REPLY: return @"reply"; - case LINE_TYPE_CTCP: return @"ctcp"; - case LINE_TYPE_ERROR_REPLY: return @"error_reply"; - case LINE_TYPE_PRIVMSG: return @"privmsg"; - case LINE_TYPE_PRIVMSG_NH: return @"privmsg"; - case LINE_TYPE_NOTICE: return @"notice"; - case LINE_TYPE_ACTION: return @"action"; - case LINE_TYPE_ACTION_NH: return @"action"; - case LINE_TYPE_JOIN: return @"join"; - case LINE_TYPE_PART: return @"part"; - case LINE_TYPE_KICK: return @"kick"; - case LINE_TYPE_QUIT: return @"quit"; - case LINE_TYPE_KILL: return @"kill"; - case LINE_TYPE_NICK: return @"nick"; - case LINE_TYPE_MODE: return @"mode"; - case LINE_TYPE_TOPIC: return @"topic"; - case LINE_TYPE_INVITE: return @"invite"; - case LINE_TYPE_WEBSITE: return @"website"; - case LINE_TYPE_DEBUG: return @"debug_send"; - } - - return NSNullObject; -} - -+ (NSString *)memberTypeString:(LogMemberType)type -{ - switch (type) { - case MEMBER_TYPE_NORMAL: return @"normal"; - case MEMBER_TYPE_MYSELF: return @"myself"; - } - - return NSNullObject; -} - -@end diff --git a/Classes/Views/Log/ImageURLParser.m b/Classes/Views/Log/TVCImageURLParser.m similarity index 98% rename from Classes/Views/Log/ImageURLParser.m rename to Classes/Views/Log/TVCImageURLParser.m index aff75e3827..e4a7a72775 100755 --- a/Classes/Views/Log/ImageURLParser.m +++ b/Classes/Views/Log/TVCImageURLParser.m @@ -2,9 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation ImageURLParser +@implementation TVCImageURLParser -+ (NSString *)imageURLForURL:(NSString *)url ++ (NSString *)imageURLFromBase:(NSString *)url { NSString *lowerUrl = [url lowercaseString]; diff --git a/Classes/Views/Log/LogController.m b/Classes/Views/Log/TVCLogController.m similarity index 89% rename from Classes/Views/Log/LogController.m rename to Classes/Views/Log/TVCLogController.m index 48b8e86857..89af0c07d9 100755 --- a/Classes/Views/Log/LogController.m +++ b/Classes/Views/Log/TVCLogController.m @@ -3,14 +3,14 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define BOTTOM_EPSILON 0 -#define TIME_BUFFER_SIZE 256 +#define _bottomEpsilon 0 +#define _timeBufferSize 256 @interface NSScrollView (Private) - (void)setAllowsHorizontalScrolling:(BOOL)value; @end -@interface LogController (Private) +@interface TVCLogController (Private) - (void)savePosition; - (void)restorePosition; - (void)messageQueueLoop; @@ -26,7 +26,7 @@ - (NSInteger)scrollbackCorrectionInit; - (void)loadAlternateHTML:(NSString *)newHTML; @end -@implementation LogController +@implementation TVCLogController @synthesize autoScroller; @synthesize becameVisible; @@ -106,8 +106,8 @@ - (void)setUp { self.loaded = NO; - self.policy = [LogPolicy new]; - self.sink = [LogScriptEventSink new]; + self.policy = [TVCLogPolicy new]; + self.sink = [TVCLogScriptEventSink new]; self.lastVisitedHighlight = -1; @@ -124,7 +124,7 @@ - (void)setUp [self.view removeFromSuperview]; } - self.view = [[LogView alloc] initWithFrame:NSZeroRect]; + self.view = [[TVCLogView alloc] initWithFrame:NSZeroRect]; self.view.frameLoadDelegate = self; self.view.UIDelegate = self.policy; @@ -174,15 +174,15 @@ - (void)messageQueueLoop { while (NSObjectIsNotEmpty(self.messageQueue)) { if (self.channel) { - [NSThread sleepForTimeInterval:[Preferences viewLoopChannelDelay]]; + [NSThread sleepForTimeInterval:[TPCPreferences viewLoopChannelDelay]]; } else { - [NSThread sleepForTimeInterval:[Preferences viewLoopConsoleDelay]]; + [NSThread sleepForTimeInterval:[TPCPreferences viewLoopConsoleDelay]]; } if ([self.view isLoading] == NO) { dispatch_async(dispatch_get_main_queue(), ^{ if (NSObjectIsNotEmpty(self.messageQueue)) { - BOOL srslt = ((MessageBlock)[self.messageQueue objectAtIndex:0])(); + BOOL srslt = ((TVCLogMessageBlock)[self.messageQueue objectAtIndex:0])(); if (srslt) { [self.messageQueue removeObjectAtIndex:0]; @@ -242,7 +242,7 @@ - (DOMElement *)topic:(DOMDocument *)doc - (NSString *)topicValue { DOMDocument *doc = [self mainFrameDocument]; - if (PointerIsEmpty(doc)) return NSNullObject; + if (PointerIsEmpty(doc)) return NSStringEmptyPlaceholder; return [(id)[self topic:doc] innerHTML]; } @@ -250,14 +250,14 @@ - (NSString *)topicValue - (void)setTopic:(NSString *)topic { if (NSObjectIsEmpty(topic)) { - topic = TXTLS(@"NO_TOPIC_DEFAULT_TOPIC"); + topic = TXTLS(@"IRCChannelEmptyTopic"); } - MessageBlock (^messageBlock)(void) = [^{ + TVCLogMessageBlock (^messageBlock)(void) = [^{ if ([[self topicValue] isEqualToString:topic] == NO) { - NSString *body = [LogRenderer renderBody:topic + NSString *body = [LVCLogRenderer renderBody:topic controller:nil - renderType:ASCII_TO_HTML + renderType:TVCLogRendererHTMLType properties:[NSDictionary dictionaryWithObjectsAndKeys:NSNumberWithBOOL(YES), @"renderLinks", nil] resultInfo:NULL]; @@ -325,7 +325,7 @@ - (BOOL)viewingBottom if (viewHeight == 0) return YES; - return ((top + viewHeight) >= (height - BOTTOM_EPSILON)); + return ((top + viewHeight) >= (height - _bottomEpsilon)); } return NO; @@ -345,7 +345,7 @@ - (void)restorePosition - (void)mark { - MessageBlock (^messageBlock)(void) = [^{ + TVCLogMessageBlock (^messageBlock)(void) = [^{ if (self.loaded == NO) return NO; [self savePosition]; @@ -376,7 +376,7 @@ - (void)mark - (void)unmark { - MessageBlock (^messageBlock)(void) = [^{ + TVCLogMessageBlock (^messageBlock)(void) = [^{ if (self.loaded == NO) return NO; DOMDocument *doc = [self mainFrameDocument]; @@ -640,25 +640,25 @@ - (void)setNeedsLimitNumberOfLines [self limitNumberOfLines]; } -- (BOOL)print:(LogLine *)line +- (BOOL)print:(TVCLogLine *)line { return [self print:line withHTML:NO]; } -- (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML +- (BOOL)print:(TVCLogLine *)line withHTML:(BOOL)rawHTML { if (NSObjectIsEmpty(line.body)) return NO; - LogLineType type = line.lineType; + TVCLogLineType type = line.lineType; NSString *body = nil; - NSString *lineTypeString = [LogLine lineTypeString:type]; + NSString *lineTypeString = [TVCLogLine lineTypeString:type]; BOOL highlighted = NO; - BOOL isText = (type == LINE_TYPE_PRIVMSG || type == LINE_TYPE_NOTICE || type == LINE_TYPE_ACTION); - BOOL isNormalMsg = (type == LINE_TYPE_PRIVMSG || type == LINE_TYPE_ACTION); - BOOL drawLinks = BOOLReverseValue([[URLParser bannedURLRegexLineTypes] containsObject:lineTypeString]); + BOOL isText = (type == TVCLogLinePrivateMessageType || type == TVCLogLineNoticeType || type == TVCLogLineActionType); + BOOL isNormalMsg = (type == TVCLogLinePrivateMessageType || type == TVCLogLineActionType); + BOOL drawLinks = BOOLReverseValue([[TLOLinkParser bannedURLRegexLineTypes] containsObject:lineTypeString]); NSArray *urlRanges = [NSArray array]; @@ -676,9 +676,9 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML [inputDictionary setBool:drawLinks forKey:@"renderLinks"]; - body = [LogRenderer renderBody:line.body + body = [LVCLogRenderer renderBody:line.body controller:((isNormalMsg) ? self : nil) - renderType:ASCII_TO_HTML + renderType:TVCLogRendererHTMLType properties:inputDictionary resultInfo:&outputDictionary]; @@ -696,8 +696,8 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML NSMutableString *s = [NSMutableString string]; if (oldRenderAbs || oldRenderAlt) { - if (line.memberType == MEMBER_TYPE_MYSELF) { - [s appendFormat:@"

", [LogLine memberTypeString:line.memberType]]; + if (line.memberType == TVCLogMemberLocalUserType) { + [s appendFormat:@"

", [TVCLogLine memberTypeString:line.memberType]]; } else { [s appendFormat:@"

"]; } @@ -722,9 +722,9 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML if (line.nick) { NSString *htmltag = ((modernRender) ? @"div" : @"span"); - [s appendFormat:@"<%@ class=\"sender\" ondblclick=\"Textual.on_dblclick_nick()\" oncontextmenu=\"Textual.on_nick()\" type=\"%@\" nick=\"%@\"", htmltag, [LogLine memberTypeString:line.memberType], line.nickInfo]; + [s appendFormat:@"<%@ class=\"sender\" ondblclick=\"Textual.on_dblclick_nick()\" oncontextmenu=\"Textual.on_nick()\" type=\"%@\" nick=\"%@\"", htmltag, [TVCLogLine memberTypeString:line.memberType], line.nickInfo]; - if (line.memberType == MEMBER_TYPE_NORMAL && [Preferences disableNicknameColors] == NO) { + if (line.memberType == TVCLogMemberNormalType && [TPCPreferences disableNicknameColors] == NO) { [s appendFormat:@" colornumber=\"%d\"", line.nickColorNumber]; } @@ -749,7 +749,7 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML } } - if (isNormalMsg && NSObjectIsNotEmpty(urlRanges) && [Preferences showInlineImages]) { + if (isNormalMsg && NSObjectIsNotEmpty(urlRanges) && [TPCPreferences showInlineImages]) { if (([self.channel isChannel] && self.channel.config.inlineImages == NO) || [self.channel isTalk]) { NSString *imageUrl = nil; @@ -758,7 +758,7 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML for (NSValue *rangeValue in urlRanges) { NSString *url = [line.body safeSubstringWithRange:[rangeValue rangeValue]]; - imageUrl = [ImageURLParser imageURLForURL:url]; + imageUrl = [TVCImageURLParser imageURLFromBase:url]; if (imageUrl) { if ([postedUrls containsObject:imageUrl]) { @@ -767,7 +767,7 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML [postedUrls safeAddObject:imageUrl]; } - [s appendFormat:@"", url, imageUrl, [Preferences inlineImagesMaxWidth], TXTLS(@"LOG_VIEW_HIDE_INLINE_IMAGE_MESSAGE")]; + [s appendFormat:@"", url, imageUrl, [TPCPreferences inlineImagesMaxWidth], TXTLS(@"LogViewHideInlineImageMessage")]; } } } @@ -778,14 +778,14 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML if (oldRenderAbs || oldRenderAlt) { [s appendString:@"

"]; - [attrs setObject:[LogLine lineTypeString:type] forKey:@"type"]; + [attrs setObject:[TVCLogLine lineTypeString:type] forKey:@"type"]; } else { [s appendFormat:@""]; - NSString *typeattr = [LogLine lineTypeString:type]; + NSString *typeattr = [TVCLogLine lineTypeString:type]; - if (line.memberType == MEMBER_TYPE_MYSELF) { - typeattr = [typeattr stringByAppendingFormat:@" %@", [LogLine memberTypeString:line.memberType]]; + if (line.memberType == TVCLogMemberLocalUserType) { + typeattr = [typeattr stringByAppendingFormat:@" %@", [TVCLogLine memberTypeString:line.memberType]]; } [attrs setObject:typeattr forKey:@"type"]; @@ -800,7 +800,7 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML NSString *messageBody; NSString *nicknameBody = [line.nick trim]; - if (type == LINE_TYPE_ACTION) { + if (type == TVCLogLineActionType) { if ([nicknameBody hasSuffix:@":"]) { messageBody = [NSString stringWithFormat:@"• %@ %@", nicknameBody, line.body]; } else { @@ -818,7 +818,7 @@ - (BOOL)print:(LogLine *)line withHTML:(BOOL)rawHTML - (void)writeLine:(NSString *)aHtml attributes:(NSDictionary *)attrs { - MessageBlock (^messageBlock)(void) = [^{ + TVCLogMessageBlock (^messageBlock)(void) = [^{ [self savePosition]; ++self.lineNumber; @@ -880,7 +880,7 @@ - (NSString *)initialDocument:(NSString *)topic [bodyAttrs appendString:@"type=\"server\""]; } - if ([Preferences rightToLeftFormatting]) { + if ([TPCPreferences rightToLeftFormatting]) { [bodyAttrs appendString:@" dir=\"rtl\""]; } else { [bodyAttrs appendString:@" dir=\"ltr\""]; @@ -915,7 +915,7 @@ - (NSString *)initialDocument:(NSString *)topic if (NSObjectIsNotEmpty(topic)) { [s appendFormat:@"
%@
", topic]; } else { - [s appendFormat:@"
%@
", TXTLS(@"NO_TOPIC_DEFAULT_TOPIC")]; + [s appendFormat:@"
%@
", TXTLS(@"IRCChannelEmptyTopic")]; } } @@ -930,25 +930,25 @@ - (NSString *)generateOverrideStyle { NSMutableString *sf = [NSMutableString string]; - OtherTheme *other = self.world.viewTheme.other; + TPCOtherTheme *other = self.world.viewTheme.other; NSFont *channelFont = other.channelViewFont; NSString *name = [channelFont fontName]; NSInteger rsize = [channelFont pointSize]; - NSDoubleN dsize = ([channelFont pointSize] * (72.0 / 96.0)); + TXNSDouble dsize = ([channelFont pointSize] * (72.0 / 96.0)); [sf appendString:@"html, body, body[type], body {"]; [sf appendFormat:@"font-family:'%@';", name]; [sf appendFormat:@"font-size:%fpt;", dsize]; [sf appendString:@"}"]; - if (other.indentationOffset == THEME_DISABLED_INDENTATION_OFFSET || [Preferences rightToLeftFormatting]) { + if (other.indentationOffset == TXThemeDisabledIndentationOffset || [TPCPreferences rightToLeftFormatting]) { return sf; } else { NSFont *font = [NSFont fontWithName:name size:round(rsize)]; - NSString *time = TXFormattedTimestampWithOverride([NSDate date], [Preferences themeTimestampFormat], other.timestampFormat); + NSString *time = TXFormattedTimestampWithOverride([NSDate date], [TPCPreferences themeTimestampFormat], other.timestampFormat); NSDictionary *attributes = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; NSSize textSize = [time sizeWithAttributes:attributes]; @@ -964,7 +964,7 @@ - (NSString *)generateOverrideStyle [sf appendString:@"}"]; } - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [sf appendString:@"body {"]; [sf appendString:@"-webkit-font-smoothing: none;"]; [sf appendString:@"}"]; @@ -997,8 +997,8 @@ - (void)setUpScroller [(id)scrollView setAllowsHorizontalScrolling:NO]; } -#ifdef _MAC_OS_LION_OR_NEWER - if ([Preferences featureAvailableToOSXLion]) { +#ifdef TXMacOSLionOrNewer + if ([TPCPreferences featureAvailableToOSXLion]) { [scrollView setHorizontalScrollElasticity:NSScrollElasticityNone]; [scrollView setVerticalScrollElasticity:NSScrollElasticityNone]; } @@ -1023,7 +1023,7 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame [self setUpScroller]; if (PointerIsEmpty(self.autoScroller)) { - self.autoScroller = [WebViewAutoScroll new]; + self.autoScroller = [TVCWebViewAutoScroll new]; } self.autoScroller.webFrame = view.mainFrame.frameView; @@ -1077,7 +1077,7 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame - (id)webView:(WebView *)sender identifierForInitialRequest:(NSURLRequest *)request fromDataSource:(WebDataSource *)dataSource { - NSString *scheme = [[[request URL] scheme] lowercaseString]; + NSString *scheme = [request.URL.scheme lowercaseString]; if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) { diff --git a/Classes/Views/Log/TVCLogLine.m b/Classes/Views/Log/TVCLogLine.m new file mode 100755 index 0000000000..808b4491c0 --- /dev/null +++ b/Classes/Views/Log/TVCLogLine.m @@ -0,0 +1,59 @@ +// Created by Satoshi Nakagawa +// Modifications by Codeux Software +// You can redistribute it and/or modify it under the new BSD license. +// Converted to ARC Support on Thursday, June 07, 2012 + +@implementation TVCLogLine + +@synthesize receivedAt; +@synthesize time; +@synthesize nick; +@synthesize body; +@synthesize lineType; +@synthesize keywords; +@synthesize nickInfo; +@synthesize identified; +@synthesize memberType; +@synthesize excludeWords; +@synthesize nickColorNumber; + ++ (NSString *)lineTypeString:(TVCLogLineType)type +{ + switch (type) { + case TVCLogLineSystemType: return @"system"; + case TVCLogLineErrorType: return @"error"; + case TVCLogLineReplyType: return @"reply"; + case TVCLogLineCTCPType: return @"ctcp"; + case TVCLogLineErrorReplyType: return @"error_reply"; + case TVCLogLinePrivateMessageType: return @"privmsg"; + case TVCLogLinePrivateMessageNoHighlightType: return @"privmsg"; + case TVCLogLineNoticeType: return @"notice"; + case TVCLogLineActionType: return @"action"; + case TVCLogLineActionNoHighlightType: return @"action"; + case TVCLogLineJoinType: return @"join"; + case TVCLogLinePartType: return @"part"; + case TVCLogLineKickType: return @"kick"; + case TVCLogLineQuitType: return @"quit"; + case TVCLogLineKillType: return @"kill"; + case TVCLogLineNickType: return @"nick"; + case TVCLogLineModeType: return @"mode"; + case TVCLogLineTopicType: return @"topic"; + case TVCLogLineInviteType: return @"invite"; + case TVCLogLineWebsiteType: return @"website"; + case TVCLogLineDebugType: return @"debug_send"; + } + + return NSStringEmptyPlaceholder; +} + ++ (NSString *)memberTypeString:(TVCLogMemberType)type +{ + switch (type) { + case TVCLogMemberNormalType: return @"normal"; + case TVCLogMemberLocalUserType: return @"myself"; + } + + return NSStringEmptyPlaceholder; +} + +@end \ No newline at end of file diff --git a/Classes/Views/Log/LogPolicy.m b/Classes/Views/Log/TVCLogPolicy.m similarity index 79% rename from Classes/Views/Log/LogPolicy.m rename to Classes/Views/Log/TVCLogPolicy.m index 58c0e40f48..063e5dbbe1 100755 --- a/Classes/Views/Log/LogPolicy.m +++ b/Classes/Views/Log/TVCLogPolicy.m @@ -3,10 +3,10 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define WebMenuItemTagInspectElement 2024 -#define WebMenuItemTagIRCopServices 42354 +#define _WebMenuItemTagInspectElement 2024 +#define _WebMenuItemTagIRCopServices 42354 -@implementation LogPolicy +@implementation TVCLogPolicy @synthesize menuController; @synthesize menu; @@ -20,12 +20,14 @@ @implementation LogPolicy - (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(NSUInteger)modifierFlags { - if ([Preferences copyOnSelect]) { - if (([[NSApp currentEvent] modifierFlags] & NSCommandKeyMask) == NSCommandKeyMask) { + if ([TPCPreferences copyOnSelect]) { + NSEvent *currentEvent = [NSApp currentEvent]; + + if ((currentEvent.modifierFlags & NSCommandKeyMask) == NSCommandKeyMask) { return; } - if ([[NSApp currentEvent] type] == NSLeftMouseUp) { + if (currentEvent.type == NSLeftMouseUp) { DOMRange *range = [sender selectedDOMRange]; if (PointerIsEmpty(range)) return; @@ -48,7 +50,7 @@ - (void)channelDoubleClicked self.menuController.pointedChannelName = self.chan; self.chan = nil; - [self.menuController onJoinChannel:nil]; + [self.menuController joinClickedChannel:nil]; } - (void)nicknameDoubleClicked @@ -77,10 +79,10 @@ - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary self.menuController.pointedNick = self.nick; self.nick = nil; - BOOL isIRCop = [[self.menuController.world selectedClient] IRCopStatus]; + BOOL isIRCop = self.menuController.world.selectedClient.IRCopStatus; for (NSMenuItem *item in [self.memberMenu itemArray]) { - if ([item tag] == WebMenuItemTagIRCopServices && isIRCop == NO) { + if ([item tag] == _WebMenuItemTagIRCopServices && isIRCop == NO) { continue; } @@ -98,19 +100,19 @@ - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary return ary; } else if (self.menu) { - NSMenuItem *inspectElementItem = nil; - NSMenuItem *lookupInDictionaryItem = nil; + NSMenuItem *inspectElementItem = nil; + NSMenuItem *lookupInDictionaryItem = nil; for (NSMenuItem *item in defaultMenuItems) { if ([item tag] == WebMenuItemTagLookUpInDictionary) { lookupInDictionaryItem = item; - } else if ([item tag] == WebMenuItemTagInspectElement) { + } else if ([item tag] == _WebMenuItemTagInspectElement) { inspectElementItem = item; } } for (NSMenuItem *item in [self.menu itemArray]) { - if ([item tag] == WebMenuItemTagInspectElement) { + if ([item tag] == _WebMenuItemTagInspectElement) { if (lookupInDictionaryItem) { [ary safeAddObject:[lookupInDictionaryItem copy]]; } @@ -119,18 +121,18 @@ - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary } } - if ([_NSUserDefaults() boolForKey:DeveloperEnvironmentToken]) { + if ([_NSUserDefaults() boolForKey:TXDeveloperEnvironmentToken]) { [ary safeAddObject:[NSMenuItem separatorItem]]; if (inspectElementItem) { [ary safeAddObject:[inspectElementItem copy]]; } - NSMenuItem *copyHTML = [[NSMenuItem alloc] initWithTitle:TXTLS(@"COPY_LOG_AS_HTML_MENU_ITEM") - action:@selector(onCopyLogAsHtml:) keyEquivalent:NSNullObject]; + NSMenuItem *copyHTML = [[NSMenuItem alloc] initWithTitle:TXTLS(@"CopyLogAsHTMLMenuItem") + action:@selector(onCopyLogAsHtml:) keyEquivalent:NSStringEmptyPlaceholder]; - NSMenuItem *reloadTheme = [[NSMenuItem alloc] initWithTitle:TXTLS(@"FORCE_RELOAD_THEME_MENU_ITEM") - action:@selector(onWantThemeForceReloaded:) keyEquivalent:NSNullObject]; + NSMenuItem *reloadTheme = [[NSMenuItem alloc] initWithTitle:TXTLS(@"ForceReloadThemeMenuItem") + action:@selector(onWantThemeForceReloaded:) keyEquivalent:NSStringEmptyPlaceholder]; [copyHTML setTarget:self.menuController]; [reloadTheme setTarget:self.menuController]; @@ -156,7 +158,7 @@ - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary case WebNavigationTypeLinkClicked: [listener ignore]; - [URLOpener open:[actionInformation objectForKey:WebActionOriginalURLKey]]; + [TLOpenLink open:[actionInformation objectForKey:WebActionOriginalURLKey]]; break; case WebNavigationTypeOther: diff --git a/Classes/Views/Log/LogScriptEventSink.m b/Classes/Views/Log/TVCLogScriptEventSink.m similarity index 95% rename from Classes/Views/Log/LogScriptEventSink.m rename to Classes/Views/Log/TVCLogScriptEventSink.m index 9a1c7682aa..89bf902dee 100755 --- a/Classes/Views/Log/LogScriptEventSink.m +++ b/Classes/Views/Log/TVCLogScriptEventSink.m @@ -2,9 +2,9 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -#define DOUBLE_CLICK_RADIUS 3 +#define _doubleClickRadius 3 -@implementation LogScriptEventSink +@implementation TVCLogScriptEventSink @synthesize owner; @synthesize policy; @@ -56,7 +56,7 @@ - (void)onDblClick:(id)e - (BOOL)shouldStopDoubleClick:(id)e { - NSInteger d = DOUBLE_CLICK_RADIUS; + NSInteger d = _doubleClickRadius; NSInteger cx = [[e valueForKey:@"clientX"] integerValue]; NSInteger cy = [[e valueForKey:@"clientY"] integerValue]; diff --git a/Classes/Views/Log/LogView.m b/Classes/Views/Log/TVCLogView.m similarity index 89% rename from Classes/Views/Log/LogView.m rename to Classes/Views/Log/TVCLogView.m index dcf6e06376..ea512bc2fb 100755 --- a/Classes/Views/Log/LogView.m +++ b/Classes/Views/Log/TVCLogView.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation LogView +@implementation TVCLogView @synthesize keyDelegate; @synthesize resizeDelegate; @@ -49,13 +49,13 @@ - (BOOL)maintainsInactiveSelection - (NSString *)contentString { DOMHTMLDocument *doc = (DOMHTMLDocument *)[self mainFrameDocument]; - if (PointerIsEmpty(doc)) return NSNullObject; + if (PointerIsEmpty(doc)) return NSStringEmptyPlaceholder; DOMElement *body = [doc body]; - if (PointerIsEmpty(body)) return NSNullObject; + if (PointerIsEmpty(body)) return NSStringEmptyPlaceholder; DOMHTMLElement *root = (DOMHTMLElement *)[body parentNode]; - if (PointerIsEmpty(root)) return NSNullObject; + if (PointerIsEmpty(root)) return NSStringEmptyPlaceholder; return [root outerHTML]; } diff --git a/Classes/Views/Log/WebViewAutoScroll.m b/Classes/Views/Log/TVCWebViewAutoScroll.m similarity index 98% rename from Classes/Views/Log/WebViewAutoScroll.m rename to Classes/Views/Log/TVCWebViewAutoScroll.m index 60d4355ccd..dc4689a49d 100755 --- a/Classes/Views/Log/WebViewAutoScroll.m +++ b/Classes/Views/Log/TVCWebViewAutoScroll.m @@ -1,7 +1,7 @@ // Created by Allan Odgaard. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation WebViewAutoScroll +@implementation TVCWebViewAutoScroll @synthesize lastVisibleRect; @synthesize lastFrame; diff --git a/Classes/Views/MemberList/MemberList.m b/Classes/Views/MemberList/TVCMemberList.m similarity index 95% rename from Classes/Views/MemberList/MemberList.m rename to Classes/Views/MemberList/TVCMemberList.m index bb70b4dc2d..7af7388580 100755 --- a/Classes/Views/MemberList/MemberList.m +++ b/Classes/Views/MemberList/TVCMemberList.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation MemberList +@implementation TVCMemberList @synthesize keyDelegate; diff --git a/Classes/Views/MemberList/MemberListCell.m b/Classes/Views/MemberList/TVCMemberListCell.m similarity index 64% rename from Classes/Views/MemberList/MemberListCell.m rename to Classes/Views/MemberList/TVCMemberListCell.m index f9ea254b03..c1adaaa789 100755 --- a/Classes/Views/MemberList/MemberListCell.m +++ b/Classes/Views/MemberList/TVCMemberListCell.m @@ -3,35 +3,34 @@ // Converted to ARC Support on Thursday, June 07, 2012 /* That is a lot of defenitions … */ -#define BADGE_MARGIN 5.0 -#define BADGE_HEIGHT 14.0 -#define BADGE_WIDTH 18.0 +#define _badgeMargin 5.0 +#define _badgeHeight 14.0 +#define _badgeWidth 18.0 -#define BADGE_FONT [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5] -#define BADGE_TEXT_COLOR_TS [NSColor _colorWithCalibratedRed:158 green:169 blue:197 alpha:1] -#define BADGE_TEXT_COLOR_NS [NSColor whiteColor] +#define _badgeFont [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5] +#define _badgeTextColorTS [NSColor internalCalibratedRed:158 green:169 blue:197 alpha:1] +#define _badgeTextColorNS [NSColor whiteColor] +#define _badgeShadowColor [NSColor colorWithCalibratedWhite:1.00 alpha:0.60] -#define BADGE_SHADOW_COLOR [NSColor colorWithCalibratedWhite:1.00 alpha:0.60] -#define BADGE_MESSAGE_BACKGROUND_COLOR_TS [NSColor whiteColor] +#define _badgeMessageBackgroundColorTS [NSColor whiteColor] +#define _badgeMessageBackgroundColorQ [NSColor internalCalibratedRed:186 green:0 blue:0 alpha:1] +#define _badgeMessageBackgroundColorA [NSColor internalCalibratedRed:157 green:0 blue:89 alpha:1] +#define _badgeMessageBackgroundColorO [NSColor internalCalibratedRed:210 green:105 blue:30 alpha:1] +#define _badgeMessageBackgroundColorH [NSColor internalCalibratedRed:48 green:128 blue:17 alpha:1] +#define _badgeMessageBackgroundColorV [NSColor internalCalibratedRed:57 green:154 blue:199 alpha:1] +#define _badgeMessageBackgroundColorX [NSColor internalCalibratedRed:152 green:168 blue:202 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_MODE_Q [NSColor _colorWithCalibratedRed:186 green:0 blue:0 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_MODE_A [NSColor _colorWithCalibratedRed:157 green:0 blue:89 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_MODE_O [NSColor _colorWithCalibratedRed:210 green:105 blue:30 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_MODE_H [NSColor _colorWithCalibratedRed:48 green:128 blue:17 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_MODE_V [NSColor _colorWithCalibratedRed:57 green:154 blue:199 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_MODE_X [NSColor _colorWithCalibratedRed:152 green:168 blue:202 alpha:1] +#define _userCellFont [NSFont fontWithName:@"LucidaGrande" size:11.0] +#define _userCellFontColor [NSColor blackColor] +#define _userCellSelectionFontColor [NSColor whiteColor] +#define _userCellSelectionFont [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0] +#define _userCellShadowColor [NSColor internalColorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6] +#define _userCellSelectionShadowColorAW [NSColor colorWithCalibratedWhite:0.00 alpha:0.48] +#define _userCellSelectionShadowColorIA [NSColor colorWithCalibratedWhite:0.00 alpha:0.30] -#define USER_CELL_FONT [NSFont fontWithName:@"LucidaGrande" size:11.0] -#define USER_CELL_FONT_COLOR [NSColor blackColor] -#define USER_CELL_SELECTION_FONT_COLOR [NSColor whiteColor] -#define USER_CELL_SELECTION_FONT [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0] -#define USER_CELL_SHADOW_COLOR [NSColor _colorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6] -#define USER_CELL_SELECTION_SHADOW_COLOR_AW [NSColor colorWithCalibratedWhite:0.00 alpha:0.48] -#define USER_CELL_SELECTION_SHADOW_COLOR_IA [NSColor colorWithCalibratedWhite:0.00 alpha:0.30] +#define _graphiteSelectionColorAW [NSColor internalCalibratedRed:17 green:73 blue:126 alpha:1.00] -#define GRAPHITE_SELECTION_COLOR_AW [NSColor _colorWithCalibratedRed:17 green:73 blue:126 alpha:1.00] - -@implementation MemberListCell +@implementation TVCMemberListCell @synthesize member; @synthesize parent; @@ -45,13 +44,13 @@ - (NSAttributedString *)modeBadgeText:(NSString *)badgeString isSelected:(BOOL)s /* Pick which font size best aligns with badge heights. */ NSMutableDictionary *attributes = [NSMutableDictionary dictionary]; - NSColor *textColor = BADGE_TEXT_COLOR_NS; + NSColor *textColor = _badgeTextColorNS; if (selected) { - textColor = BADGE_TEXT_COLOR_TS; + textColor = _badgeTextColorTS; } - [attributes setObject:BADGE_FONT forKey:NSFontAttributeName]; + [attributes setObject:_badgeFont forKey:NSFontAttributeName]; [attributes setObject:textColor forKey:NSForegroundColorAttributeName]; NSAttributedString *mcstring = [[NSAttributedString alloc] initWithString:badgeString @@ -62,9 +61,9 @@ - (NSAttributedString *)modeBadgeText:(NSString *)badgeString isSelected:(BOOL)s - (void)drawModeBadge:(char)mcstring inCell:(NSRect)badgeFrame isSelected:(BOOL)selected { - badgeFrame = NSMakeRect((badgeFrame.origin.x + BADGE_MARGIN), - (NSMidY(badgeFrame) - (BADGE_HEIGHT / 2.0)), - BADGE_WIDTH, BADGE_HEIGHT); + badgeFrame = NSMakeRect((badgeFrame.origin.x + _badgeMargin), + (NSMidY(badgeFrame) - (_badgeHeight / 2.0)), + _badgeWidth, _badgeHeight); NSBezierPath *badgePath = nil; @@ -78,7 +77,7 @@ - (void)drawModeBadge:(char)mcstring inCell:(NSRect)badgeFrame isSelected:(BOOL) xRadius:4.0 yRadius:4.0]; - NSColor *shadow = BADGE_SHADOW_COLOR; + NSColor *shadow = _badgeShadowColor; if (shadow) { [shadow set]; @@ -95,17 +94,17 @@ - (void)drawModeBadge:(char)mcstring inCell:(NSRect)badgeFrame isSelected:(BOOL) if (selected == NO) { if (mcstring == '~') { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_MODE_Q; + backgroundColor = _badgeMessageBackgroundColorQ; } else if (mcstring == '&' || mcstring == '!') { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_MODE_A; + backgroundColor = _badgeMessageBackgroundColorA; } else if (mcstring == '@') { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_MODE_O; + backgroundColor = _badgeMessageBackgroundColorO; } else if (mcstring == '%') { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_MODE_H; + backgroundColor = _badgeMessageBackgroundColorH; } else if (mcstring == '+') { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_MODE_V; + backgroundColor = _badgeMessageBackgroundColorV; } else { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_MODE_X; + backgroundColor = _badgeMessageBackgroundColorX; } } @@ -140,18 +139,18 @@ - (void)drawModeBadge:(char)mcstring inCell:(NSRect)badgeFrame isSelected:(BOOL) badgeTextPoint.y -= 1; } - if ([Preferences featureAvailableToOSXMountainLion]) { + if ([TPCPreferences featureAvailableToOSXMountainLion]) { badgeTextPoint.y -= 1; } - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() saveGraphicsState]; [_NSGraphicsCurrentContext() setShouldAntialias: NO]; } [modeString drawAtPoint:badgeTextPoint]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() restoreGraphicsState]; } } @@ -237,19 +236,19 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)view if (isSelected == NO) { [itemShadow setShadowOffset:NSMakeSize(1, -1)]; - [itemShadow setShadowColor:USER_CELL_SHADOW_COLOR]; + [itemShadow setShadowColor:_userCellShadowColor]; } else { [itemShadow setShadowBlurRadius:2.0]; [itemShadow setShadowOffset:NSMakeSize(1, -1)]; if (isKeyWindow) { if (isGraphite) { - [itemShadow setShadowColor:GRAPHITE_SELECTION_COLOR_AW]; + [itemShadow setShadowColor:_graphiteSelectionColorAW]; } else { - [itemShadow setShadowColor:USER_CELL_SELECTION_SHADOW_COLOR_AW]; + [itemShadow setShadowColor:_userCellSelectionShadowColorAW]; } } else { - [itemShadow setShadowColor:USER_CELL_SELECTION_SHADOW_COLOR_IA]; + [itemShadow setShadowColor:_userCellSelectionShadowColorIA]; } } @@ -260,23 +259,23 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)view NSRange textRange = NSMakeRange(0, [newValue length]); if (isSelected) { - [newValue addAttribute:NSFontAttributeName value:USER_CELL_SELECTION_FONT range:textRange]; - [newValue addAttribute:NSForegroundColorAttributeName value:USER_CELL_SELECTION_FONT_COLOR range:textRange]; + [newValue addAttribute:NSFontAttributeName value:_userCellSelectionFont range:textRange]; + [newValue addAttribute:NSForegroundColorAttributeName value:_userCellSelectionFontColor range:textRange]; } else { - [newValue addAttribute:NSFontAttributeName value:USER_CELL_FONT range:textRange]; - [newValue addAttribute:NSForegroundColorAttributeName value:USER_CELL_FONT_COLOR range:textRange]; + [newValue addAttribute:NSFontAttributeName value:_userCellFont range:textRange]; + [newValue addAttribute:NSForegroundColorAttributeName value:_userCellFontColor range:textRange]; } [newValue addAttribute:NSShadowAttributeName value:itemShadow range:textRange]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() saveGraphicsState]; [_NSGraphicsCurrentContext() setShouldAntialias: NO]; } [newValue drawInRect:cellFrame]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() restoreGraphicsState]; } diff --git a/Classes/Views/DockIcon.m b/Classes/Views/TVCDockIcon.m similarity index 81% rename from Classes/Views/DockIcon.m rename to Classes/Views/TVCDockIcon.m index 6429836b3f..b3c3f4b273 100755 --- a/Classes/Views/DockIcon.m +++ b/Classes/Views/TVCDockIcon.m @@ -4,11 +4,11 @@ #define _NSMainScreen() [NSScreen mainScreen] -@interface DockIcon (Private) +@interface TVCDockIcon (Private) + (NSString *)badgeFilename:(NSInteger)count; @end -@implementation DockIcon +@implementation TVCDockIcon /* The math is messy but it gets the job done. =) */ + (void)drawWithoutCounts @@ -16,7 +16,7 @@ + (void)drawWithoutCounts [NSApp setApplicationIconImage:[NSImage imageNamed:@"NSApplicationIcon"]]; } -+ (void)drawWithHilightCount:(NSInteger)highlight_count messageCount:(NSInteger)message_count ++ (void)drawWithHilightCount:(NSInteger)highlightCount messageCount:(NSInteger)messageCount { if ([_NSMainScreen() userSpaceScaleFactor] == 1.0) { NSSize textSize; @@ -27,17 +27,17 @@ + (void)drawWithHilightCount:(NSInteger)highlight_count messageCount:(NSInteger) [attrs setObject:[NSColor whiteColor] forKey:NSForegroundColorAttributeName]; [attrs setObject:[NSFont fontWithName:@"Helvetica" size:22.0] forKey:NSFontAttributeName]; - message_count = ((message_count > 9999) ? 9999 : message_count); - highlight_count = ((highlight_count > 9999) ? 9999 : highlight_count); + messageCount = ((messageCount > 9999) ? 9999 : messageCount); + highlightCount = ((highlightCount > 9999) ? 9999 : highlightCount); NSImage *appIcon = [[NSImage imageNamed:@"NSApplicationIcon"] copy]; - NSImage *redBadge = [NSImage imageNamed:[NSString stringWithFormat:@"DIbadge_Red_%@", [self badgeFilename:message_count]]]; - NSImage *greenBadge = [NSImage imageNamed:[NSString stringWithFormat:@"DIbadge_Green_%@", [self badgeFilename:highlight_count]]]; + NSImage *redBadge = [NSImage imageNamed:[NSString stringWithFormat:@"DIbadge_Red_%@", [self badgeFilename:messageCount]]]; + NSImage *greenBadge = [NSImage imageNamed:[NSString stringWithFormat:@"DIbadge_Green_%@", [self badgeFilename:highlightCount]]]; [appIcon lockFocus]; - if (message_count >= 1) { - textString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithInteger:message_count] attributes:attrs]; + if (messageCount >= 1) { + textString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithInteger:messageCount] attributes:attrs]; textSize = [textString size]; [redBadge compositeToPoint:NSMakePoint((appIcon.size.width - redBadge.size.width), @@ -47,8 +47,8 @@ + (void)drawWithHilightCount:(NSInteger)highlight_count messageCount:(NSInteger) (appIcon.size.height - redBadge.size.height + ((redBadge.size.height - textSize.height) / 2) + 1))]; - if (highlight_count >= 1) { - textString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithInteger:highlight_count] attributes:attrs]; + if (highlightCount >= 1) { + textString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithInteger:highlightCount] attributes:attrs]; textSize = [textString size]; [greenBadge compositeToPoint:NSMakePoint((appIcon.size.width - greenBadge.size.width), @@ -60,8 +60,8 @@ + (void)drawWithHilightCount:(NSInteger)highlight_count messageCount:(NSInteger) } } else { - if (highlight_count >= 1) { - textString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithInteger:highlight_count] attributes:attrs]; + if (highlightCount >= 1) { + textString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithInteger:highlightCount] attributes:attrs]; textSize = [textString size]; [greenBadge compositeToPoint:NSMakePoint((appIcon.size.width - greenBadge.size.width), diff --git a/Classes/Views/InputTextField.m b/Classes/Views/TVCInputTextField.m similarity index 68% rename from Classes/Views/InputTextField.m rename to Classes/Views/TVCInputTextField.m index 447b6bbe4e..f5475413fa 100755 --- a/Classes/Views/InputTextField.m +++ b/Classes/Views/TVCInputTextField.m @@ -4,23 +4,25 @@ /* Much of the following drawing has been created by Dan Messing for the class "SSTextField" */ -#define LION_ACTIVE_START_GRADIENT [NSColor _colorWithCalibratedRed:109.0 green:109.0 blue:109.0 alpha:1] -#define LION_ACTIVE_STOP_GRADIENT [NSColor _colorWithCalibratedRed:122.0 green:122.0 blue:122.0 alpha:1] -#define LION_INACTIVE_START_GRADIENT [NSColor colorWithCalibratedWhite:0.55 alpha:1.0] -#define LION_INACTIVE_STOP_GRADIENT [NSColor colorWithCalibratedWhite:0.558 alpha:1.0] -#define LION_BODY_GRADIENT_START [NSColor _colorWithCalibratedRed:221.0 green:221.0 blue:221.0 alpha:1] -#define LION_BODY_GRADIENT_STOP [NSColor whiteColor] +#import -#define InputTextFiedMaxHeight 404.0 -#define InputBoxDefaultHeight 26.0 -#define InputBoxReszieHeightMultiplier 14.0 -#define InputBoxResizeHeightPadding 12.0 +#define _ActiveWindowGradientStart [NSColor internalCalibratedRed:109.0 green:109.0 blue:109.0 alpha:1] +#define _ActiveWindowGradientStop [NSColor internalCalibratedRed:122.0 green:122.0 blue:122.0 alpha:1] +#define _InactiveWindowGradientStart [NSColor colorWithCalibratedWhite:0.55 alpha:1.0] +#define _InactiveWindowGradientStop [NSColor colorWithCalibratedWhite:0.558 alpha:1.0] +#define _bodyGradientStart [NSColor internalCalibratedRed:221.0 green:221.0 blue:221.0 alpha:1] +#define _bodyGradientStop [NSColor whiteColor] -@implementation InputTextField +#define _InputTextFiedMaxHeight 404.0 +#define _InputBoxDefaultHeight 26.0 +#define _InputBoxReszieHeightMultiplier 14.0 +#define _InputBoxResizeHeightPadding 12.0 -@synthesize _placeholderString; -@synthesize _actionTarget; -@synthesize _actionSelector; +@implementation TVCInputTextField + +@synthesize placeholderString; +@synthesize actionTarget; +@synthesize actionSelector; #pragma mark - #pragma mark Drawing @@ -34,16 +36,16 @@ - (id)initWithCoder:(NSCoder *)coder NSMutableDictionary *attrs = [NSMutableDictionary dictionary]; - [attrs setObject:DefaultTextFieldFont forKey:NSFontAttributeName]; + [attrs setObject:TXDefaultTextFieldFont forKey:NSFontAttributeName]; [attrs setObject:[NSColor grayColor] forKey:NSForegroundColorAttributeName]; - self._placeholderString = [NSAttributedString alloc]; - self._placeholderString = [self._placeholderString initWithString:TXTLS(@"INPUT_TEXT_FIELD_PLACE_HOLDER") attributes:attrs]; + self.placeholderString = [NSAttributedString alloc]; + self.placeholderString = [self.placeholderString initWithString:TXTLS(@"InputTextFieldPlaceholderValue") attributes:attrs]; [super sanitizeTextField:YES]; -#ifdef _MAC_OS_LION_OR_NEWER - if ([Preferences featureAvailableToOSXLion]) { +#ifdef TXMacOSLionOrNewer + if ([TPCPreferences featureAvailableToOSXLion]) { NSScrollView *scrollView = [self scrollView]; [scrollView setHorizontalScrollElasticity:NSScrollElasticityNone]; @@ -74,15 +76,15 @@ - (void)resetTextFieldCellSize NSString *stringv = self.stringValue; if (NSObjectIsEmpty(stringv)) { - textBoxFrame.size.height = InputBoxDefaultHeight; + textBoxFrame.size.height = _InputBoxDefaultHeight; } else { NSInteger totalLines = [self numberOfLines]; - textBoxFrame.size.height = (totalLines * InputBoxReszieHeightMultiplier); - textBoxFrame.size.height += InputBoxResizeHeightPadding; + textBoxFrame.size.height = (totalLines * _InputBoxReszieHeightMultiplier); + textBoxFrame.size.height += _InputBoxResizeHeightPadding; - if (textBoxFrame.size.height > InputTextFiedMaxHeight) { - textBoxFrame.size.height = InputTextFiedMaxHeight; + if (textBoxFrame.size.height > _InputTextFiedMaxHeight) { + textBoxFrame.size.height = _InputTextFiedMaxHeight; } } @@ -117,7 +119,7 @@ - (void)drawRect:(NSRect)dirtyRect { NSScrollView *scroller = [self scrollView]; - if (scroller.frame.size.height == InputTextFiedMaxHeight) { + if (scroller.frame.size.height == _InputTextFiedMaxHeight) { BOOL cleanBottomSubview = NO; BOOL cleanTopSubview = NO; @@ -143,30 +145,21 @@ - (void)drawRect:(NSRect)dirtyRect } } - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() saveGraphicsState]; [_NSGraphicsCurrentContext() setShouldAntialias: NO]; } - [super drawRect:dirtyRect]; - - if ([Preferences useLogAntialiasing] == NO) { - [_NSGraphicsCurrentContext() restoreGraphicsState]; - } - NSString *value = [self stringValue]; if (NSObjectIsEmpty(value) && NSDissimilarObjects([self baseWritingDirection], NSWritingDirectionRightToLeft)) { - if ([Preferences useLogAntialiasing] == NO) { - [_NSGraphicsCurrentContext() saveGraphicsState]; - [_NSGraphicsCurrentContext() setShouldAntialias: NO]; - } - - [self._placeholderString drawAtPoint:NSMakePoint(6, 5)]; - - if ([Preferences useLogAntialiasing] == NO) { - [_NSGraphicsCurrentContext() restoreGraphicsState]; - } + [self.placeholderString drawAtPoint:NSMakePoint(6, 5)]; + } else { + [super drawRect:dirtyRect]; + } + + if ([TPCPreferences useLogAntialiasing] == NO) { + [_NSGraphicsCurrentContext() restoreGraphicsState]; } } @@ -180,18 +173,14 @@ - (void)paste:(id)sender - (void)setReturnActionWithSelector:(SEL)selector owner:(id)owner { - self._actionTarget = owner; - self._actionSelector = selector; + self.actionTarget = owner; + self.actionSelector = selector; } - (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector { if (aSelector == @selector(insertNewline:)) { - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - [self._actionTarget performSelector:self._actionSelector]; -#pragma clang diagnostic pop + objc_msgSend(self.actionTarget, self.actionSelector); [self resetTextFieldCellSize]; [self sanitizeTextField:NO]; @@ -204,7 +193,7 @@ - (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector @end -@implementation InputTextFieldScroller +@implementation TVCInputTextFieldScroller - (void)drawRect:(NSRect)dirtyRect { @@ -225,9 +214,9 @@ - (void)drawRect:(NSRect)dirtyRect NSBezierPath *gradientPath = [NSBezierPath bezierPathWithRoundedRect:blackOutlineFrame xRadius:3.6 yRadius:3.6]; if ([parentWindow isOnCurrentWorkspace]) { - gradient = [[NSGradient alloc] initWithStartingColor:LION_ACTIVE_START_GRADIENT endingColor:LION_ACTIVE_STOP_GRADIENT]; + gradient = [[NSGradient alloc] initWithStartingColor:_ActiveWindowGradientStart endingColor:_ActiveWindowGradientStop]; } else { - gradient = [[NSGradient alloc] initWithStartingColor:LION_INACTIVE_START_GRADIENT endingColor:LION_INACTIVE_STOP_GRADIENT]; + gradient = [[NSGradient alloc] initWithStartingColor:_InactiveWindowGradientStart endingColor:_InactiveWindowGradientStop]; } [gradient drawInBezierPath:gradientPath angle:90]; @@ -244,7 +233,7 @@ - (void)drawRect:(NSRect)dirtyRect NSColor *frameColor = [NSColor whiteColor]; NSBezierPath *framePath = [NSBezierPath bezierPathWithRoundedRect:whiteFrame xRadius:2.6 yRadius:2.6]; - NSGradient *frameGradient = [[NSGradient alloc] initWithStartingColor:LION_BODY_GRADIENT_START endingColor:LION_BODY_GRADIENT_STOP]; + NSGradient *frameGradient = [[NSGradient alloc] initWithStartingColor:_bodyGradientStart endingColor:_bodyGradientStop]; [frameColor set]; [framePath fill]; diff --git a/Classes/Views/ListSeparatorCell.m b/Classes/Views/TVCListSeparatorCell.m similarity index 88% rename from Classes/Views/ListSeparatorCell.m rename to Classes/Views/TVCListSeparatorCell.m index d6654832d3..7e5392c815 100755 --- a/Classes/Views/ListSeparatorCell.m +++ b/Classes/Views/TVCListSeparatorCell.m @@ -2,13 +2,13 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation ListSeparatorCell +@implementation TVCListSeparatorCell - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { NSString *value = [self stringValue]; - if ([value isEqualToString:ListSeparatorCellIndex]) { + if ([value isEqualToString:TXDefaultListSeperatorCellIndex]) { CGFloat lineWidth = 0; CGFloat lineX = 0; CGFloat lineY = 0; diff --git a/Classes/Views/ListView.m b/Classes/Views/TVCListView.m similarity index 99% rename from Classes/Views/ListView.m rename to Classes/Views/TVCListView.m index 8d27536914..98c9c5bd12 100755 --- a/Classes/Views/ListView.m +++ b/Classes/Views/TVCListView.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation ListView +@implementation TVCListView @synthesize keyDelegate; @synthesize textDelegate; diff --git a/Classes/Views/MainWindow.m b/Classes/Views/TVCMainWindow.m similarity index 95% rename from Classes/Views/MainWindow.m rename to Classes/Views/TVCMainWindow.m index 641258c702..dc19cc113b 100755 --- a/Classes/Views/MainWindow.m +++ b/Classes/Views/TVCMainWindow.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation MainWindow +@implementation TVCMainWindow @synthesize keyHandler; @@ -14,13 +14,12 @@ - (BOOL)canBecomeMainWindow - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation { if ((self = [super initWithContentRect:contentRect styleMask:windowStyle backing:bufferingType defer:deferCreation])) { - self.keyHandler = [KeyEventHandler new]; + self.keyHandler = [TLOKeyEventHandler new]; } return self; } - - (void)setKeyHandlerTarget:(id)target { [self.keyHandler setTarget:target]; diff --git a/Classes/Views/ServerList.m b/Classes/Views/TVCServerList.m similarity index 91% rename from Classes/Views/ServerList.m rename to Classes/Views/TVCServerList.m index ff1b552496..d00e1687a3 100755 --- a/Classes/Views/ServerList.m +++ b/Classes/Views/TVCServerList.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation ServerList +@implementation TVCServerList @synthesize keyDelegate; @@ -13,7 +13,7 @@ - (NSRect)frameOfCellAtColumn:(NSInteger)column row:(NSInteger)row id childItem = [self itemAtRow:row]; if ([self isGroupItem:childItem] == NO) { - if ([Preferences featureAvailableToOSXLion]) { + if ([TPCPreferences featureAvailableToOSXLion]) { nrect.origin.x += 35; nrect.size.width = ([self frame].size.width - 35); } else { @@ -32,8 +32,8 @@ - (void)toggleAddServerButton { NSRect clipRect = [self frame]; - MasterController *master = [self.keyDelegate master]; - MenuController *menucl = [master menu]; + TXMasterController *master = [self.keyDelegate master]; + TXMenuController *menucl = [master menu]; if (NSObjectIsEmpty([self.keyDelegate clients])) { [master.addServerButton setHidden:NO]; diff --git a/Classes/Views/ServerListCell.m b/Classes/Views/TVCServerListCell.m similarity index 64% rename from Classes/Views/ServerListCell.m rename to Classes/Views/TVCServerListCell.m index e0871adcdd..3b0896c984 100755 --- a/Classes/Views/ServerListCell.m +++ b/Classes/Views/TVCServerListCell.m @@ -5,41 +5,42 @@ /* This class and the one for the user list is based off the open source PXSourceList toolkit developed by Alex Rozanski. */ -#define ICON_SPACING 5.0 -#define BADGE_RIGHT_MARGIN 5.0 -#define BADGE_INSIDE_MARGIN 5.0 -#define MIN_BADGE_WIDTH 22.0 -#define BADGE_HEIGHT 14.0 +#define _iconSpacing 5.0 -#define BADGE_FONT [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5] -#define BADGE_TEXT_COLOR_TS [NSColor _colorWithCalibratedRed:158 green:169 blue:197 alpha:1] -#define BADGE_TEXT_COLOR_NS [NSColor whiteColor] -#define BADGE_SHADOW_COLOR [NSColor colorWithCalibratedWhite:1.00 alpha:0.60] -#define BADGE_MESSAGE_BACKGROUND_COLOR_TS [NSColor whiteColor] -#define BADGE_HIGHLIGHT_BACKGROUND_COLOR [NSColor _colorWithCalibratedRed:210 green:15 blue:15 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_AQUA [NSColor _colorWithCalibratedRed:152 green:168 blue:202 alpha:1] -#define BADGE_MESSAGE_BACKGROUND_COLOR_GRAPHITE [NSColor _colorWithCalibratedRed:132 green:147 blue:163 alpha:1] +#define _badgeRightMargin 5.0 +#define _badgeInsideMargin 5.0 +#define _badgeMinimumWidth 22.0 +#define _badgeHeight 14.0 -#define SERVER_CELL_FONT [NSFont fontWithName:@"LucidaGrande-Bold" size:12.0] -#define SERVER_CELL_FONT_COLOR [NSColor outlineViewHeaderTextColor] -#define SERVER_CELL_FONT_COLOR_DISABLED [NSColor outlineViewHeaderDisabledTextColor] -#define SERVER_CELL_SELECTION_FONT_COLOR [NSColor whiteColor] -#define SERVER_CELL_SELECTION_SHADOW_COLOR_AW [NSColor colorWithCalibratedWhite:0.00 alpha:0.30] -#define SERVER_CELL_SELECTION_SHADOW_COLOR_IA [NSColor colorWithCalibratedWhite:0.00 alpha:0.20] -#define SERVER_CELL_SHADOW_COLOR_AW [NSColor colorWithCalibratedWhite:1.00 alpha:1.00] -#define SERVER_CELL_SHADOW_COLOR_NA [NSColor colorWithCalibratedWhite:1.00 alpha:1.00] +#define _badgeFont [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5] +#define _badgeTextColorTS [NSColor internalCalibratedRed:158 green:169 blue:197 alpha:1] +#define _badgeTextColorNS [NSColor whiteColor] +#define _badgeShadowColor [NSColor colorWithCalibratedWhite:1.00 alpha:0.60] +#define _badgeMessageBackgroundColorTS [NSColor whiteColor] +#define _badgeHighlightBackgroundColor [NSColor internalCalibratedRed:210 green:15 blue:15 alpha:1] +#define _badgeMessageBackgroundColorAqua [NSColor internalCalibratedRed:152 green:168 blue:202 alpha:1] +#define _badgeMessageBackgroundColorGraphite [NSColor internalCalibratedRed:132 green:147 blue:163 alpha:1] -#define CHANNEL_CELL_FONT [NSFont fontWithName:@"LucidaGrande" size:11.0] -#define CHANNEL_CELL_FONT_COLOR [NSColor blackColor] -#define CHANNEL_CELL_SELECTION_FONT_COLOR [NSColor whiteColor] -#define CHANNEL_CELL_SELECTION_FONT [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0] -#define CHANNEL_CELL_SHADOW_COLOR [NSColor _colorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6] -#define CHANNEL_CELL_SELECTION_SHADOW_COLOR_AW [NSColor colorWithCalibratedWhite:0.00 alpha:0.48] -#define CHANNEL_CELL_SELECTION_SHADOW_COLOR_IA [NSColor colorWithCalibratedWhite:0.00 alpha:0.30] +#define _serverCellFont [NSFont fontWithName:@"LucidaGrande-Bold" size:12.0] +#define _serverCellFontColor [NSColor outlineViewHeaderTextColor] +#define _serverCellFontColorDisabled [NSColor outlineViewHeaderDisabledTextColor] +#define _serverCellSelectionFontColor [NSColor whiteColor] +#define _serverCellSelectionShadowFontColorAW [NSColor colorWithCalibratedWhite:0.00 alpha:0.30] +#define _serverCellSelectionShadowFontColorIA [NSColor colorWithCalibratedWhite:0.00 alpha:0.20] +#define _serverCellShadowColorAW [NSColor colorWithCalibratedWhite:1.00 alpha:1.00] +#define _serverCellShadowColorNA [NSColor colorWithCalibratedWhite:1.00 alpha:1.00] -#define GRAPHITE_SELECTION_COLOR_AW [NSColor _colorWithCalibratedRed:17 green:73 blue:126 alpha:1.00] +#define _channelCellFont [NSFont fontWithName:@"LucidaGrande" size:11.0] +#define _channelCellFontColor [NSColor blackColor] +#define _channelCellSelectionFontColor [NSColor whiteColor] +#define _channelCellSelectionFont [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0] +#define _channelCellShadowColor [NSColor internalColorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6] +#define _channelCellSelectionShadowColor_AW [NSColor colorWithCalibratedWhite:0.00 alpha:0.48] +#define _channelCellSelectionShadowColor_IA [NSColor colorWithCalibratedWhite:0.00 alpha:0.30] -@implementation ServerListCell +#define _graphiteSelectionColorAW [NSColor internalCalibratedRed:17 green:73 blue:126 alpha:1.00] + +@implementation TVCServerListCell @synthesize parent; @synthesize cellItem; @@ -56,7 +57,7 @@ - (void)drawStatusBadge:(NSString *)iconName inCell:(NSRect)cellFrame } NSSize iconSize = NSMakeSize(16, 16); - NSRect iconRect = NSMakeRect( (NSMinX(cellFrame) - iconSize.width - ICON_SPACING), + NSRect iconRect = NSMakeRect( (NSMinX(cellFrame) - iconSize.width - _iconSpacing), ((NSMidY(cellFrame) - (iconSize.width / 2.0f) - extraMath)), iconSize.width, iconSize.height); @@ -96,13 +97,13 @@ - (NSAttributedString *)messageCountBadgeText:(NSInteger)messageCount selected:( NSMutableDictionary *attributes = [NSMutableDictionary dictionary]; - NSColor *textColor = BADGE_TEXT_COLOR_NS; + NSColor *textColor = _badgeTextColorNS; if (isSelected) { - textColor = BADGE_TEXT_COLOR_TS; + textColor = _badgeTextColorTS; } - [attributes setObject:BADGE_FONT forKey:NSFontAttributeName]; + [attributes setObject:_badgeFont forKey:NSFontAttributeName]; [attributes setObject:textColor forKey:NSForegroundColorAttributeName]; NSAttributedString *mcstring = [[NSAttributedString alloc] initWithString:messageCountString @@ -116,14 +117,14 @@ - (NSRect)messageCountBadgeRect:(NSRect)cellFrame withText:(NSAttributedString * NSRect badgeFrame; NSSize messageCountSize = [mcstring size]; - NSInteger messageCountWidth = (messageCountSize.width + (BADGE_INSIDE_MARGIN * 2)); + NSInteger messageCountWidth = (messageCountSize.width + (_badgeInsideMargin * 2)); - badgeFrame = NSMakeRect((NSMaxX(cellFrame) - (BADGE_RIGHT_MARGIN + messageCountWidth)), - (NSMidY(cellFrame) - (BADGE_HEIGHT / 2.0)), - messageCountWidth, BADGE_HEIGHT); + badgeFrame = NSMakeRect((NSMaxX(cellFrame) - (_badgeRightMargin + messageCountWidth)), + (NSMidY(cellFrame) - (_badgeHeight / 2.0)), + messageCountWidth, _badgeHeight); - if (badgeFrame.size.width < MIN_BADGE_WIDTH) { - NSInteger widthDiff = (MIN_BADGE_WIDTH - badgeFrame.size.width); + if (badgeFrame.size.width < _badgeMinimumWidth) { + NSInteger widthDiff = (_badgeMinimumWidth - badgeFrame.size.width); badgeFrame.size.width += widthDiff; badgeFrame.origin.x -= widthDiff; @@ -147,32 +148,32 @@ - (NSInteger)drawMessageCountBadge:(NSAttributedString *)mcstring shadowFrame.origin.y += 1; badgePath = [NSBezierPath bezierPathWithRoundedRect:shadowFrame - xRadius:(BADGE_HEIGHT / 2.0) - yRadius:(BADGE_HEIGHT / 2.0)]; + xRadius:(_badgeHeight / 2.0) + yRadius:(_badgeHeight / 2.0)]; - [BADGE_SHADOW_COLOR set]; + [_badgeShadowColor set]; [badgePath fill]; } NSColor *backgroundColor; if (highlight) { - backgroundColor = BADGE_HIGHLIGHT_BACKGROUND_COLOR; + backgroundColor = _badgeHighlightBackgroundColor; } else { if (isSelected) { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_TS; + backgroundColor = _badgeMessageBackgroundColorTS; } else { if ([NSColor currentControlTint] == NSGraphiteControlTint) { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_GRAPHITE; + backgroundColor = _badgeMessageBackgroundColorGraphite; } else { - backgroundColor = BADGE_MESSAGE_BACKGROUND_COLOR_AQUA; + backgroundColor = _badgeMessageBackgroundColorAqua; } } } badgePath = [NSBezierPath bezierPathWithRoundedRect:badgeFrame - xRadius:(BADGE_HEIGHT / 2.0) - yRadius:(BADGE_HEIGHT / 2.0)]; + xRadius:(_badgeHeight / 2.0) + yRadius:(_badgeHeight / 2.0)]; [backgroundColor set]; [badgePath fill]; @@ -182,18 +183,18 @@ - (NSInteger)drawMessageCountBadge:(NSAttributedString *)mcstring badgeTextPoint = NSMakePoint( (NSMidX(badgeFrame) - (messageCountSize.width / 2.0)), ((NSMidY(badgeFrame) - (messageCountSize.height / 2.0)) + 1)); - if ([Preferences featureAvailableToOSXMountainLion]) { + if ([TPCPreferences featureAvailableToOSXMountainLion]) { badgeTextPoint.y -= 1; } - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() saveGraphicsState]; [_NSGraphicsCurrentContext() setShouldAntialias: NO]; } [mcstring drawAtPoint:badgeTextPoint]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() restoreGraphicsState]; } @@ -300,23 +301,23 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView cellFrame.size.width -= badgeRect.size.width; } - cellFrame.size.width -= (BADGE_RIGHT_MARGIN * 2); + cellFrame.size.width -= (_badgeRightMargin * 2); if (isSelected == NO) { [itemShadow setShadowOffset:NSMakeSize(1, -1)]; - [itemShadow setShadowColor:CHANNEL_CELL_SHADOW_COLOR]; + [itemShadow setShadowColor:_channelCellShadowColor]; } else { [itemShadow setShadowBlurRadius:2.0]; [itemShadow setShadowOffset:NSMakeSize(1, -1)]; if (isKeyWindow) { if (isGraphite) { - [itemShadow setShadowColor:GRAPHITE_SELECTION_COLOR_AW]; + [itemShadow setShadowColor:_graphiteSelectionColorAW]; } else { - [itemShadow setShadowColor:CHANNEL_CELL_SELECTION_SHADOW_COLOR_AW]; + [itemShadow setShadowColor:_channelCellSelectionShadowColor_AW]; } } else { - [itemShadow setShadowColor:CHANNEL_CELL_SELECTION_SHADOW_COLOR_IA]; + [itemShadow setShadowColor:_channelCellSelectionShadowColor_IA]; } } @@ -326,54 +327,54 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView NSRange textRange = NSMakeRange(0, [newValue length]); if (isSelected) { - [newValue addAttribute:NSFontAttributeName value:CHANNEL_CELL_SELECTION_FONT range:textRange]; - [newValue addAttribute:NSForegroundColorAttributeName value:CHANNEL_CELL_SELECTION_FONT_COLOR range:textRange]; + [newValue addAttribute:NSFontAttributeName value:_channelCellSelectionFont range:textRange]; + [newValue addAttribute:NSForegroundColorAttributeName value:_channelCellSelectionFontColor range:textRange]; } else { - [newValue addAttribute:NSFontAttributeName value:CHANNEL_CELL_FONT range:textRange]; - [newValue addAttribute:NSForegroundColorAttributeName value:CHANNEL_CELL_FONT_COLOR range:textRange]; + [newValue addAttribute:NSFontAttributeName value:_channelCellFont range:textRange]; + [newValue addAttribute:NSForegroundColorAttributeName value:_channelCellFontColor range:textRange]; } [newValue addAttribute:NSShadowAttributeName value:itemShadow range:textRange]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() saveGraphicsState]; [_NSGraphicsCurrentContext() setShouldAntialias: NO]; } [newValue drawInRect:cellFrame]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() restoreGraphicsState]; } } else { cellFrame.origin.y += 4; - NSColor *controlColor = SERVER_CELL_FONT_COLOR; - NSFont *groupFont = SERVER_CELL_FONT; + NSColor *controlColor = _serverCellFontColor; + NSFont *groupFont = _serverCellFont; if (self.cellItem.client.isConnected == NO) { - controlColor = SERVER_CELL_FONT_COLOR_DISABLED; + controlColor = _serverCellFontColorDisabled; } [itemShadow setShadowOffset:NSMakeSize(1, -1)]; if (isSelected) { - controlColor = SERVER_CELL_SELECTION_FONT_COLOR; + controlColor = _serverCellSelectionFontColor; if (isKeyWindow) { if (isGraphite) { - [itemShadow setShadowColor:GRAPHITE_SELECTION_COLOR_AW]; + [itemShadow setShadowColor:_graphiteSelectionColorAW]; } else { - [itemShadow setShadowColor:SERVER_CELL_SELECTION_SHADOW_COLOR_AW]; + [itemShadow setShadowColor:_serverCellSelectionShadowFontColorAW]; } } else { - [itemShadow setShadowColor:SERVER_CELL_SELECTION_SHADOW_COLOR_IA]; + [itemShadow setShadowColor:_serverCellSelectionShadowFontColorIA]; } } else { if (isKeyWindow) { - [itemShadow setShadowColor:SERVER_CELL_SHADOW_COLOR_AW]; + [itemShadow setShadowColor:_serverCellShadowColorAW]; } else { - [itemShadow setShadowColor:SERVER_CELL_SHADOW_COLOR_NA]; + [itemShadow setShadowColor:_serverCellShadowColorNA]; } } @@ -383,14 +384,14 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView [newValue addAttribute:NSShadowAttributeName value:itemShadow range:textRange]; [newValue addAttribute:NSForegroundColorAttributeName value:controlColor range:textRange]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() saveGraphicsState]; [_NSGraphicsCurrentContext() setShouldAntialias: NO]; } [newValue drawInRect:cellFrame]; - if ([Preferences useLogAntialiasing] == NO) { + if ([TPCPreferences useLogAntialiasing] == NO) { [_NSGraphicsCurrentContext() restoreGraphicsState]; } } diff --git a/Classes/Views/TextField.m b/Classes/Views/TVCTextField.m similarity index 83% rename from Classes/Views/TextField.m rename to Classes/Views/TVCTextField.m index b0e578939e..0f6aabdaa6 100755 --- a/Classes/Views/TextField.m +++ b/Classes/Views/TVCTextField.m @@ -2,15 +2,18 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@implementation TextField +#define _DefaultTextFieldWidthPadding 1.0 +#define _DefaultTextFieldHeightPadding 6.0 -@synthesize _keyHandler; -@synthesize _formattingQueue; +@implementation TVCTextField + +@synthesize keyHandler; +@synthesize formattingQueue; - (void)dealloc { - dispatch_release(self._formattingQueue); - self._formattingQueue = NULL; + dispatch_release(self.formattingQueue); + self.formattingQueue = NULL; } - (id)initWithCoder:(NSCoder *)coder @@ -18,19 +21,19 @@ - (id)initWithCoder:(NSCoder *)coder self = [super initWithCoder:coder]; if (self) { - if ([Preferences rightToLeftFormatting]) { + if ([TPCPreferences rightToLeftFormatting]) { [self setBaseWritingDirection:NSWritingDirectionRightToLeft]; } else { [self setBaseWritingDirection:NSWritingDirectionLeftToRight]; } - [super setTextContainerInset:NSMakeSize(DefaultTextFieldWidthPadding, DefaultTextFieldHeightPadding)]; + [super setTextContainerInset:NSMakeSize(_DefaultTextFieldWidthPadding, _DefaultTextFieldHeightPadding)]; - if (PointerIsEmpty(self._keyHandler)) { - self._keyHandler = [KeyEventHandler new]; + if (PointerIsEmpty(self.keyHandler)) { + self.keyHandler = [TLOKeyEventHandler new]; } - self._formattingQueue = dispatch_queue_create("formattingQueue", NULL); + self.formattingQueue = dispatch_queue_create("formattingQueue", NULL); } return self; @@ -38,7 +41,7 @@ - (id)initWithCoder:(NSCoder *)coder - (dispatch_queue_t)formattingQueue { - return self._formattingQueue; + return self.formattingQueue; } #pragma mark - @@ -46,22 +49,22 @@ - (dispatch_queue_t)formattingQueue - (void)setKeyHandlerTarget:(id)target { - [self._keyHandler setTarget:target]; + [self.keyHandler setTarget:target]; } - (void)registerKeyHandler:(SEL)selector key:(NSInteger)code modifiers:(NSUInteger)mods { - [self._keyHandler registerSelector:selector key:code modifiers:mods]; + [self.keyHandler registerSelector:selector key:code modifiers:mods]; } - (void)registerKeyHandler:(SEL)selector character:(UniChar)c modifiers:(NSUInteger)mods { - [self._keyHandler registerSelector:selector character:c modifiers:mods]; + [self.keyHandler registerSelector:selector character:c modifiers:mods]; } - (void)keyDown:(NSEvent *)e { - if ([self._keyHandler processKeyEvent:e]) { + if ([self.keyHandler processKeyEvent:e]) { return; } @@ -126,7 +129,7 @@ - (BOOL)isAtBottomOfView return ([self selectedLineNumber] == [self numberOfLines]); } -- (BOOL)isAtTopfView +- (BOOL)isAtTopOfView { return ([self selectedLineNumber] == 1); } diff --git a/Classes/Views/IRCTextFormatterMenu.m b/Classes/Views/TVCTextFormatterMenu.m similarity index 86% rename from Classes/Views/IRCTextFormatterMenu.m rename to Classes/Views/TVCTextFormatterMenu.m index 828a0d91c2..74b293ab41 100755 --- a/Classes/Views/IRCTextFormatterMenu.m +++ b/Classes/Views/TVCTextFormatterMenu.m @@ -2,7 +2,7 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 08, 2012 -@implementation IRCTextFormatterMenu +@implementation TVCTextFormatterMenu @synthesize textField; @synthesize formatterMenu; @@ -10,22 +10,22 @@ @implementation IRCTextFormatterMenu @synthesize backgroundColorMenu; @synthesize sheetOverrideEnabled; -#define FormattingMenuForegroundColorEnabledTag 95005 -#define FormattingMenuBackgroundColorEnabledTag 95007 -#define FormattingMenuForegroundColorDisabledTag 95004 -#define FormattingMenuBackgroundColorDisabledTag 95006 -#define FormattingMenuRainbowColorMenuItemTag 99 +#define _formattingMenuForegroundColorEnabledTag 95005 +#define _formattingMenuBackgroundColorEnabledTag 95007 +#define _formattingMenuForegroundColorDisabledTag 95004 +#define _formattingMenuBackgroundColorDisabledTag 95006 +#define _formattingMenuRainbowColorMenuItemTag 99 #pragma mark - #pragma mark Menu Management -- (void)enableSheetField:(TextField *)field +- (void)enableSheetField:(TVCTextField *)field { self.sheetOverrideEnabled = YES; self.textField = field; } -- (void)enableWindowField:(TextField *)field +- (void)enableWindowField:(TVCTextField *)field { self.sheetOverrideEnabled = NO; self.textField = field; @@ -46,12 +46,12 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item BOOL foregroundColor = [self foregroundColorSet]; BOOL backgroundColor = [self backgroundColorSet]; - [[rootMenu itemWithTag:FormattingMenuForegroundColorEnabledTag] setHidden:foregroundColor]; - [[rootMenu itemWithTag:FormattingMenuForegroundColorDisabledTag] setHidden:BOOLReverseValue(foregroundColor)]; + [[rootMenu itemWithTag:_formattingMenuForegroundColorEnabledTag] setHidden:foregroundColor]; + [[rootMenu itemWithTag:_formattingMenuForegroundColorDisabledTag] setHidden:BOOLReverseValue(foregroundColor)]; - [[rootMenu itemWithTag:FormattingMenuBackgroundColorEnabledTag] setHidden:backgroundColor]; - [[rootMenu itemWithTag:FormattingMenuBackgroundColorEnabledTag] setEnabled:foregroundColor]; - [[rootMenu itemWithTag:FormattingMenuBackgroundColorDisabledTag] setHidden:BOOLReverseValue(backgroundColor)]; + [[rootMenu itemWithTag:_formattingMenuBackgroundColorEnabledTag] setHidden:backgroundColor]; + [[rootMenu itemWithTag:_formattingMenuBackgroundColorEnabledTag] setEnabled:foregroundColor]; + [[rootMenu itemWithTag:_formattingMenuBackgroundColorDisabledTag] setHidden:BOOLReverseValue(backgroundColor)]; [item setState:boldText]; @@ -96,9 +96,9 @@ - (BOOL)validateMenuItem:(NSMenuItem *)item } case 100: { - BOOL condition = [_NSUserDefaults() boolForKey:@"EnableRainbowFormattingMenuItem"]; + BOOL condition = [_NSUserDefaults() boolForKey:@"EnableRainbow_formattingMenuItem"]; - NSMenuItem *divider = [[item menu] itemWithTag:FormattingMenuRainbowColorMenuItemTag]; + NSMenuItem *divider = [[item menu] itemWithTag:_formattingMenuRainbowColorMenuItemTag]; [item setHidden:BOOLReverseValue(condition)]; [divider setHidden:BOOLReverseValue(condition)]; @@ -202,8 +202,8 @@ - (void)insertForegroundColorCharIntoTextBox:(id)sender if (selectedTextRange.location == NSNotFound || selectedTextRange.length == 0) return; if ([sender tag] == 100) { - if (selectedTextRange.length > MAXIMUM_FORMATTING_LENGTH) { - selectedTextRange.length = MAXIMUM_FORMATTING_LENGTH; + if (selectedTextRange.length > TXMaximumRainbowTextFormattingLength) { + selectedTextRange.length = TXMaximumRainbowTextFormattingLength; } NSString *charValue = nil; @@ -228,7 +228,7 @@ - (void)insertForegroundColorCharIntoTextBox:(id)sender rainbowArrayIndex = 0; } - if ([charValue isEqualToString:NSWhitespaceCharacter]) { + if ([charValue isEqualToString:NSStringWhitespacePlaceholder]) { [self.textField setIRCFormatterAttribute:IRCTextFormatterForegroundColorEffect value:NSNumberWithInteger(0) range:charRange]; @@ -262,8 +262,8 @@ - (void)insertBackgroundColorCharIntoTextBox:(id)sender if (selectedTextRange.location == NSNotFound || selectedTextRange.length == 0) return; if ([sender tag] == 100) { - if (selectedTextRange.length > MAXIMUM_FORMATTING_LENGTH) { - selectedTextRange.length = MAXIMUM_FORMATTING_LENGTH; + if (selectedTextRange.length > TXMaximumRainbowTextFormattingLength) { + selectedTextRange.length = TXMaximumRainbowTextFormattingLength; } NSRange charRange; @@ -317,7 +317,7 @@ - (void)removeBoldCharFromTextBox:(id)sender [self.textField removeIRCFormatterAttribute:IRCTextFormatterBoldEffect range:selectedTextRange - color:DefaultTextFieldFontColor]; + color:TXTXDefaultTextFieldFontColor]; if ([self.textField respondsToSelector:@selector(focus)]) { [self.textField performSelector:@selector(focus)]; @@ -333,7 +333,7 @@ - (void)removeItalicCharFromTextBox:(id)sender [self.textField removeIRCFormatterAttribute:IRCTextFormatterItalicEffect range:selectedTextRange - color:DefaultTextFieldFontColor]; + color:TXTXDefaultTextFieldFontColor]; if ([self.textField respondsToSelector:@selector(focus)]) { [self.textField performSelector:@selector(focus)]; @@ -349,7 +349,7 @@ - (void)removeUnderlineCharFromTextBox:(id)sender [self.textField removeIRCFormatterAttribute:IRCTextFormatterUnderlineEffect range:selectedTextRange - color:DefaultTextFieldFontColor]; + color:TXTXDefaultTextFieldFontColor]; if ([self.textField respondsToSelector:@selector(focus)]) { [self.textField performSelector:@selector(focus)]; @@ -365,7 +365,7 @@ - (void)removeForegroundColorCharFromTextBox:(id)sender [self.textField removeIRCFormatterAttribute:IRCTextFormatterForegroundColorEffect range:selectedTextRange - color:DefaultTextFieldFontColor]; + color:TXTXDefaultTextFieldFontColor]; if ([self.textField respondsToSelector:@selector(focus)]) { [self.textField performSelector:@selector(focus)]; @@ -381,7 +381,7 @@ - (void)removeBackgroundColorCharFromTextBox:(id)sender [self.textField removeIRCFormatterAttribute:IRCTextFormatterBackgroundColorEffect range:selectedTextRange - color:DefaultTextFieldFontColor]; + color:TXTXDefaultTextFieldFontColor]; if ([self.textField respondsToSelector:@selector(focus)]) { [self.textField performSelector:@selector(focus)]; diff --git a/Classes/Views/ThinSplitView.m b/Classes/Views/TVCThinSplitView.m similarity index 92% rename from Classes/Views/ThinSplitView.m rename to Classes/Views/TVCThinSplitView.m index 09249425f9..756388d589 100755 --- a/Classes/Views/ThinSplitView.m +++ b/Classes/Views/TVCThinSplitView.m @@ -2,21 +2,21 @@ // You can redistribute it and/or modify it under the new BSD license. // Converted to ARC Support on Thursday, June 07, 2012 -@interface ThinSplitView (Private) +@interface TVCThinSplitView (Private) - (void)updatePosition; @end -@implementation ThinSplitView +@implementation TVCThinSplitView @synthesize hidden; @synthesize position; @synthesize inverted; @synthesize fixedViewIndex; -@synthesize myDividerThickness; +@synthesize altDividerThickness; - (void)setUp { - self.myDividerThickness = 1; + self.altDividerThickness = 1; } - (id)initWithFrame:(NSRect)rect @@ -39,7 +39,7 @@ - (id)initWithCoder:(NSCoder *)coder - (void)awakeFromNib { - self.myDividerThickness = (([self isVertical]) ? 1 : 5); + self.altDividerThickness = (([self isVertical]) ? 1 : 5); [self updatePosition]; } @@ -64,11 +64,11 @@ - (void)setPosition:(NSInteger)value [self adjustSubviews]; } -- (void)setMyDividerThickness:(NSInteger)value +- (void)setAltDividerThickness:(NSInteger)value { - if (self.myDividerThickness == value) return; + if (self.altDividerThickness == value) return; - myDividerThickness = value; + altDividerThickness = value; [self adjustSubviews]; } @@ -97,7 +97,7 @@ - (void)setVertical:(BOOL)value { [super setVertical:value]; - myDividerThickness = ((value) ? 1 : 5); + altDividerThickness = ((value) ? 1 : 5); [self adjustSubviews]; } @@ -171,7 +171,7 @@ - (void)adjustSubviews NSInteger width = size.width; NSInteger height = size.height; - NSInteger w = self.myDividerThickness; + NSInteger w = self.altDividerThickness; NSView *fixedView = [[self subviews] safeObjectAtIndex:self.fixedViewIndex]; NSView *flyingView = [[self subviews] safeObjectAtIndex:((self.fixedViewIndex) ? 0 : 1)]; diff --git a/English.lproj/BasicLanguage.strings b/English.lproj/BasicLanguage.strings index 6e78164d66..4f662ee12e 100644 --- a/English.lproj/BasicLanguage.strings +++ b/English.lproj/BasicLanguage.strings @@ -1,269 +1,276 @@ /* Copyright © 2010, 2011, 2012 Codeux Software. */ -"SHUN_REASON" = "1d Shunned."; -"KILL_REASON" = "Your behavior is not conducive to the desired environment."; -"KICK_REASON" = "Your behavior is not conducive to the desired environment."; -"GLINE_REASON" = "35d Your behavior is not conducive to the desired environment."; +"AboutWindowBuildNumber" = "Version %@"; + +"AccessibilityMemberListDescription" = "User %1$@ selected in member list of channel hash %2$@."; + +"AddressBookIgnoreEntryType" = "User Ignore"; +"AddressBookUserTrackingEntryType" += "User Tracking"; + +"ApplicationWantsToTerminatePromptMessage" = "Quitting will disconnect you from any IRC server that you are connected to until you restart Textual."; +"ApplicationWantsToTerminatePromptTitle" = "Do you want to quit Textual?"; + +"BlowfishCurrentEncryptionKey" = "Current Encryption Key: %@"; +"BlowfishEncryptionFailed" = "Encryption of message failed. Not sending to server."; +"BlowfishEncryptionKeyChanged" = "Encryption key changed. Adjusting accordingly."; +"BlowfishEncryptionStarted" = "Encryption started."; +"BlowfishEncryptionStartedInQuery" = "Encryption started in query. If this query is closed, then the key must be set again."; +"BlowfishEncryptionStopped" = "Encryption stopped."; + +"BlowfishKeyExchangeFeatureNotReadyYet" = "Key exchange is currently not supported."; +"BlowfishKeyExchangeForQueriesOnly" = "Key exchange is for queries only."; +"BlowfishKeyExchangeRequestAlreadyExists" = "A key exchange request already exists for %@. Please wait for the current one to expire before requesting a new one."; +"BlowfishKeyExchangeRequestReceived" = "Received key exchange request from %@. Processing …"; +"BlowfishKeyExchangeRequestSent" = "Key exchange request has been sent to \002%@\002."; +"BlowfishKeyExchangeRequestTimedOut" = "Key exchange request for %@ has expired."; +"BlowfishKeyExchangeUnknownErrorOccurred" = "An unknown error occurred during key exchange."; +"BlowfishNoEncryptionKeySet" = "No encryption key is set."; + +"BragspamPluginChannelResult" = "I am within the channel %@, "; +"BragspamPluginChannelResultEndItem" = "and %1$@ on the %2$@."; +"BragspamPluginChannelResultMiddleItem" = "%@, "; +"BragspamPluginChannelResultNone" = "I am not within any channels on the %2$@."; +"BragspamPluginChannelResultSingle" = "I am only within the channel %1$@ on the %2$@."; +"BragspamPluginNormalResult" = "I am in %i channels while connected to %i networks. I have %i o:lines, %i ops, %i halfops, and %i voices with power over %i individual users."; + +"CancelButton" = "Cancel"; + +"ChannelApplicationTitleModeValue" = " (%@)"; +"ChannelApplicationTitleUserCount" = " (%i Users)"; + +"ChannelDeletePromptMessage" = "There is no undo and all data related to this channel will be erased."; +"ChannelDeletePromptTitle" = "Do you want to delete the selection?"; + +"ChannelListNetworkName" = "Channel List for \"%@\""; + +"CmdWShortcutCloseQueryType" = "Close Query"; +"CmdWShortcutCloseWindowType" = "Close Window"; +"CmdWShortcutDisconnectServerType" = "Disconnect from %@"; +"CmdWShortcutLeaveChannelType" = "Leave Channel"; +"CmdWShortcutQuitApplicationType" = "Quit Textual & IRC"; + +"ContinueButton" = "Continue"; + +"CopyLogAsHTMLMenuItem" = "Copy Log as HTML"; + +"DCCRequestErrorMessage" = "The Textual IRC Client has received a DCC request that could not be processed."; + +"DefaultDisconnectQuitMessage" = "Textual IRC Client: www.textualapp.com"; +"DefaultNewConnectionName" = "Untitled Connection"; + +"DeleteButton" = "Delete"; + +"DeleteChannelMenuItem" = "Delete Channel"; +"DeleteQueryMenuItem" = "Close Query"; + +"FindSearchPanelPromptButton" = "Search"; +"FindSearchPanelPromptMessage" = "Please enter a phrase to search for. Once a search is created the keyboard shortcut ⌘G can be used to continue to the next search result and the combination ⌘⇧G to return to the previous."; +"FindSearchPanelPromptTitle" = "Search for Message"; + +"ForceReloadThemeMenuItem" = "Force Reload Style"; + +"GlineReason" = "35d Your behavior is not conducive to the desired environment."; + +"IRCAwayCommandDefaultReason" = "Be back later."; +"IRCCTCPRequestIgnored" = "\002-CTCP-\002 %1$@ from %2$@ was ignored."; +"IRCCTCPSupportedReplies" = "VERSION CLIENTINFO USERINFO PING TIME"; +"IRCCTCPVersionInfo" = "%1$@ %2$@ (Git Reference: %3$@)"; +"IRCCTCPVersionTitle" = "\002Current Version:\002 %@"; +"IRCCapCurrentlyEnabledNone" = "There are no capabilities in use."; +"IRCCapCurrentlyEnbaled" = "The following capabilities are currently enabled: %@"; +"IRCChannelEmptyTopic" = "(No Topic)"; +"IRCChannelHasModes" = "Mode is \002%@\002"; +"IRCChannelHasTopic" = "Topic is \002%@\002"; +"IRCChannelHasTopicAuthor" = "Set by \002%1$@\002 on %2$@"; +"IRCChannelHasWebsite" = "Website is \002%@\002"; +"IRCChannelPreparingRejoinAttempt" = "Attempting to rejoin channel in three seconds."; +"IRCChannelTopicChanged" = "\002%1$@\002 changed the topic to \002%2$@\002"; +"IRCConnectedToServer" = "Connection to host completed."; +"IRCDisconnectedBySleepMode" = "Disconnect for Sleep Mode"; +"IRCDisconnectedByTimeout" = "%i minutes have elapsed since last response from this connection. Disconnecting due to timeout."; +"IRCDisconnectedByTrialPeriodTimer" = "Disconnected from server due to trial period limit. Please consider purchasing Textual to continue or simply reconnect."; +"IRCDisconnectedFromServer" = "Disconnected"; +"IRCHadRawError" = "Message(%1$d): %2$@"; +"IRCIsConnecting" = "Connecting to [%1$@] on port %2$i"; +"IRCIsReconnecting" = "Reconnecting …"; +"IRCIsRetryingConnection" = "Retrying …"; +"IRCModeSet" = "\002%1$@\002 sets mode \002%2$@\002"; +"IRCRawModeIsDisabled" = "Raw mode has been disabled. Textual will no longer output raw data."; +"IRCRawModeIsEnabled" = "Raw mode has been enabled. Textual will now output all data that it receives and sends to the IRC server in the Mac OS X \"Console\" application. To disable, execute \"/debug raw off\""; +"IRCRecievedCTCPPingReply" = "\002-%1$@ CTCP-\002 %2$@ (%3$1.5f sec)"; +"IRCRecievedCTCPReply" = "\002-%1$@ CTCP-\002 %2$@ %3$@"; +"IRCRecievedCTCPRequest" = "\002-CTCP-\002 %1$@ from %2$@"; +"IRCServerHadNetsplitQuitMessage" = "Netsplit: %@"; +"IRCServerNetworkName" = "%@ IRC Network"; +"IRCTimerCommandRequiresInteger" = "Timer command requires number for interval."; +"IRCUserChangedNickname" = "%1$@ is now known as \002%2$@\002"; +"IRCUserDisconnected" = "\002%1$@\002 (%2$@@%3$@) left IRC."; +"IRCUserHasModes" = "Your user mode is %@"; +"IRCUserInvitedToJoinChannel" = "Inviting %1$@ to join %2$@"; +"IRCUserInvitedYouToJoinChannel" = "%1$@!%2$@@%3$@ invited you to join %4$@"; +"IRCUserIsAway" = "%1$@ is away (%2$@)"; +"IRCUserIsNowIRCOperator" = "You are now an IRC Operator on %@"; +"IRCUserJoinedChannel" = "\002%1$@\002 (%2$@@%3$@) joined the channel."; +"IRCUserKickedFromChannel" = "\002%1$@\002 kicked \002%2$@\002 from the channel. (%3$@)"; +"IRCUserPartedChannel" = "\002%1$@\002 (%2$@@%3$@) left the channel."; +"IRCUserWhoisChannels" = "%1$@ is on %2$@"; +"IRCUserWhoisConnectedFrom" = "%1$@ is connected on %2$@ (%3$@)"; +"IRCUserWhoisHostmask" = "%1$@ has userhost %2$@@%3$@ and real name \"%4$@\""; +"IRCUserWhoisUptime" = "%1$@ signed on at %2$@ and has been idle for %3$@"; +"IRCUserWhowasConnectedFrom" = "%1$@ was connected to %2$@ on %3$@"; +"IRCUserWhowasHostmask" = "%1$@ had userhost %2$@@%3$@ and real name \"%4$@\""; +"IRCWeightsCommandNoResults" = "No information available."; +"IRCWeightsCommandResultRow" = "%@ — sent: %f; receive: %f; total: %f;"; + +"InputRequiredToContinue" = "Input Required to Continue"; + +"InputTextFieldPlaceholderValue" = "Send Message …"; + +"InviteSheetMultiplePeopleSelected" = "%d users"; +"InviteSheetTargetDescription" = "Invite %@ to:"; +"InviteSheetTwoPeopleSelected" = "%1$@ and %2$@"; + +"KickReason" = "Your behavior is not conducive to the desired environment."; +"KillReason" = "Your behavior is not conducive to the desired environment."; + +"LagCheckRequestReplyMessage" = "Received lag check reply from %@. Time elapsed: %1.5f seconds."; +"LagCheckRequestSentMessage" = "Waiting for response from lag check …"; +"LagCheckRequestUnknownReply" = "Received lag check reply even though we never sent a request for one. Exploit attempt?"; + +"ListDialogHasChannels" = "%i Public Channels"; +"ListDialogHasSearchResults" = "%1$i Public Channels - %2$i Search Results"; + +"LogPathDoesNotExistMessage" = "No logs were found for this chat session."; +"LogPathDoesNotExistTitle" = "No Logs Found"; +"LogViewHideInlineImageMessage" = "Hide image by shift clicking."; + +"NoButton" = "No"; + +"NotificationAddressBookMatchMessageTitle" = "Address Book Notification"; +"NotificationChannelNoticeMessage" = "Channel Notice Received"; +"NotificationChannelNoticeMessageTitle" = "Notice: %@"; +"NotificationChannelTalkMessage" = "Channel Message Received"; +"NotificationConnectedMessage" = "Connected"; +"NotificationConnectedMessageTitle" = "Connected: %@"; +"NotificationDisconnectMessage" = "Disconnected"; +"NotificationDisconnectMessageTitle" = "Disconnected: %@"; +"NotificationHighlightMessage" = "Name is Mentioned"; +"NotificationHighlightMessageTitle" = "Highlight: %@"; +"NotificationInvitedMessage" = "Invited to Channel"; +"NotificationInvitedMessageDescription" = "%1$@ has invited you to %2$@"; +"NotificationInvitedMessageTitle" = "Invited: %@"; +"NotificationKickedMessage" = "Kicked from Channel"; +"NotificationKickedMessageDescription" = "%1$@ has kicked you out: %2$@"; +"NotificationKickedMessageTitle" = "Kicked: %@"; +"NotificationNewPrivateQueryMessage" = "New Private Message Started"; +"NotificationNewPrivateQueryMessageTitle" = "New Private Message"; +"NotificationPrivateNoticeMessage" = "Private Notice Received"; +"NotificationPrivateNoticeMessageTitle" = "Private Notice"; +"NotificationPrivateQueryMessage" = "Private Message Received"; +"NotificationPrivateQueryMessageTitle" = "Private Message"; + +"OSXGoingToSleepQuitMessage" = "Computer has gone to sleep."; + +"OkButton" = "OK"; + +"OpeningLocalStyleResourcesCopyButton" = "Make Local Copy"; +"OpeningLocalStyleResourcesMessage" = "The style being opened is a read-only version bundled with Textual."; +"OpeningLocalStyleResourcesTitle" = "Opening Resource Filess"; + +"PluginCommandClashErrorMessage" = "Error: The command %@ is shared by both a script and plugin. Sending to server because of inability to determine priority."; + +"PromptSuppressionButtonDefaultTitle" = "Do not show this message again"; + +"QuitButton" = "Quit"; + +"ScriptExecutionFailure" = "Script Execution Failure: %@"; + +"SelfBanDetectedMessage" = "Textual has prevented you from banning yourself on %@."; + +"ServerDeletePromptMessage" = "There is no undo and all data related to this server will be erased."; +"ServerDeletePromptTitle" = "Do you want to delete the selection?"; + +"ServerNoticeTreeItemTitle" = "Server Notices"; + +"ServerSheetAutojoinNavigationTreeItem" = "Autojoin"; +"ServerSheetCommandsNavigationTreeItem" = "Connect Commands"; +"ServerSheetEncodingNavigationTreeItem" = "Encoding"; +"ServerSheetFloodControlNavigationTreeItem" = "Flood Control"; +"ServerSheetGeneralNavigationTreeItem" = "General"; +"ServerSheetIdentityNavigationTreeItem" = "Identity"; +"ServerSheetIgnoresNavigationTreeItem" = "Address Book"; +"ServerSheetMessageNavigationTreeItem" = "Messages"; +"ServerSheetMiscNavigationTreeItem" = "Miscellaneous"; +"ServerSheetProxyNavigationTreeItem" = "Proxy Server"; + +"SetAsDefaultIRCClientPromptMessage" = "Textual is not set as the default IRC client for this copy of Mac OS X. Set it?"; +"SetAsDefaultIRCClientPromptTitle" = "Default IRC Client"; + +"SetUserVhostPromptMessage" = "Please enter desired vHost. (e.g. apple.vhost)"; +"SetUserVhostPromptTitle" = "Set User vHost"; + +"ShunReason" = "1d Shunned."; + +"SocketBadSSLCertificateErrorMessage" = "The server that you are connecting to has a SSL certificate that has either expired or is not trusted. Would you like to connect to the server regardless?"; +"SocketBadSSLCertificateErrorTitle" = "Untrusted Connection"; + +"SoundIsAlreadyMuted" = "Sound is already muted."; +"SoundIsNoLongerMuted" = "Sound is no longer muted."; +"SoundIsNotMuted" = "Sound is not muted."; +"SoundIsNowMuted" = "Sound has been muted."; + +"TXEmptySoundAlertLabel" = "None"; + +"TXNotificationAddressBookMatchType" = "Address Book Notification"; +"TXNotificationChannelMessageType" = "Channel Message"; +"TXNotificationChannelNoticeType" = "Channel Notice"; +"TXNotificationConnectType" = "Connected"; +"TXNotificationDisconnectType" = "Disconnected"; +"TXNotificationHighlightType" = "Highlight"; +"TXNotificationInviteType" = "Channel Invitation"; +"TXNotificationKickType" = "Kicked from Channel"; +"TXNotificationNewQueryType" = "Private Message (new)"; +"TXNotificationQueryMessageType" = "Private Message"; +"TXNotificationQueryNoticeType" = "Private Notice"; + +"ThemeChangeOverridePromptChannelFont" = "• Channel View Font"; +"ThemeChangeOverridePromptMessage" = "The newly selected style \"%1$@\" has chosen to override the following preferences with ones that it prefers for the best viewing experience:\n\n%2$@"; +"ThemeChangeOverridePromptNicknameFormat" = "• Nickname Format"; +"ThemeChangeOverridePromptTimestampFormat" = "• Timestamp Format"; +"ThemeChangeOverridePromptTitle" = "Preferred Selection"; + +"TimeAgo" = "%@ Ago"; + +"TimeConvertPlural[DAY]" = "Days"; +"TimeConvertPlural[HOUR]" = "Hours"; +"TimeConvertPlural[MINUTE]" = "Minutes"; +"TimeConvertPlural[MONTH]" = "Months"; +"TimeConvertPlural[SECOND]" = "Seconds"; +"TimeConvertPlural[WEEK]" = "Weeks"; +"TimeConvertPlural[YEAR]" = "Years"; + +"TimeConvert[DAY]" = "Day"; +"TimeConvert[HOUR]" = "Hour"; +"TimeConvert[MINUTE]" = "Minute"; +"TimeConvert[MONTH]" = "Month"; +"TimeConvert[SECOND]" = "Second"; +"TimeConvert[WEEK]" = "Week"; +"TimeConvert[YEAR]" = "Year"; + +"TrialPeriodIntroductionDialogMessage" = "This version of Textual is designed to demonstrate the features, performance, reliability, and usability of Textual without having to purchase it.\n\nHowever, as this is a trial version, it will disconnect you from any IRC server that you are connected to every two hours.\n\nWe hope that this glimpse of Textual will help show that it is worth its low sale price."; +"TrialPeriodIntroductionDialogTitle" = "Welcome to the Textual IRC Client"; -"NO_TOPIC_DEFAULT_TOPIC" = "(No Topic)"; -"SERVER_NOTICES_WINDOW_TITLE" = "Server Notices"; -"UNTITLED_CONNECTION_NAME" = "Untitled Connection"; +"TrustButton" = "Trust"; -"LOG_PATH_DOESNT_EXIST_TITLE" = "No Logs Found"; -"LOG_PATH_DOESNT_EXIST_MESSAGE" = "No logs were found for this chat session."; +"Unknown" = "Unknown"; -"INPUT_REQUIRED_TO_CONTINUE" = "Input Required to Continue"; +"UserTrackingHostmaskConnected" = "User with hostmask \"%1$@\" matching Address Book entry \"%2$@\" connected."; +"UserTrackingHostmaskNoLongerAvailable" = "User with hostmask \"%1$@\" matching Address Book entry \"%2$@\" is no longer available."; +"UserTrackingHostmaskNowAvailable" = "User with hostmask \"%1$@\" matching Address Book entry \"%2$@\" is now available."; -"SET_USER_VHOST_PROMPT_TITLE" = "Set User vHost"; -"SET_USER_VHOST_PROMPT_MESSAGE" = "Please enter desired vHost. (e.g. google.vhost)"; +"UserTrackingNicknameIsAvailable" = "User with nickname \"%1$@\" matching Address Book entry \"%2$@\" is available."; +"UserTrackingNicknameNoLongerAvailable" = "User with nickname \"%1$@\" matching Address Book entry \"%2$@\" is no longer available."; +"UserTrackingNicknameNowAvailable" = "User with nickname \"%1$@\" matching Address Book entry \"%2$@\" is now available."; -"EMPTY_SOUND" = "None"; - -"BRAGSPAM_PLUGIN_NORMAL_RESULT" = "I am in %i channels while connected to %i networks. I have %i o:lines, %i ops, %i halfops, and %i voices with power over %i individual users."; -"BRAGSPAM_PLUGIN_CHANNEL_RESULT" = "I am in the channel %@, "; -"BRAGSPAM_PLUGIN_CHANNEL_RESULT_NONE" = "I am not in any channels on the %2$@."; -"BRAGSPAM_PLUGIN_CHANNEL_RESULT_SINGLE" = "I am only in the channel %1$@ on the %2$@."; -"BRAGSPAM_PLUGIN_CHANNEL_RESULT_MIDITEM" = "%@, "; -"BRAGSPAM_PLUGIN_CHANNEL_RESULT_ENDITEM" = "and %1$@ on the %2$@."; - -"CHANNEL_APPLICATION_TITLE_USERS" = " (%i Users)"; -"CHANNEL_APPLICATION_TITLE_MODES" = " (%@)"; - -"SOUND_IS_NOT_MUTED" = "Sound is not muted."; -"SOUND_HAS_BEEN_MUTED" = "Sound has been muted."; -"SOUND_IS_ALREADY_MUTED" = "Sound is already muted."; -"SOUND_IS_NO_LONGER_MUTED" = "Sound is no longer muted."; - -"OPENING_LOCAL_STYLE_RESOURCES_TITLE" = "Default Style"; -"OPENING_LOCAL_STYLE_RESOURCES_COPY_BUTTON" = "Make Local Copy"; -"OPENING_LOCAL_STYLE_RESOURCES_MESSAGE" = "The version of the style \"%@\" being opened is the one packaged by default with Textual. Therefore, it is stored within the application itself and is read only."; - -"DEFAULT_QPS_MESSAGE" = "Textual IRC Client: www.textualapp.com"; -"SLEEPING_APPLICATION_QUIT_MESSAGE" = "Computer has gone to sleep."; - -"DCC_REQUEST_ERROR_MESSAGE" = "The Textual IRC Client has received a DCC request that could not be processed."; - -"UNDO_TYPING_MENU_ITEM" = "Typing"; -"UNDO_FORMATTING_MENU_ITEM" = "Formatting"; - -"TIME_AGO" = "%@ Ago"; - -"OK_BUTTON" = "OK"; -"NO_BUTTON" = "No"; -"YES_BUTTON" = "Yes"; -"QUIT_BUTTON" = "Quit"; -"TRUST_BUTTON" = "Trust"; -"CANCEL_BUTTON" = "Cancel"; -"DELETE_BUTTON" = "Delete"; -"CONTINUE_BUTTON" = "Continue"; - -"SUPPRESSION_BUTTON_DEFAULT_TITLE" = "Do not show this message again"; - -"FIND_SEARCH_PRHASE_PROMPT_TITLE" = "Search for Message"; -"FIND_SEARCH_PHRASE_PROMPT_BUTTON" = "Search"; -"FIND_SEARCH_PHRASE_PROPMT_MESSAGE" = "Please enter a phrase to search for. Once a search is created the keyboard shortcut ⌘G can be used to continue to the next search result and the combination ⌘⇧G to return to the previous."; - -"WANT_QUIT_TITLE" = "Do you want to quit Textual?"; -"WANT_QUIT_MESSAGE" = "Quitting will disconnect you from any IRC server that you are connected to until you restart Textual."; - -"SELF_BAN_DETECTED_MESSAGE" = "Textual has prevented you from banning yourself on %@."; - -"PLUGIN_COMMAND_CLASH_ERROR_MESSAGE" = "Error: The command %@ is shared by both a script and plugin. Sending to server because of inability to determine priority."; - -"WANT_SERVER_DELETE_TITLE" = "Do you want to delete the selection?"; -"WANT_SERVER_DELETE_MESSAGE" = "There is no undo and all data related to this server will be erased."; - -"WANT_CHANNEL_DELETE_TITLE" = "Do you want to delete the selection?"; -"WANT_CHANNEL_DELETE_MESSAGE" = "There is no undo and all data related to this channel will be erased."; - -"DEFAULT_IRC_CLIENT_PROMPT_TITLE" = "Default IRC Client"; -"DEFAULT_IRC_CLIENT_PROMPT_MESSAGE" = "Textual is not set as the default IRC client for this copy of Mac OS X. Set it?"; - -"TRIAL_BUILD_INTRO_DIALOG_TITLE" = "Welcome to the Textual IRC Client"; -"TRIAL_BUILD_INTRO_DIALOG_MESSAGE" = "This version of Textual is designed to demonstrate the features, performance, reliability, and usability of Textual without having to purchase it.\n\nHowever, as this is a trial version, it will disconnect you from any IRC server that you are connected to every two hours.\n\nWe hope that this glimpse of Textual will help show that it is worth its low sale price. "; -"TRIAL_BUILD_NETWORK_DISCONNECTED" = "Disconnected from server due to trial period limit. Please consider purchasing Textual to continue or simply reconnect."; - -"LOG_VIEW_HIDE_INLINE_IMAGE_MESSAGE" = "Hide image by shift clicking."; - -"DELETE_QUERY_MENU_ITEM" = "Close Query"; -"DELETE_CHANNEL_MENU_ITEM" = "Delete Channel"; -"COPY_LOG_AS_HTML_MENU_ITEM" = "Copy Log as HTML"; -"FORCE_RELOAD_THEME_MENU_ITEM" = "Force Reload Style"; - -"SSL_SOCKET_BAD_CERTIFICATE_ERROR_TITLE" = "Untrusted Connection"; -"SSL_SOCKET_BAD_CERTIFICATE_ERROR_MESSAGE" = "The server that you are connecting to has an SSL certificate that has either expired or is not trusted. Would you like to connect to the server regardless?"; - -"THEME_CHANGE_OVERRIDE_PROMPT_TITLE" = "Preferred Selection"; -"THEME_CHANGE_OVERRIDE_PROMPT_MESSAGE" = "The newly selected style \"%@\" has chosen to override the following preferences with ones that it prefers for best viewing:\n\n%@"; -"THEME_CHANGE_OVERRIDE_PROMPT_CHANNEL_FONT" = "• Channel View Font"; -"THEME_CHANGE_OVERRIDE_PROMPT_NICKNAME_FORMAT" = "• Nickname Format"; -"THEME_CHANGE_OVERRIDE_PROMPT_TIMESTAMP_FORMAT" = "• Timestamp Format"; - -"BLOWFISH_ENCRYPTION_STARTED" = "Encryption started."; -"BLOWFISH_ENCRYPTION_STOPPED" = "Encryption stopped."; -"BLOWFISH_ENCRYPTION_KEY" = "Current Encryption Key: %@"; -"BLOWFISH_ENCRYPTION_NO_KEY" = "No encryption key is set."; -"BLOWFISH_ENCRYPT_FAILED" = "Encryption of message failed. Not sending to server."; -"BLOWFISH_ENCRYPTION_KEY_CHANGED" = "Encryption key changed. Adjusting accordingly."; -"BLOWFISH_ENCRYPTION_STARTED_QUERY" = "Encryption started in query. If this query is closed, then the key must be set again."; -"BLOWFISH_KEY_EXCHANGE_QUERY_ONLY" = "Key exchange is for queries only."; -"BLOWFISH_KEY_EXCHANGE_UNKNOWN_ERROR" = "An unknown error occurred during key exchange."; -"BLOWFISH_KEY_EXCHANGE_REQUEST_SENT" = "Key exchange request has been sent to \002%@\002."; -"BLOWFISH_KEY_EXCHANGE_ALREADY_EXISTS" = "A key exchange request already exists for %@. Please wait for the current one to expire before requesting a new one."; -"BLOWFISH_KEY_EXCHANGE_TIMED_OUT" = "Key exchange request for %@ has expired."; -"BLOWFISH_KEY_EXCHANGE_RESPONSE_PENDING" = "Received key exchange request from %@. Processing …"; -"BLOWFISH_KEY_EXCHANGE_NOT_READY_YET" = "Key exchange is currently not supported."; - -"IRC_IS_RECONNECTING" = "Reconnecting …"; -"IRC_HAD_RAW_ERROR" = "Message(%1$d): %2$@"; -"IRC_USER_IS_AWAY" = "%1$@ is away (%2$@)"; -"IRC_IS_RETRYING_CONNECTION" = "Retrying …"; -"IRC_USER_WHOIS_CHANNELS" = "%1$@ is on %2$@"; -"IRC_CHANNEL_HAS_MODES" = "Mode is \002%@\002"; -"IRC_YOU_HAVE_UMODES" = "Your user mode is %@"; -"IRC_DISCONNECTED_FROM_SERVER" = "Disconnected"; -"IRC_DISCONNECTED_FROM_SLEEP" = "Disconnect for Sleep Mode"; -"IRC_DISCONNECTED_FROM_TIMEOUT" = "%i minutes have elapsed since last response from this connection. Disconnecting due to timeout."; -"IRC_CHANNEL_HAS_TOPIC" = "Topic is \002%@\002"; -"IRC_CHANNEL_PREPARING_REJOIN" = "Attempting to rejoin channel in three seconds."; -"IRC_CONNECTED_TO_SERVER" = "Connection to host completed."; -"IRC_CHANNEL_HAS_WEBSITE" = "Website is \002%@\002"; -"IRC_AWAY_COMMAND_DEFAULT_REASON" = "Be back later."; -"IRC_MDOE_SET" = "\002%1$@\002 sets mode \002%2$@\002"; -"IRC_IS_CONNECTING" = "Connecting to [%1$@] on port %2$i"; -"IRC_USER_INVITED_OTHER_USER" = "Inviting %1$@ to join %2$@"; -"IRC_RECIEVED_CTCP_REPLY" = "\002-%1$@ CTCP-\002 %2$@ %3$@"; -"IRC_RECIEVED_CTCP_REQUEST" = "\002-CTCP-\002 %1$@ from %2$@"; -"IRC_CHANNEL_HAS_TOPIC_AUTHOR" = "Set by \002%1$@\002 on %2$@"; -"IRC_USER_HAS_GOOD_LIFE" = "You are now an IRC Operator on %@"; -"IRC_USER_DISCONNECTED" = "\002%1$@\002 (%2$@@%3$@) left IRC."; -"IRC_SCRIPT_EXECUTION_FAILURE" = "Script Execution Failure: %@"; -"IRC_USER_CHANGED_NICKNAME" = "%1$@ is now known as \002%2$@\002"; -"IRC_USER_WHOIS_CONNECTED_FROM" = "%1$@ is connected on %2$@ (%3$@)"; -"IRC_WEIGHTS_COMMAND_RESULT" = "%@ - sent: %f receive: %f total: %f"; -"IRC_WEIGHTS_COMMAND_NO_RESULT" = "No information available."; -"IRC_USER_INVITED_YOU_TO" = "%1$@!%2$@@%3$@ invited you to join %4$@"; -"IRC_HAS_IGNORED_CTCP" = "\002-CTCP-\002 %1$@ from %2$@ was ignored."; -"IRC_CTCP_CLIENT_INFO" = "VERSION CLIENTINFO USERINFO PING TIME"; -"IRC_USER_WHOWAS_CONNECTED_FROM" = "%1$@ was connected to %2$@ on %3$@"; -"IRC_USER_PARTED_CHANNEL" = "\002%1$@\002 (%2$@@%3$@) left the channel."; -"IRC_RECIEVED_CTCP_PING_REPLY" = "\002-%1$@ CTCP-\002 %2$@ (%3$1.5f sec)"; -"IRC_TIMER_REQUIRES_REALINT" = "Timer command needs an interval as a number."; -"IRC_USER_JOINED_CHANNEL" = "\002%1$@\002 (%2$@@%3$@) joined the channel."; -"IRC_USER_WHOIS_HOSTMASK" = "%1$@ has userhost %2$@@%3$@ and real name \"%4$@\""; -"IRC_USER_WHOWAS_HOSTMASK" = "%1$@ had userhost %2$@@%3$@ and real name \"%4$@\""; -"IRC_USER_WHOIS_UPTIME" = "%1$@ signed on at %2$@ and has been idle for %3$@"; -"IRC_CHANNEL_TOPIC_CHANGED" = "\002%1$@\002 changed the topic to \002%2$@\002"; -"IRC_USER_KICKED_FROM_CHANNEL" = "\002%1$@\002 kicked \002%2$@\002 from the channel. (%3$@)"; - -"INPUT_TEXT_FIELD_PLACE_HOLDER" = "Send Message …"; - -"IRC_HAS_NETWORK_NAME" = "%@ IRC Network"; - -"IRC_RAW_MODE_IS_DISABLED" = "Raw mode has been disabled. Textual will no longer output raw data."; -"IRC_RAW_MODE_IS_ENABLED" = "Raw mode has been enabled. Textual will now output all data that it receives and sends to the IRC server in the Mac OS X \"Console\" application. To disable execute \"/debug raw off\""; - -"IRC_CTCP_VERSION_TITLE" = "\002Current Version:\002 %@"; -"IRC_CTCP_VERSION_INFO" = "%1$@ %2$@ (Git Reference: %3$@)"; - -"IRC_SERVER_HAD_NETSPLIT" = "Netsplit: %@"; - -"IRC_CAP_CURRENTLY_ENABLED" = "The following capabilities are currently enabled: %@"; -"IRC_CAP_CURRENTLY_ENABLED_NONE" = "There is no capability enabled."; - -"LIST_DIALOG_HAS_CHANNELS" = "%i Public Channels"; -"LIST_DIALOG_HAS_SEARCH_RESULTS" = "%1$i Public Channels - %2$i Search Results"; - -"LAG_CHECK_REQUEST_SENT_MESSAGE" = "Waiting for response from lag check …"; -"LAG_CHECK_REQUEST_REPLY_MESSAGE" = "Received lag check reply from %@. Time elapsed: %1.5f seconds."; -"LAG_CHECK_REQUEST_UNKNOWN_REPLY_MESSAGE" = "Received lag check reply even though we never sent a request for one. Exploit attempt?"; - -"INVITE_SHEET_TWO_PEOPLE" = "%1$@ and %2$@"; -"INVITE_SHEET_MULTIPLE_PEOPLE" = "%d users"; -"INVITE_SHEET_TARGET_DESC" = "Invite %@ to:"; - -"ABOUT_WINDOW_BUILD_NUMBER" = "Version %@"; - -"CHANNEL_LIST_NETWORK_NAME" = "Channel List for \"%@\""; - -"USER_TRACKING_HOSTMASK_CONNECTED" = "User with hostmask \"%1$@\" matching Address Book entry \"%2$@\" connected."; // ircop -"USER_TRACKING_NICKNAME_AVAILABLE" = "User with nickname \"%1$@\" matching Address Book entry \"%2$@\" is available."; // normal user -"USER_TRACKING_HOSTMASK_NOW_AVAILABLE" = "User with hostmask \"%1$@\" matching Address Book entry \"%2$@\" has become available."; // normal user -"USER_TRACKING_NICKNAME_NOW_AVAILABLE" = "User with nickname \"%1$@\" matching Address Book entry \"%2$@\" has become available."; // normal user -"USER_TRACKING_HOSTMASK_NO_LONGER_AVAILABLE" = "User with hostmask \"%1$@\" matching Address Book entry \"%2$@\" is no longer available."; // normal user -"USER_TRACKING_NICKNAME_NO_LONGER_AVAILABLE" = "User with nickname \"%1$@\" matching Address Book entry \"%2$@\" is no longer available."; // normal user - -"TIME_CONVERT_SECOND" = "Second"; -"TIME_CONVERT_MINUTE" = "Minute"; -"TIME_CONVERT_HOUR" = "Hour"; -"TIME_CONVERT_DAY" = "Day"; -"TIME_CONVERT_WEEK" = "Week"; -"TIME_CONVERT_MONTH" = "Month"; -"TIME_CONVERT_YEAR" = "Year"; - -"TIME_CONVERT_SECOND_PLURAL" = "Seconds"; -"TIME_CONVERT_MINUTE_PLURAL" = "Minutes"; -"TIME_CONVERT_HOUR_PLURAL" = "Hours"; -"TIME_CONVERT_DAY_PLURAL" = "Days"; -"TIME_CONVERT_WEEK_PLURAL" = "Weeks"; -"TIME_CONVERT_MONTH_PLURAL" = "Months"; -"TIME_CONVERT_YEAR_PLURAL" = "Years"; - -"ACCESSIBILITY_MEMBER_LIST_DESCRIPTION" = "User %@ selected in member list of channel pound %@."; - -"NOTIFICATION_ADDRESS_BOOK_MATCH" = "Address Book Notification"; -"NOTIFICATION_CHANNEL_NOTICE" = "Channel Notice"; -"NOTIFICATION_NEW_TALK" = "Private Message (new)"; -"NOTIFICATION_CHANNEL_MSG" = "Channel Message"; -"NOTIFICATION_TALK_NOTICE" = "Private Notice"; -"NOTIFICATION_TALK_MSG" = "Private Message"; -"NOTIFICATION_DISCONNECT" = "Disconnected"; -"NOTIFICATION_HIGHLIGHT" = "Highlight"; -"NOTIFICATION_INVITED" = "Channel Invitation"; -"NOTIFICATION_LOGIN" = "Connected"; -"NOTIFICATION_KICKED" = "Kicked from Channel"; - -"CMDWKEY_SHORTCUT_LEAVE_QUERY" = "Close Query"; -"CMDWKEY_SHORTCUT_CLOSE_WINDOW" = "Close Window"; -"CMDWKEY_SHORTCUT_PART_CHANNEL" = "Leave Channel"; -"CMDWKEY_SHORTCUT_DISCONNECT" = "Disconnect from %@"; -"CMDWKEY_SHORTCUT_QUIT_APPLICATION" = "Quit Textual & IRC"; - -"SERVER_SHEET_NAVIGATION_LIST_GENERAL" = "General"; -"SERVER_SHEET_NAVIGATION_LIST_IDENTITY" = "Identity"; -"SERVER_SHEET_NAVIGATION_LIST_MESSAGES" = "Messages"; -"SERVER_SHEET_NAVIGATION_LIST_ENCODING" = "Encoding"; -"SERVER_SHEET_NAVIGATION_LIST_AUTOJOIN" = "Autojoin"; -"SERVER_SHEET_NAVIGATION_LIST_IGNORES" = "Address Book"; -"SERVER_SHEET_NAVIGATION_LIST_COMMANDS" = "Connect Commands"; -"SERVER_SHEET_NAVIGATION_LIST_PROXY" = "Proxy Server"; -"SERVER_SHEET_NAVIGATION_LIST_FLOODC" = "Flood Control"; -"SERVER_SHEET_NAVIGATION_LIST_MISC" = "Miscellaneous"; - -"ADDRESS_BOOK_ENTRY_IGNORE_TYPE" = "User Ignore"; -"ADDRESS_BOOK_EMTRY_TRACKING_TYPE" = "User Tracking"; - -"NOTIFICATION_MSG_LOGIN" = "Connected"; -"NOTIFICATION_MSG_LOGIN_TITLE" = "Connected: %@"; -"NOTIFICATION_MSG_DISCONNECT" = "Disconnected"; -"NOTIFICATION_MSG_DISCONNECT_TITLE" = "Disconnected: %@"; -"NOTIFICATION_MSG_INVITED" = "Invited to channel"; -"NOTIFICATION_MSG_INVITED_TITLE" = "Invited: %@"; -"NOTIFICATION_MSG_INVITED_DESC" = "%1$@ has invited you to %2$@"; -"NOTIFICATION_MSG_TALK_MSG" = "Private message received"; -"NOTIFICATION_MSG_TALK_MSG_TITLE" = "Private Message"; -"NOTIFICATION_MSG_KICKED" = "Kicked out from channel"; -"NOTIFICATION_MSG_KICKED_TITLE" = "Kicked: %@"; -"NOTIFICATION_MSG_KICKED_DESC" = "%1$@ has kicked you out: %2$@"; -"NOTIFICATION_MSG_TALK_NOTICE" = "Private notice received"; -"NOTIFICATION_MSG_TALK_NOTICE_TITLE" = "Private Notice"; -"NOTIFICATION_MSG_HIGHLIGHT" = "Highlight message received"; -"NOTIFICATION_MSG_HIGHLIGHT_TITLE" = "Highlight: %@"; -"NOTIFICATION_MSG_NEW_TALK" = "New private message started"; -"NOTIFICATION_MSG_NEW_TALK_TITLE" = "New Private Message"; -"NOTIFICATION_MSG_CHANNEL_MSG" = "Channel message received"; -"NOTIFICATION_MSG_CHANNEL_NOTICE" = "Channel notice received"; -"NOTIFICATION_MSG_CHANNEL_NOTICE_TITLE" = "Notice: %@"; -"NOTIFICATION_MSG_ADDRESS_BOOK_MATCH_TITLE" = "Address Book Notification"; - -"ALL_DOMAIN_EXTENSIONS" = "(?:ac|ad|aero|ae|af|ag|ai|al|am|an|ao|aq|arpa|ar|asia|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|biz|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|cat|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|coop|com|co|cr|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|info|int|in|io|iq|ir|is|it|je|jm|jobs|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mil|mk|ml|mm|mn|mobi|mo|mp|mq|mr|ms|mt|museum|mu|mv|mw|mx|my|mz|name|na|nc|net|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pro|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tel|tf|tg|th|tj|tk|tl|tm|tn|to|tp|travel|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|xn--0zwm56d|xn--11b5bs3a9aj6g|xn--80akhbyknj4f|xn--9t4b11yi5a|xn--deba0ad|xn--g6w251d|xn--hgbk6aj7f53bba|xn--hlcj6aya9esc7a|xn--jxalpdlp|xn--kgbechtv|xn--zckzah|ye|yt|yu|za|zm|zw)"; +"YesButton" = "Yes"; diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 598a6dd5c6..d4f56f6e3f 100755 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -2,13 +2,13 @@ 1070 - 12A206j - 2507 - 1172.1 - 613.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 2507 + 2541 NSBox @@ -1491,13 +1491,13 @@ _NSMainMenu - MasterController + TXMasterController - MenuController + TXMenuController - IRCTextFormatterMenu + TVCTextFormatterMenu IRC Formatting @@ -3019,7 +3019,7 @@ {{874, 449}, {652, 551}} 1886912512 Textual - MainWindow + TVCMainWindow View @@ -3438,7 +3438,7 @@ WebURLsWithTitlesPboardType public.url - {612, 17} + {612, 26} _NS:3760 @@ -3461,7 +3461,7 @@ 1 - 67153543 + 100707975 0 @@ -3494,7 +3494,6 @@ 6 {612, 10000000} - {218, 17} @@ -3882,939 +3881,939 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - onServerProperties: + processNavigationItem: - + - 351 + 1578 - onConnect: + processNavigationItem: - + - 352 + 1579 - onDisconnect: + processNavigationItem: - + - 353 + 1580 - onJoin: + processNavigationItem: - + - 354 + 1581 - onLeave: + processNavigationItem: - + - 355 + 1582 - onAddServer: + processNavigationItem: - + - 356 + 1583 - onCopyServer: + processNavigationItem: - + - 357 + 1584 - onDeleteServer: + processNavigationItem: - + - 358 + 1585 - onAddChannel: + processNavigationItem: - + - 359 + 1586 - onAddChannel: + processNavigationItem: - + - 360 + 1587 - onDeleteChannel: + processNavigationItem: - + - 361 + 1592 - onMemberWhois: + processNavigationItem: - + - 363 + 1593 - onMemberTalk: + openHelpMenuLinkItem: - + - 364 + 1668 - onAddServer: + openHelpMenuLinkItem: - + - 370 + 1690 - onSearchWeb: + openHelpMenuLinkItem: - + - 396 + 1692 - onSearchWeb: + openHelpMenuLinkItem: - + - 400 + 1694 - onCancelReconnecting: + openHelpMenuLinkItem: - + - 407 + 1696 - onNick: + openHelpMenuLinkItem: - + - 408 + 1711 - onNick: + openHelpMenuLinkItem: - + - 409 + 1718 - onPreferences: + commandWShortcutUsed: - + - 413 + 1771 - onCopyUrl: + showHighlightSheet: - + - 430 + 2272 - onMemberPing: + toggleDeveloperMode: - + - 444 + 2281 - onMemberTime: + onNextHighlight: - + - 445 + 2303 - onMemberVersion: + onPreviousHighlight: - + - 446 + 2304 - onMemberUserInfo: + centerMainWindow: - + - 447 + 2554 - onMemberClientInfo: + toggleFullscreenMode: - + - 448 + 2555 - onChannelList: + showAcknowledgments: - + - 494 + 2556 - onJoinChannel: + showContributors: - + - 967 + 2557 - onMemberInvite: + showChannelInviteExceptionList: - + - 1004 + 2558 - onWantChannelListSorted: + showChannelInviteExceptionList: - + - 1307 + 2559 - onWantMainWindowShown: + showChannelBanExceptionList: - + - 1311 + 2560 - onWantIgnoreListShown: + showChannelBanExceptionList: - + - 1312 + 2561 - onWantAboutWindowShown: + showChannelBanList: - + - 1313 + 2562 - onMemberDeOp: + showChannelBanList: - + - 1338 + 2563 - onMemberDeVoice: + showFindPanel: - + - 1339 + 2564 - onMemberDeHalfOp: + showFindPanel: - + - 1341 + 2565 - onMemberHalfOp: + showFindPanel: - + - 1342 + 2566 - onMemberOp: + showSetVhostPrompt: - + - 1343 + 2567 - onMemberVoice: + connectToTextualHelpChannel: - + - 1344 + 2568 - onMemberBanKick: + openChannelLogs: - + - 1346 + 2569 - onMemberGline: + openChannelLogs: - + - 1347 + 2570 - onMemberKill: + openChannelLogs: - + - 1348 + 2571 - onMemberShun: + openChannelLogs: - + - 1349 + 2572 - onMemberKick: + openChannelLogs: - + - 1351 + 2573 - onMemberBan: + openLogLocation: - + - 1352 + 2574 - onWantToReadTextualLogs: + showAboutWindow: - + - 1380 + 2575 - onWantTextualConnnectToHelp: + showChannelIgnoreList: - + - 1394 + 2576 - onWantHostServVhostSet: + showChannelIgnoreList: - + - 1412 + 2577 - onWantIgnoreListShown: + showMainWindow: - + - 1452 + 2578 - onWantFindPanel: + sortChannelListNames: - + - 1463 + 2579 - onWantFindPanel: + toggleChannelModerationMode: - + - 1464 + 2580 - onWantFindPanel: + toggleChannelModerationMode: - + - 1465 + 2581 - onWantToReadChannelLogs: + toggleChannelModerationMode: - + - 1495 + 2582 - onMode: + toggleChannelModerationMode: - + - 1508 + 2583 - onTopic: + toggleChannelInviteMode: - + - 1509 + 2584 - onWantToReadChannelLogs: + toggleChannelInviteMode: - + - 1510 + 2585 - onChannelProperties: + toggleChannelInviteMode: - + - 1511 + 2586 - onWantChannelBanList: + toggleChannelInviteMode: - + - 1512 + 2587 - onWantToReadChannelLogs: + showPreferencesDialog: - + - 1516 + 2588 - onWantMainWindowCentered: + performPaste: - + - 1525 + 2589 - processNavigationItem: + performPaste: - + - 1578 + 2590 - processNavigationItem: + searchGoogle: - + - 1579 + 2591 - processNavigationItem: + searchGoogle: - + - 1580 + 2592 - processNavigationItem: + markScrollback: - + - 1581 + 2593 - processNavigationItem: + clearScrollback: - + - 1582 + 2594 - processNavigationItem: + gotoScrollbackMarker: - + - 1583 + 2595 - processNavigationItem: + markAllAsRead: - + - 1584 + 2596 - processNavigationItem: + increaseLogFontSize: - + - 1585 + 2597 - processNavigationItem: + decreaseLogFontSize: - + - 1586 + 2598 - processNavigationItem: + connect: - + - 1587 + 2599 - processNavigationItem: + disconnect: - + - 1592 + 2600 - processNavigationItem: + cancelReconnection: - + - 1593 + 2601 - openHelpMenuLinkItem: + showNicknameChangeDialog: - + - 1668 + 2602 - onWantChannelBanExceptionList: + showNicknameChangeDialog: - + - 1684 + 2603 - openHelpMenuLinkItem: + showServerChannelList: - + - 1690 + 2604 - openHelpMenuLinkItem: + addServer: - + - 1692 + 2605 - openHelpMenuLinkItem: + addServer: - + - 1694 + 2606 - openHelpMenuLinkItem: + copyServer: - + - 1696 + 2607 - openHelpMenuLinkItem: + deleteServer: - + - 1711 + 2608 - openHelpMenuLinkItem: + showServerPropertiesDialog: - + - 1718 + 2609 - onWantChannelModerated: + joinChannel: - + - 1727 + 2610 - onWantChannelModerated: + joinChannel: - + - 1728 + 2611 - onWantChannelVoiceOnly: + leaveChannel: - + - 1729 + 2612 - onWantChannelVoiceOnly: + leaveChannel: - + - 1730 + 2613 - commandWShortcutUsed: + showChannelTopicDialog: - + - 1771 + 2614 - wantsFullScreenModeToggled: + showChannelTopicDialog: - + - 1791 + 2615 - onShowAcknowledgments: + showChannelModeDialog: - + - 1797 + 2616 - onWantChannelBanList: + showChannelModeDialog: - + - 1903 + 2617 - onWantChannelModerated: + addChannel: - + - 1904 + 2618 - onDeleteChannel: + addChannel: - + - 1905 + 2619 - onAddChannel: + addChannel: - 1906 + 2620 - onMode: + deleteChannel: - + - 1907 + 2621 - onChannelProperties: + deleteChannel: - + - 1908 + 2622 - onTopic: + showChannelPropertiesDialog: - + - 1909 + 2623 - onWantChannelModerated: + showChannelPropertiesDialog: - + - 1910 + 2624 - onJoin: + memberSendWhois: - + - 1911 + 2625 - onWantChannelBanExceptionList: + memberStartQuery: - + - 1912 + 2626 - onWantToReadChannelLogs: + memberSendInvite: - + - 1913 + 2627 - onWantChannelVoiceOnly: + memberSendCTCPPing: - + - 1914 + 2628 - onWantToReadChannelLogs: + memberSendCTCPTime: - + - 1915 + 2629 - onLeave: + memberSendCTCPVersion: - + - 1916 + 2630 - onWantChannelVoiceOnly: + memberSendCTCPUserinfo: - + - 1917 + 2631 - onMarkAllAsRead: + memberSendCTCPClientInfo: - + - 1925 + 2632 - onIncreaseFontSize: + memberModeChangeOp: - + - 1926 + 2633 - onMarkScrollback: + memberModeChangeDeop: - + - 1927 + 2634 - onDecreaseFontSize: + memberModeChangeHalfop: - + - 1928 + 2635 - onWantChannelInviteExceptionList: + memberModeChangeDehalfop: - + - 2032 + 2636 - onWantChannelInviteExceptionList: + memberModeChangeVoice: - + - 2034 + 2637 - showHighlightSheet: + memberModeChangeDevoice: - + - 2272 + 2638 - toggleDeveloperMode: + memberKickFromChannel: - + - 2281 + 2639 - onPaste: + memberBanFromServer: - + - 2290 + 2640 - onPaste: + memberKickbanFromChannel: - + - 2291 + 2641 - onShowContributors: + memberKillFromServer: - + - 2298 + 2642 - onClearScrollback: + memberGlineFromServer: - + - 2301 + 2643 - onNextHighlight: + memberShunFromServer: - + - 2303 + 2644 - onPreviousHighlight: + copyUrl: - + - 2304 + 2645 - onGotoScrollbackMark: + joinChannel: - + - 2308 + 2646 @@ -7386,26 +7385,26 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin {{755, 524}, {632, 501}} - ThinSplitView + TVCThinSplitView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ServerList + TVCServerList com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ServerListCell + TVCServerListCell com.apple.InterfaceBuilder.CocoaPlugin - ThinSplitView + TVCThinSplitView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - MemberList + TVCMemberList com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - MemberListCell + TVCMemberListCell com.apple.InterfaceBuilder.CocoaPlugin AccessibilityDescription @@ -7424,11 +7423,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - InputTextFieldScroller + TVCInputTextFieldScroller com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - InputTextField + TVCInputTextField com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -7553,219 +7552,10 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 2553 + 2646 - - IRCTextFormatterMenu - NSObject - - IBProjectSource - ./Classes/IRCTextFormatterMenu.h - - - - InputTextField - TextField - - IBProjectSource - ./Classes/InputTextField.h - - - - InputTextFieldScroller - NSScrollView - - IBProjectSource - ./Classes/InputTextFieldScroller.h - - - - ListView - NSTableView - - IBProjectSource - ./Classes/ListView.h - - - - MainWindow - NSWindow - - IBProjectSource - ./Classes/MainWindow.h - - - - MasterController - NSObject - - NSButton - NSMenu - NSMenu - NSMenuItem - IRCTextFormatterMenu - NSBox - NSMenu - MemberList - NSMenu - ThinSplitView - MenuController - ServerList - NSMenuItem - ThinSplitView - InputTextField - NSMenu - NSMenu - MainWindow - - - - addServerButton - NSButton - - - addrMenu - NSMenu - - - chanMenu - NSMenu - - - channelMenu - NSMenuItem - - - formattingMenu - IRCTextFormatterMenu - - - logBase - NSBox - - - logMenu - NSMenu - - - memberList - MemberList - - - memberMenu - NSMenu - - - memberSplitView - ThinSplitView - - - menu - MenuController - - - serverList - ServerList - - - serverMenu - NSMenuItem - - - serverSplitView - ThinSplitView - - - text - InputTextField - - - treeMenu - NSMenu - - - urlMenu - NSMenu - - - window - MainWindow - - - - IBProjectSource - ./Classes/MasterController.h - - - - MemberList - ListView - - IBProjectSource - ./Classes/MemberList.h - - - - MemberListCell - NSTextFieldCell - - IBProjectSource - ./Classes/MemberListCell.h - - - - MenuController - NSObject - - closeWindowItem - NSMenuItem - - - closeWindowItem - - closeWindowItem - NSMenuItem - - - - IBProjectSource - ./Classes/MenuController.h - - - - ServerList - NSOutlineView - - IBProjectSource - ./Classes/ServerList.h - - - - ServerListCell - NSTextFieldCell - - IBProjectSource - ./Classes/ServerListCell.h - - - - TextField - NSTextView - - IBProjectSource - ./Classes/TextField.h - - - - ThinSplitView - NSSplitView - - IBProjectSource - ./Classes/ThinSplitView.h - - WebView diff --git a/English.lproj/AboutPanel.xib b/English.lproj/TDCAboutPanel.xib similarity index 81% rename from English.lproj/AboutPanel.xib rename to English.lproj/TDCAboutPanel.xib index 9fd3e4d3d3..9bba42dbd0 100755 --- a/English.lproj/AboutPanel.xib +++ b/English.lproj/TDCAboutPanel.xib @@ -2,39 +2,36 @@ 1060 - 11A459e - 1565 - 1121.2 - 557.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1565 + 2541 YES + NSCustomObject + NSImageCell + NSImageView NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextFieldCell - NSImageCell - NSImageView - NSCustomObject YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES - AboutPanel + TDCAboutPanel FirstResponder @@ -52,7 +49,7 @@ - + 256 YES @@ -73,11 +70,10 @@ {{72, 79}, {60, 60}} - YES - 130560 + 134217728 33554432 NSImage @@ -88,6 +84,7 @@ 0 YES + NO YES @@ -95,11 +92,10 @@ 268 {{73, 42}, {58, 18}} - YES - 68288064 + 68157504 272630784 Textual @@ -127,17 +123,16 @@ + NO 268 {{17, 20}, {167, 14}} - - YES - 70385217 + 70254657 138413056 Version 1.0.0 (Build #2335) @@ -149,11 +144,10 @@ + NO {201, 159} - - {{0, 0}, {1920, 1178}} @@ -186,7 +180,9 @@ YES 0 - + + YES + @@ -276,42 +272,34 @@ YES YES - 1.IBEditorWindowLastContentRect + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency 1.IBPluginDependency 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect 2.IBPluginDependency - 3.IBViewBoundsToFrameTransform + 3.IBPluginDependency + 4.IBPluginDependency 5.IBPluginDependency - 5.IBViewBoundsToFrameTransform 6.IBPluginDependency 7.IBPluginDependency - 7.IBViewBoundsToFrameTransform 8.IBPluginDependency - + YES - {{680, 660}, {201, 159}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{680, 660}, {201, 159}} - {196, 240} - {{202, 428}, {480, 270}} com.apple.InterfaceBuilder.CocoaPlugin - - AUIEAABDNAAAA - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABDJQAAw2kAAA - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABC2gAAw08AAA - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -329,30 +317,7 @@ 23 - - - YES - - AboutPanel - NSWindowController - - versionInfo - NSTextField - - - versionInfo - - versionInfo - NSTextField - - - - IBProjectSource - ./Classes/AboutPanel.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/AddressBookSheet.xib b/English.lproj/TDCAddressBookSheet.xib similarity index 87% rename from English.lproj/AddressBookSheet.xib rename to English.lproj/TDCAddressBookSheet.xib index c6d352c5b5..497a141106 100755 --- a/English.lproj/AddressBookSheet.xib +++ b/English.lproj/TDCAddressBookSheet.xib @@ -2,24 +2,24 @@ 1050 - 11C74 - 1938 - 1138.23 - 567.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 2541 YES - NSTextField - NSView - NSWindowTemplate NSBox - NSCustomObject - NSButtonCell NSButton + NSButtonCell + NSCustomObject + NSTextField NSTextFieldCell + NSView + NSWindowTemplate YES @@ -32,7 +32,7 @@ YES - AddressBookSheet + TDCAddressBookSheet FirstResponder @@ -55,7 +55,7 @@ {213, 107} - + 256 YES @@ -64,11 +64,10 @@ 268 {{12, 398}, {71, 17}} - YES - 68288064 + 68157504 272630784 Hostmask: @@ -96,17 +95,17 @@ + NO 268 {{88, 396}, {261, 22}} - YES - -1804468671 + -1804599231 272630784 @@ -129,17 +128,17 @@ + NO 268 {{82, 367}, {254, 14}} - YES - 70385217 + 70254657 272630784 nickname!username@userhost @@ -159,17 +158,17 @@ + NO 268 {{36, 367}, {43, 14}} - YES - 68288064 + 68157504 272630784 Syntax: @@ -181,17 +180,17 @@ + NO 268 {{23, 351}, {59, 14}} - YES - 68288064 + 68157504 272630784 Examples: @@ -199,17 +198,17 @@ + NO 268 {{84, 351}, {256, 14}} - YES - 70385217 + 70254657 272630784 *!*@* (matches everyone — not recommended) @@ -217,17 +216,17 @@ + NO 268 {{84, 338}, {262, 14}} - YES - 70385217 + 70254657 272630784 fre*!*@* (matches nicknames starting with "fre") @@ -235,17 +234,17 @@ + NO 268 {{84, 325}, {221, 14}} - YES - 70385217 + 70254657 272630784 *!matt@* (matches the username "matt") @@ -253,17 +252,17 @@ + NO 268 {{84, 312}, {262, 14}} - YES - 70385217 + 70254657 272630784 *!*@*.info (matches everyone on a .info domain) @@ -271,17 +270,17 @@ + NO 12 {{17, 291}, {334, 5}} - {0, 0} - 67239424 + 67108864 0 Box @@ -301,16 +300,15 @@ 268 {{18, 108}, {69, 18}} - YES - -2080244224 + -2080374784 0 Notices - 1211912703 + 1211912448 2 NSImage @@ -324,22 +322,22 @@ 200 25 + NO 268 {{18, 78}, {267, 18}} - YES - -2080244224 + -2080374784 0 General Events: Join, Part, Quit, etc. - 1211912703 + 1211912448 2 @@ -348,22 +346,22 @@ 200 25 + NO 268 {{18, 168}, {194, 18}} - YES - -2080244224 + -2080374784 0 Highlights in Queries (PM) - 1211912703 + 1211912448 2 @@ -372,22 +370,22 @@ 200 25 + NO 268 {{18, 138}, {179, 18}} - YES - -2080244224 + -2080374784 0 CTCP Requests & Replies - 1211912703 + 1211912448 2 @@ -396,22 +394,22 @@ 200 25 + NO 268 {{17, 198}, {199, 18}} - YES - -2080244224 + -2080374784 0 Highlights in Channels - 1211912703 + 1211912448 2 @@ -420,22 +418,22 @@ 200 25 + NO 268 {{17, 228}, {130, 18}} - YES - -2080244224 + -2080374784 0 Private Messages - 1211912703 + 1211912448 2 @@ -444,22 +442,22 @@ 200 25 + NO 268 {{17, 258}, {125, 18}} - YES - -2080244224 + -2080374784 0 Public Messages - 1211912703 + 1211912448 2 @@ -468,17 +466,17 @@ 200 25 + NO 12 {{17, 58}, {334, 5}} - {0, 0} - 67239424 + 67108864 0 Box @@ -498,16 +496,15 @@ 256 {{190, 12}, {83, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -515,21 +512,21 @@ 200 25 + NO 256 {{273, 12}, {82, 32}} - YES - 67239424 + 67108864 134217728 Save - -2038284033 + -2038284288 1 LucidaGrande @@ -541,11 +538,10 @@ 200 25 + NO {369, 438} - - {{0, 0}, {1920, 1178}} @@ -580,7 +576,7 @@ YES - 68288064 + 68157504 272630784 Nickname: @@ -588,6 +584,7 @@ + NO @@ -597,7 +594,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -607,6 +604,7 @@ + NO @@ -616,7 +614,7 @@ {0, 0} - 67239424 + 67108864 0 Box @@ -639,7 +637,7 @@ {0, 0} - 67239424 + 67108864 0 Box @@ -662,12 +660,12 @@ YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -675,6 +673,7 @@ 200 25 + NO @@ -683,12 +682,12 @@ YES - 67239424 + 67108864 134217728 OK - -2038284033 + -2038284288 1 @@ -696,6 +695,7 @@ 200 25 + NO @@ -705,12 +705,12 @@ YES - 67239424 + 67108864 0 Display message when user becomes available - 1211912703 + 1211912448 2 @@ -719,6 +719,7 @@ 200 25 + NO @@ -728,7 +729,7 @@ {0, 0} - 67239424 + 67108864 0 Box @@ -751,7 +752,7 @@ YES - 69336577 + 69206017 272629760 Textual monitors Join, Part, and Quit activity on channels in which you are present to establish the activity pattern of someone that you would like to track. On servers which supports it, Textual will also use commands such as ISON to check for the user you specify, even if you are not in the same channel. @@ -759,6 +760,7 @@ + NO @@ -769,7 +771,7 @@ _NS:3937 YES - 68288064 + 68157504 272630784 Info: @@ -778,6 +780,7 @@ + NO @@ -788,7 +791,7 @@ _NS:3937 YES - 68288064 + 68157504 272630784 ISON @@ -797,6 +800,7 @@ + NO {369, 290} @@ -1532,7 +1536,7 @@ 6.IBPluginDependency 6.IBUserGuides - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1622,168 +1626,7 @@ 597 - - - YES - - AddressBookSheet - SheetBase - - YES - - YES - hostmask - ignoreCTCP - ignoreHighlights - ignoreJPQE - ignoreNotices - ignorePMHighlights - ignorePrivateMsg - ignorePublicMsg - ignoreWindow - nickname - notifyJoins - notifyWindow - - - YES - NSTextField - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSButton - NSWindow - NSTextField - NSButton - NSWindow - - - - YES - - YES - hostmask - ignoreCTCP - ignoreHighlights - ignoreJPQE - ignoreNotices - ignorePMHighlights - ignorePrivateMsg - ignorePublicMsg - ignoreWindow - nickname - notifyJoins - notifyWindow - - - YES - - hostmask - NSTextField - - - ignoreCTCP - NSButton - - - ignoreHighlights - NSButton - - - ignoreJPQE - NSButton - - - ignoreNotices - NSButton - - - ignorePMHighlights - NSButton - - - ignorePrivateMsg - NSButton - - - ignorePublicMsg - NSButton - - - ignoreWindow - NSWindow - - - nickname - NSTextField - - - notifyJoins - NSButton - - - notifyWindow - NSWindow - - - - - IBProjectSource - ./Classes/AddressBookSheet.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/HighlightSheet.xib b/English.lproj/TDCHighlightSheet.xib similarity index 85% rename from English.lproj/HighlightSheet.xib rename to English.lproj/TDCHighlightSheet.xib index d1353d02af..5681a69c66 100755 --- a/English.lproj/HighlightSheet.xib +++ b/English.lproj/TDCHighlightSheet.xib @@ -2,28 +2,28 @@ 1050 - 12A128p - 2427 - 1157.7 - 599.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 2427 + 2541 YES - NSScroller - NSTableHeaderView NSButton - NSScrollView NSButtonCell - NSTextFieldCell - NSTableView NSCustomObject + NSScrollView + NSScroller + NSTableColumn + NSTableHeaderView + NSTableView + NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextField - NSTableColumn YES @@ -36,7 +36,7 @@ YES - HighlightSheet + TDCHighlightSheet FirstResponder @@ -55,7 +55,7 @@ {778, 350} - + 256 YES @@ -74,15 +74,15 @@ 256 {791, 246} - - + YES + NO + YES 256 {791, 17} - @@ -100,7 +100,7 @@ 40 1000 - 75545152 + 75497536 2048 Channel Name @@ -123,7 +123,7 @@ - 67156544 + 67108928 2048 Text Cell @@ -158,7 +158,7 @@ 10 3.4028234663852886e+38 - 75545152 + 75497536 2048 Message @@ -174,7 +174,7 @@ - 67156544 + 67108928 2048 Text Cell @@ -193,7 +193,7 @@ 10 3.4028234663852886e+38 - 75545152 + 75497536 2048 Time @@ -201,7 +201,7 @@ - 67156544 + 67108928 2048 Text Cell @@ -253,7 +253,6 @@ {{1, 17}, {791, 246}} - @@ -264,8 +263,8 @@ -2147483392 {{764, 17}, {15, 229.52600000000001}} - + NO _doScroller: 0.99595141700404854 @@ -275,8 +274,8 @@ -2147483392 {{1, 249}, {893, 15}} - + NO 1 _doScroller: @@ -291,7 +290,6 @@ {{1, 0}, {791, 17}} - @@ -300,8 +298,7 @@ {{-1, 44}, {793, 264}} - - + 133682 @@ -317,7 +314,6 @@ 289 {{581, 5}, {111, 32}} - YES @@ -333,14 +329,13 @@ 200 25 + NO 289 {{692, 5}, {85, 32}} - - YES 67108864 @@ -355,17 +350,17 @@ 200 25 + NO 268 {{17, 320}, {486, 17}} - YES - 68205120 + 68157504 272630784 Highlight List for "%@" @@ -382,18 +377,18 @@ + NO 294 {{17, 15}, {357, 17}} - _NS:3937 YES - 68205120 + 68157504 272630784 Messages starting with a bullet (•) respresent an action. @@ -402,11 +397,10 @@ + NO {791, 350} - - {{0, 0}, {2560, 1418}} @@ -731,7 +725,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -759,106 +753,7 @@ 281 - - - YES - - HighlightSheet - SheetBase - - YES - - YES - header - table - - - YES - NSTextField - ListView - - - - YES - - YES - header - table - - - YES - - header - NSTextField - - - table - ListView - - - - - IBProjectSource - ./Classes/HighlightSheet.h - - - - ListView - NSTableView - - IBProjectSource - ./Classes/ListView.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/InviteSheet.xib b/English.lproj/TDCInviteSheet.xib similarity index 80% rename from English.lproj/InviteSheet.xib rename to English.lproj/TDCInviteSheet.xib index 1afcfeb710..53508d48cb 100755 --- a/English.lproj/InviteSheet.xib +++ b/English.lproj/TDCInviteSheet.xib @@ -2,13 +2,13 @@ 1050 - 12A206j - 2507 - 1172.1 - 613.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 2507 + 2541 YES @@ -34,7 +34,7 @@ YES - InviteSheet + TDCInviteSheet FirstResponder @@ -57,7 +57,7 @@ {213, 107} - + 256 YES @@ -66,7 +66,6 @@ 256 {{196, 12}, {90, 32}} - YES 67108864 @@ -93,7 +92,6 @@ 256 {{106, 12}, {90, 32}} - YES 67108864 @@ -116,7 +114,6 @@ 268 {{57, 56}, {186, 26}} - YES -2076180416 @@ -151,7 +148,6 @@ 268 {{17, 97}, {266, 17}} - YES 67108928 @@ -182,8 +178,6 @@ {300, 134} - - {{0, 0}, {1920, 1178}} {213, 129} @@ -417,98 +411,7 @@ 42 - - - YES - - InviteSheet - SheetBase - - YES - - YES - channelPopup - titleLabel - - - YES - NSPopUpButton - NSTextField - - - - YES - - YES - channelPopup - titleLabel - - - YES - - channelPopup - NSPopUpButton - - - titleLabel - NSTextField - - - - - IBProjectSource - ./Classes/InviteSheet.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/ListDialog.xib b/English.lproj/TDCListDialog.xib similarity index 87% rename from English.lproj/ListDialog.xib rename to English.lproj/TDCListDialog.xib index fa286ac9cd..dcc6a41861 100755 --- a/English.lproj/ListDialog.xib +++ b/English.lproj/TDCListDialog.xib @@ -2,46 +2,43 @@ 1050 - 11C26 - 1617 - 1138.11 - 566.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 2541 YES - NSScroller - NSTableHeaderView NSButton - NSScrollView - NSTextFieldCell NSButtonCell + NSCustomObject + NSScrollView + NSScroller NSSearchField - NSTableView NSSearchFieldCell - NSCustomObject - NSView - NSWindowTemplate NSTableColumn + NSTableHeaderView + NSTableView NSTextField + NSTextFieldCell + NSView + NSWindowTemplate YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES - ListDialog + TDCListDialog FirstResponder @@ -62,7 +59,7 @@ {788, 480} - + 256 YES @@ -81,15 +78,15 @@ 256 {818, 380} - - + YES + NO + YES 256 {818, 17} - @@ -107,7 +104,7 @@ 40 1000 - 75628096 + 75497536 2048 Channel Name @@ -130,7 +127,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -165,7 +162,7 @@ 40 1000 - 75628096 + 75497536 2048 Member Count @@ -173,7 +170,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -191,7 +188,7 @@ 10 3.4028234663852886e+38 - 75628096 + 75497536 2048 Topic @@ -207,7 +204,7 @@ - 337772096 + 337641536 1073743872 Text Cell @@ -246,7 +243,6 @@ {{1, 17}, {788, 380}} - @@ -257,8 +253,8 @@ -2147483392 {{773, 17}, {15, 356.81599999999997}} - + NO _doScroller: 0.94274806976318359 @@ -268,9 +264,9 @@ 256 {{1, 382}, {788, 15}} - YES + NO 1 _doScroller: @@ -285,7 +281,6 @@ {{1, 0}, {788, 17}} - @@ -294,69 +289,69 @@ {{-1, 47}, {790, 398}} - - + 133810 QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 289 {{685, 6}, {96, 32}} - - YES - 67239424 + 67108864 134217728 Close - -2038284033 + -2038284288 129 Gw 200 25 + NO 289 {{574, 6}, {111, 32}} - YES - 67239424 + 67108864 134217728 Update List - -2038284033 + -2038284288 129 200 25 + NO 265 {{609, 451}, {166, 19}} - YES - 343014976 + 342884416 268567552 @@ -371,20 +366,20 @@ - 130560 + 0 0 search _searchFieldSearch: - 138690815 + 138690560 0 400 75 - 130560 + 0 0 clear @@ -396,7 +391,7 @@ AXDescription NSAccessibilityEncodedAttributesValueType - + YES cancel @@ -406,7 +401,7 @@ _searchFieldCancel: - 138690815 + 138690560 0 400 @@ -415,17 +410,17 @@ CAAAAA + NO 292 {{17, 15}, {422, 17}} - YES - 70385217 + 70254657 272630784 0 Public Channels @@ -438,17 +433,17 @@ + NO 268 {{16, 453}, {403.44400000000002, 17}} - YES - 68288064 + 68157504 272630784 My IRC Network @@ -460,11 +455,10 @@ + NO {788, 480} - - {{0, 0}, {2560, 1418}} @@ -476,38 +470,6 @@ YES - - - dataSource - - - - 84 - - - - delegate - - - - 96 - - - - delegate - - - - 105 - - - - delegate - - - - 118 - table @@ -580,13 +542,47 @@ 134 + + + delegate + + + + 118 + + + + dataSource + + + + 84 + + + + delegate + + + + 96 + + + + delegate + + + + 105 + YES 0 - + + YES + @@ -820,7 +816,7 @@ 78.IBPluginDependency 79.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -843,7 +839,7 @@ {{590, 493}, {788, 480}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -869,80 +865,7 @@ 134 - - - YES - - ListDialog - NSWindowController - - YES - - YES - channelCount - filterText - networkName - table - updateButton - - - YES - NSTextField - NSSearchField - NSTextField - ListView - NSButton - - - - YES - - YES - channelCount - filterText - networkName - table - updateButton - - - YES - - channelCount - NSTextField - - - filterText - NSSearchField - - - networkName - NSTextField - - - table - ListView - - - updateButton - NSButton - - - - - IBProjectSource - ./Classes/ListDialog.h - - - - ListView - NSTableView - - IBProjectSource - ./Classes/ListView.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/ModeSheet.xib b/English.lproj/TDCModeSheet.xib similarity index 84% rename from English.lproj/ModeSheet.xib rename to English.lproj/TDCModeSheet.xib index 0c7d35b585..b3a98ec985 100755 --- a/English.lproj/ModeSheet.xib +++ b/English.lproj/TDCModeSheet.xib @@ -2,24 +2,24 @@ 1050 - 11C74 - 1938 - 1138.23 - 567.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 2541 YES - NSTextField - NSView - NSWindowTemplate - NSCustomObject NSBox - NSButtonCell NSButton + NSButtonCell + NSCustomObject + NSTextField NSTextFieldCell + NSView + NSWindowTemplate YES @@ -32,7 +32,7 @@ YES - ModeSheet + TDCModeSheet FirstResponder @@ -57,7 +57,7 @@ {213, 107} - + 256 YES @@ -66,11 +66,10 @@ 256 {{140, 106}, {144, 22}} - YES - -1804468671 + -1804599231 272630784 @@ -347,17 +346,17 @@ or_IN + NO 256 {{217, 80}, {69, 22}} - YES - -1804468671 + -1804599231 71304192 @@ -370,22 +369,22 @@ NSAllRomanInputSourcesLocaleIdentifier + NO 256 {{141, 12}, {83, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -393,22 +392,21 @@ 200 25 + NO 256 {{224, 12}, {82, 32}} - - YES - 67239424 + 67108864 134217728 Save - -2038284033 + -2038284288 1 @@ -416,22 +414,22 @@ 200 25 + NO 256 {{18, 109}, {116, 18}} - YES - 67239424 + 67108864 0 Password (+k): - 1211912703 + 1211912448 2 NSSwitch @@ -441,22 +439,22 @@ 200 25 + NO 256 {{18, 82}, {193, 18}} - YES - 67239424 + 67108864 0 Limit number of users (+l): - 1211912703 + 1211912448 2 @@ -464,22 +462,22 @@ 200 25 + NO 256 {{18, 271}, {212, 18}} - YES - 67239424 + 67108864 0 Secret channel (+s) - 1211912703 + 1211912448 2 @@ -487,22 +485,22 @@ 200 25 + NO 256 {{18, 244}, {212, 18}} - YES - 67239424 + 67108864 0 Private channel (+p) - 1211912703 + 1211912448 2 @@ -510,22 +508,22 @@ 200 25 + NO 256 {{18, 217}, {246, 18}} - YES - 67239424 + 67108864 0 No external channel messages (+n) - 1211912703 + 1211912448 2 @@ -533,22 +531,22 @@ 200 25 + NO 256 {{18, 190}, {255, 18}} - YES - 67239424 + 67108864 0 Only operators can change topic (+t) - 1211912703 + 1211912448 2 @@ -556,22 +554,22 @@ 200 25 + NO 256 {{18, 163}, {212, 18}} - YES - 67239424 + 67108864 0 Invite-only channel (+i) - 1211912703 + 1211912448 2 @@ -579,22 +577,22 @@ 200 25 + NO 256 {{18, 136}, {212, 18}} - YES - 67239424 + 67108864 0 Moderated channel (+m) - 1211912703 + 1211912448 2 @@ -602,17 +600,17 @@ 200 25 + NO 12 {{12, 58}, {295, 5}} - {0, 0} - 67239424 + 67108864 0 Box @@ -629,8 +627,6 @@ {319, 307} - - {{0, 0}, {2560, 1418}} @@ -1082,7 +1078,7 @@ 82.IBPluginDependency 83.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1131,154 +1127,7 @@ 246 - - - YES - - ModeSheet - SheetBase - - YES - - YES - iCheck - kCheck - kText - lCheck - lText - mCheck - nCheck - pCheck - sCheck - tCheck - - - YES - NSButton - NSButton - NSTextField - NSButton - NSTextField - NSButton - NSButton - NSButton - NSButton - NSButton - - - - YES - - YES - iCheck - kCheck - kText - lCheck - lText - mCheck - nCheck - pCheck - sCheck - tCheck - - - YES - - iCheck - NSButton - - - kCheck - NSButton - - - kText - NSTextField - - - lCheck - NSButton - - - lText - NSTextField - - - mCheck - NSButton - - - nCheck - NSButton - - - pCheck - NSButton - - - sCheck - NSButton - - - tCheck - NSButton - - - - - IBProjectSource - ./Classes/ModeSheet.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/NickSheet.xib b/English.lproj/TDCNickSheet.xib similarity index 80% rename from English.lproj/NickSheet.xib rename to English.lproj/TDCNickSheet.xib index f4eef0e3a8..7faa105143 100755 --- a/English.lproj/NickSheet.xib +++ b/English.lproj/TDCNickSheet.xib @@ -2,39 +2,36 @@ 1050 - 11C26 - 1617 - 1138.11 - 566.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 2541 YES + NSButton + NSButtonCell + NSCustomObject NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSCustomObject - NSButtonCell - NSButton - NSTextFieldCell YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES - NickSheet + TDCNickSheet FirstResponder @@ -57,7 +54,7 @@ {213, 107} - + 256 YES @@ -66,11 +63,10 @@ 256 {{17, 95}, {121, 17}} - YES - 67239424 + 67108864 71303168 Current nickname: @@ -98,17 +94,17 @@ + NO 256 {{141, 95}, {139, 17}} - YES - 67239488 + 67108928 272631808 Nickname @@ -120,17 +116,17 @@ + NO 256 {{144, 61}, {138, 22}} - YES - -1804468671 + -1804599231 272630784 @@ -152,17 +148,17 @@ + NO 256 {{38, 64}, {100, 17}} - YES - 67239424 + 67108864 71303168 New nickname: @@ -170,22 +166,21 @@ + NO 256 {{134, 12}, {154, 32}} - - YES - 67239424 + 67108864 134217728 Change Nickname - -2038284033 + -2038284288 1 @@ -193,22 +188,22 @@ 200 25 + NO 256 {{52, 12}, {82, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -216,11 +211,10 @@ 200 25 + NO {302, 132} - - {{0, 0}, {2560, 1418}} @@ -264,22 +258,6 @@ 33 - - - delegate - - - - 35 - - - - delegate - - - - 36 - sheet @@ -296,13 +274,31 @@ 38 + + + delegate + + + + 36 + + + + delegate + + + + 35 + YES 0 - + + YES + @@ -457,7 +453,7 @@ 8.IBPluginDependency 9.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -493,98 +489,7 @@ 38 - - - YES - - NickSheet - SheetBase - - YES - - YES - currentText - nicknameNewInfo - - - YES - NSTextField - NSTextField - - - - YES - - YES - currentText - nicknameNewInfo - - - YES - - currentText - NSTextField - - - nicknameNewInfo - NSTextField - - - - - IBProjectSource - ./Classes/NickSheet.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/Preferences.xib b/English.lproj/TDCPreferences.xib similarity index 99% rename from English.lproj/Preferences.xib rename to English.lproj/TDCPreferences.xib index 7c42b4bd13..d2ca989485 100755 --- a/English.lproj/Preferences.xib +++ b/English.lproj/TDCPreferences.xib @@ -2,13 +2,13 @@ 1060 - 12A206j - 2507 - 1172.1 - 613.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 2507 + 2541 NSArrayController @@ -370,10 +370,6 @@ -2044182528 2 - - NSImage - TPWTB_Advanced - 400 @@ -384,7 +380,10 @@ 2147483647 - + + NSImage + TPWTB_Advanced + _popUpItemAction: @@ -488,7 +487,7 @@ NO - + {32, 32} @@ -604,7 +603,7 @@ - + 256 @@ -616,7 +615,6 @@ {534, 276} - {{0, 0}, {2560, 1418}} @@ -2347,7 +2345,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView - + 268 @@ -2355,7 +2353,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 12 {{13, 12}, {515, 373}} - 1 @@ -2483,7 +2480,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{83, 20}, {232, 18}} - YES -2080374784 @@ -3267,9 +3263,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 2322 - {376, 13} + {376, 20} - + @@ -3352,7 +3348,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 - 67110917 + 100665349 0 @@ -3388,7 +3384,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 6 {463, 10000000} - {223, 0} @@ -3447,7 +3442,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{105, 215}, {376, 20}} - + 133120 @@ -3468,9 +3463,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 2322 - {252, 12} + {252, 20} - + @@ -3529,7 +3524,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67110917 + 100665349 0 @@ -3549,7 +3544,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {463, 10000000} - {223, 0} @@ -3588,7 +3582,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{186, 266}, {252, 20}} - + 133120 @@ -3618,7 +3612,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {541, 397} - NSView @@ -4026,7 +4019,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA WebURLsWithTitlesPboardType public.url - {429, 34} + {429, 38} @@ -4048,7 +4041,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67121123 + 100675555 0 @@ -4068,7 +4061,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {604, 10000000} - {221, 34} @@ -4146,7 +4138,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA WebURLsWithTitlesPboardType public.url - {429, 34} + {429, 38} @@ -4168,7 +4160,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67121123 + 100675555 0 @@ -4188,7 +4180,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {604, 10000000} - {221, 34} @@ -4267,7 +4258,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA WebURLsWithTitlesPboardType public.url - {429, 34} + {429, 38} @@ -4289,7 +4280,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67121123 + 100675555 0 @@ -4309,7 +4300,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {604, 10000000} - {221, 34} @@ -4576,7 +4566,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 2322 - {{0, 4}, {172, 26}} + {{0, 4}, {172, 35}} @@ -4633,7 +4623,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67110917 + 100665349 0 @@ -4653,7 +4643,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {463, 10000000} - {139, 17} @@ -4892,7 +4881,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67121123 + 100675555 0 @@ -4912,7 +4901,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {463, 10000000} - {223, 39} @@ -5349,7 +5337,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSView - + 268 @@ -5357,8 +5345,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 12 {{8, 12}, {515, 443}} - - 1 @@ -5371,7 +5357,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{11, 118}, {234, 18}} - YES @@ -5396,7 +5381,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{11, 62}, {200, 18}} - YES @@ -5421,8 +5405,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{11, 34}, {211, 18}} - - YES 67108864 @@ -5446,7 +5428,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{11, 90}, {269, 18}} - YES @@ -5471,7 +5452,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{151, 280}, {309, 22}} - YES @@ -5546,7 +5526,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{12, 363}, {246, 18}} - YES @@ -5571,7 +5550,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 12 {{13, 316}, {470, 5}} - {0, 0} @@ -5595,7 +5573,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 12 {{13, 150}, {469, 5}} - {0, 0} @@ -5619,7 +5596,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{23, 254}, {126, 16}} - YES @@ -5638,7 +5614,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{154, 252}, {62, 19}} - YES @@ -5658,7 +5633,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{50, 201}, {138, 16}} - YES @@ -5677,7 +5651,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{190, 197}, {244, 22}} - YES @@ -5737,7 +5710,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 12 {{13, 233}, {470, 5}} - {0, 0} @@ -5761,7 +5733,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{12, 335}, {331, 18}} - YES @@ -5786,7 +5757,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{39, 171}, {149, 16}} - YES @@ -5805,7 +5775,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{190, 167}, {238, 22}} - YES @@ -5884,7 +5853,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{301, 255}, {159, 14}} - YES @@ -5903,7 +5871,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{248, 255}, {64, 14}} - YES @@ -5922,7 +5889,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 12 {{229, 252}, {5, 21}} - {0, 0} @@ -5946,7 +5912,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 268 {{54, 284}, {95, 16}} - YES @@ -5963,7 +5928,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{10, 25}, {495, 405}} - General @@ -6023,7 +5987,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{11, 294}, {341, 18}} - YES 67108864 @@ -6085,8 +6048,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {534, 467} - - NSView diff --git a/English.lproj/ServerSheet.xib b/English.lproj/TDCServerSheet.xib similarity index 97% rename from English.lproj/ServerSheet.xib rename to English.lproj/TDCServerSheet.xib index 9089ed4bf8..de6a4b94c0 100755 --- a/English.lproj/ServerSheet.xib +++ b/English.lproj/TDCServerSheet.xib @@ -2,13 +2,13 @@ 1060 - 11E53 - 2507 - 1138.47 - 569.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 2507 + 2541 NSBox @@ -46,7 +46,7 @@ - ServerSheet + TDCServerSheet FirstResponder @@ -66,7 +66,7 @@ - + 256 @@ -93,6 +93,8 @@ _NS:1197 YES + NO + YES -2147483392 @@ -196,6 +198,7 @@ _NS:1214 + NO _doScroller: 0.9925373134328358 @@ -207,6 +210,7 @@ _NS:1216 + NO 1 _doScroller: @@ -222,6 +226,9 @@ QSAAAEEgAABBgAAAQYAAAA + 0.25 + 4 + 1 @@ -291,6 +298,7 @@ 200 25 + NO @@ -314,10 +322,10 @@ 200 25 + NO {679, 389} - {{0, 0}, {1280, 778}} @@ -354,6 +362,7 @@ 200 25 + NO @@ -383,6 +392,8 @@ YES + NO + YES 10 @@ -435,6 +446,7 @@ 1 + NO @@ -469,6 +481,7 @@ + NO @@ -486,6 +499,7 @@ + NO @@ -509,6 +523,7 @@ 200 25 + NO @@ -526,6 +541,7 @@ + NO @@ -549,6 +565,7 @@ + NO @@ -566,6 +583,7 @@ + NO @@ -588,6 +606,7 @@ NSAllRomanInputSourcesLocaleIdentifier + NO @@ -605,6 +624,7 @@ + NO @@ -624,6 +644,7 @@ + NO @@ -641,6 +662,7 @@ + NO @@ -664,6 +686,7 @@ 200 25 + NO @@ -687,6 +710,7 @@ 200 25 + NO @@ -710,6 +734,7 @@ 200 25 + NO {517, 303} @@ -737,6 +762,7 @@ + NO @@ -754,6 +780,7 @@ + NO @@ -794,6 +821,7 @@ + NO @@ -815,6 +843,7 @@ + NO @@ -832,6 +861,7 @@ + NO @@ -850,6 +880,7 @@ + NO @@ -867,6 +898,7 @@ + NO @@ -884,6 +916,7 @@ + NO @@ -903,6 +936,7 @@ + NO @@ -920,6 +954,7 @@ + NO @@ -939,6 +974,7 @@ + NO @@ -956,6 +992,7 @@ + NO @@ -975,6 +1012,7 @@ + NO {517, 281} @@ -1016,7 +1054,7 @@ WebURLsWithTitlesPboardType public.url - {424, 14} + {424, 54} _NS:3761 @@ -1039,7 +1077,7 @@ 1 - 67121027 + 100675459 0 @@ -1075,7 +1113,6 @@ 6 {463, 10000000} - {238, 12} @@ -1117,6 +1154,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{411, 2}, {15, 54}} _NS:3776 + NO _doScroller: 1 @@ -1129,6 +1167,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:3764 + NO 1 _doScroller: @@ -1144,6 +1183,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + 0.25 + 4 + 1 @@ -1175,7 +1217,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA WebURLsWithTitlesPboardType public.url - {424, 15} + {424, 54} _NS:3761 @@ -1198,7 +1240,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67121027 + 100675459 0 @@ -1218,7 +1260,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {463, 10000000} - {238, 15} @@ -1258,6 +1299,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:3776 + NO _doScroller: 1 @@ -1270,6 +1312,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA _NS:3764 + NO 1 _doScroller: @@ -1285,6 +1328,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + 0.25 + 4 + 1 @@ -1302,6 +1348,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -1319,6 +1366,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO {517, 303} @@ -1345,6 +1393,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -1362,6 +1411,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -1379,6 +1429,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -1388,7 +1439,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - -2076049856 + -2076180416 2048 @@ -1646,6 +1697,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES 1 + NO @@ -1655,7 +1707,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - -2076049856 + -2076180416 2048 @@ -1917,6 +1969,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES 1 + NO {517, 303} @@ -1944,6 +1997,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -1969,6 +2023,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 400 75 + NO @@ -1989,6 +2044,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 400 75 + NO @@ -2014,6 +2070,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 400 75 + NO @@ -2030,6 +2087,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES + NO + YES 256 @@ -2165,6 +2224,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{404.90499999999997, 17}, {15, 154}} + NO _doScroller: 0.91124260425567627 @@ -2175,6 +2235,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{1, 171}, {418.90499999999997, 15}} + NO 1 _doScroller: @@ -2203,6 +2264,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 {517, 303} @@ -2236,6 +2300,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2258,6 +2323,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 400 75 + NO @@ -2278,6 +2344,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 400 75 + NO @@ -2303,6 +2370,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 400 75 + NO @@ -2319,6 +2387,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES + NO + YES 256 @@ -2429,6 +2499,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{293.77800000000002, 17}, {15, 339.55599999999998}} + NO _doScroller: 0.99708455801010132 @@ -2439,6 +2510,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{-100, -100}, {307.77800000000002, 15}} + NO 1 _doScroller: @@ -2467,6 +2539,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 {517, 303} @@ -2494,6 +2569,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2525,7 +2601,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA WebURLsWithTitlesPboardType public.url - {418, 14} + {418, 179} @@ -2547,7 +2623,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1 - 67120387 + 100674819 0 @@ -2566,7 +2642,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 6 {740, 10000000} - {114, 0} @@ -2604,6 +2679,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{-30, 1}, {15, 62}} + NO _doScroller: 0.75806450843811035 @@ -2614,6 +2690,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{-100, -100}, {87, 18}} + NO 1 _doScroller: @@ -2628,6 +2705,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + 0.25 + 4 + 1 @@ -2650,6 +2730,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 200 25 + NO {517, 303} @@ -2677,6 +2758,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2686,7 +2768,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - -2076049856 + -2076180416 2048 @@ -2768,6 +2850,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES 2 + NO @@ -2787,6 +2870,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2806,6 +2890,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2826,6 +2911,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSAllRomanInputSourcesLocaleIdentifier + NO @@ -2845,6 +2931,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2862,6 +2949,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2879,6 +2967,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2896,6 +2985,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2913,6 +3003,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -2930,6 +3021,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO {517, 303} @@ -2991,6 +3083,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3009,6 +3102,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3028,6 +3122,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3047,6 +3142,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3071,6 +3167,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES NO + NO @@ -3090,6 +3187,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3109,6 +3207,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3128,6 +3227,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3147,6 +3247,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3166,6 +3267,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3185,6 +3287,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3204,6 +3307,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3223,6 +3327,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3247,6 +3352,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES NO + NO {{0, -7}, {517, 204}} @@ -3273,6 +3379,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -3298,6 +3405,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 200 25 + NO {517, 303} @@ -5734,10 +5842,10 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListSeparatorCell + TVCListSeparatorCell com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5879,7 +5987,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5899,7 +6007,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/English.lproj/TopicSheet.xib b/English.lproj/TDCTopicSheet.xib similarity index 85% rename from English.lproj/TopicSheet.xib rename to English.lproj/TDCTopicSheet.xib index 8d56f263e4..317ddc3caf 100755 --- a/English.lproj/TopicSheet.xib +++ b/English.lproj/TDCTopicSheet.xib @@ -2,25 +2,25 @@ 1060 - 11C74 - 1938 - 1138.23 - 567.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 2541 + NSButton + NSButtonCell + NSCustomObject + NSScrollView + NSScroller NSTextField - NSView - NSWindowTemplate NSTextFieldCell - NSScrollView NSTextView - NSButtonCell - NSButton - NSScroller - NSCustomObject + NSView + NSWindowTemplate com.apple.InterfaceBuilder.CocoaPlugin @@ -31,7 +31,7 @@ - TopicSheet + TDCTopicSheet FirstResponder @@ -56,7 +56,7 @@ {213, 107} - + 256 @@ -64,10 +64,9 @@ 256 {{454, 12}, {127, 32}} - YES - 67239424 + 67108864 134217728 Change Topic @@ -76,7 +75,7 @@ 1044 - -2038284033 + -2038284288 1 @@ -84,22 +83,22 @@ 200 25 + NO 256 {{372, 12}, {82, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -107,17 +106,17 @@ 200 25 + NO 268 {{17, 207}, {479, 17}} - YES - 68288064 + 68157504 272630784 Topic for %@: @@ -141,6 +140,7 @@ + NO @@ -172,9 +172,8 @@ WebURLsWithTitlesPboardType public.url - {{0, 46}, {551, 14}} + {{0, 46}, {551, 135}} - _NS:3760 @@ -188,7 +187,7 @@ - 134 + 166 @@ -196,7 +195,7 @@ 1 - 67112839 + 100667271 0 @@ -235,13 +234,11 @@ 6 {555, 10000000} - {238, 0} {{2, 2}, {551, 135}} - _NS:3758 @@ -277,9 +274,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 {{538, 2}, {15, 135}} - _NS:3774 + NO _doScroller: 1 @@ -290,9 +287,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA -2147483392 {{-100, -100}, {87, 18}} - _NS:3762 + NO 1 _doScroller: @@ -302,18 +299,18 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{20, 60}, {555, 139}} - _NS:148 133139 + 0.25 + 4 + 1 {595, 244} - - {{0, 0}, {2560, 1418}} @@ -497,7 +494,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - TextField + TVCTextField com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{799, 810}, {595, 199}} @@ -510,67 +507,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 41 - - - - SheetBase - NSObject - - NSButton - NSButton - NSWindow - - - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - IBProjectSource - ./Classes/SheetBase.h - - - - TextField - NSTextView - - IBProjectSource - ./Classes/TextField.h - - - - TopicSheet - SheetBase - - NSTextField - TextField - - - - header - NSTextField - - - text - TextField - - - - IBProjectSource - ./Classes/TopicSheet.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/WelcomeSheet.xib b/English.lproj/TDCWelcomeSheet.xib similarity index 90% rename from English.lproj/WelcomeSheet.xib rename to English.lproj/TDCWelcomeSheet.xib index 107c5f8378..0e3234454b 100755 --- a/English.lproj/WelcomeSheet.xib +++ b/English.lproj/TDCWelcomeSheet.xib @@ -2,30 +2,30 @@ 1050 - 11C74 - 1938 - 1138.23 - 567.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 2541 YES - NSScroller + NSBox NSButton - NSScrollView - NSTextFieldCell NSButtonCell - NSBox + NSCustomObject NSImageCell NSImageView + NSScrollView + NSScroller + NSTableColumn NSTableView - NSCustomObject + NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextField - NSTableColumn YES @@ -38,7 +38,7 @@ YES - WelcomeSheet + TDCWelcomeSheet FirstResponder @@ -70,7 +70,7 @@ YES - 67239488 + 67108928 272630784 Nickname: @@ -98,6 +98,7 @@ + NO @@ -108,7 +109,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -130,6 +131,7 @@ + NO @@ -140,7 +142,7 @@ YES - 67239488 + 67108928 272630784 IRC server: @@ -148,6 +150,7 @@ + NO @@ -167,6 +170,8 @@ YES + NO + YES 256 @@ -179,7 +184,7 @@ 40 1000 - 75628096 + 75497536 2048 @@ -199,7 +204,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -257,6 +262,7 @@ + NO _doScroller: 0.99166667461395264 @@ -268,6 +274,7 @@ + NO 1 _doScroller: @@ -283,6 +290,9 @@ QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 @@ -293,7 +303,7 @@ YES - 67239488 + 67108928 272630784 Channels: @@ -301,6 +311,7 @@ + NO @@ -311,12 +322,12 @@ YES - -2080244224 + -2080374784 0 Connect when Textual starts - 1211912703 + 1211912448 2 NSImage @@ -330,6 +341,7 @@ 200 25 + NO @@ -337,20 +349,22 @@ {{244, 12}, {138, 32}} + YES - 67239424 + 67108864 134217728 Start Chatting - -2038284033 + -2038284288 129 200 25 + NO @@ -361,18 +375,19 @@ YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 129 Gw 200 25 + NO @@ -383,12 +398,12 @@ YES - 67239424 + 67108864 134217728 - -2033958657 + -2033958912 162 NSImage @@ -399,6 +414,7 @@ 400 75 + NO @@ -406,15 +422,15 @@ {{136, 126}, {23, 23}} - + YES - 67239424 + 67108864 134217728 - -2033958657 + -2033958912 162 NSImage @@ -425,6 +441,7 @@ 400 75 + NO @@ -447,7 +464,7 @@ YES - 130560 + 134217728 33554432 NSImage @@ -458,6 +475,7 @@ 0 YES + NO YES @@ -469,7 +487,7 @@ YES - 68288064 + 68157504 272630784 Welcome to Textual! @@ -481,6 +499,7 @@ + NO @@ -491,7 +510,7 @@ YES - 69336577 + 69206017 4194304 Textual provides many features to help make IRC a more enjoyable experience. 

First, we need to a add your first server. @@ -503,6 +522,7 @@ + NO @@ -513,7 +533,7 @@ {0, 0} - 67239424 + 67108864 0 Box @@ -534,10 +554,10 @@ {{111, 75}, {265, 39}} - + YES - 69336577 + 69206017 4194304 Additional settings including NickServ password, username, real name, etc. can be edited later by right clicking this server and selecting "Server Properties." @@ -557,6 +577,7 @@ + NO @@ -564,10 +585,10 @@ {{13, 58}, {378, 5}} - + {0, 0} - 67239424 + 67108864 0 Box @@ -591,7 +612,7 @@ YES - -1804468671 + -1804599231 272630784 @@ -600,6 +621,7 @@ + NO {402, 533} @@ -1128,7 +1150,7 @@ 202.IBPluginDependency 203.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1174,7 +1196,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1203,127 +1225,28 @@ YES - - ListView - NSTableView - - IBProjectSource - ./Classes/ListView.h - - SheetBase NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - IBProjectSource ./Classes/SheetBase.h - WelcomeSheet + TDCWelcomeSheet SheetBase - - YES - - YES - addChannelButton - autoConnectCheck - channelTable - deleteChannelButton - hostCombo - nickText - - - YES - NSButton - NSButton - ListView - NSButton - NSTextField - NSTextField - - - - YES - - YES - addChannelButton - autoConnectCheck - channelTable - deleteChannelButton - hostCombo - nickText - - - YES - - addChannelButton - NSButton - - - autoConnectCheck - NSButton - - - channelTable - ListView - - - deleteChannelButton - NSButton - - - hostCombo - NSTextField - - - nickText - NSTextField - - + + IBProjectSource + ./Classes/TDCWelcomeSheet.h + + + TVCListView + NSTableView IBProjectSource - ./Classes/WelcomeSheet.h + ./Classes/TVCListView.h @@ -1349,7 +1272,7 @@ NSSwitch application - + YES {8, 8} {8, 8} diff --git a/English.lproj/ChanBanExceptionSheet.xib b/English.lproj/TDChanBanExceptionSheet.xib similarity index 84% rename from English.lproj/ChanBanExceptionSheet.xib rename to English.lproj/TDChanBanExceptionSheet.xib index bfddb7d055..71554655d1 100755 --- a/English.lproj/ChanBanExceptionSheet.xib +++ b/English.lproj/TDChanBanExceptionSheet.xib @@ -2,44 +2,41 @@ 1060 - 11C26 - 1617 - 1138.11 - 566.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 2541 YES - NSScroller - NSTableHeaderView NSButton - NSScrollView - NSTextFieldCell NSButtonCell - NSTableView NSCustomObject + NSScrollView + NSScroller + NSTableColumn + NSTableHeaderView + NSTableView + NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextField - NSTableColumn YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES - ChanBanExceptionSheet + TDChanBanExceptionSheet FirstResponder @@ -58,7 +55,7 @@ {778, 350} - + 256 YES @@ -77,15 +74,15 @@ 256 {778, 247} - - + YES + NO + YES 256 {778, 17} - @@ -103,7 +100,7 @@ 40 1000 - 75628096 + 75497536 2048 Exception Mask @@ -126,7 +123,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -161,7 +158,7 @@ 40 1000 - 75628096 + 75497536 2048 Added By @@ -169,7 +166,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -187,7 +184,7 @@ 10 3.4028234663852886e+38 - 75628096 + 75497536 2048 Date Added @@ -203,7 +200,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -242,7 +239,6 @@ {{1, 17}, {778, 247}} - @@ -253,8 +249,8 @@ -2147483392 {{764, 17}, {15, 229.52600000000001}} - + NO _doScroller: 0.99596774193548387 @@ -264,8 +260,8 @@ -2147483392 {{1, 246.52600000000001}, {763, 15}} - + NO 1 _doScroller: @@ -280,7 +276,6 @@ {{1, 0}, {778, 17}} - @@ -289,91 +284,91 @@ {{-1, 42}, {780, 265}} - - + 133682 QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 292 {{14, 4}, {185, 32}} - YES - 67239424 + 67108864 134217728 Remove Selected Items - -2038284033 + -2038284288 129 DQ 200 25 + NO 289 {{571, 4}, {111, 32}} - YES - 67239424 + 67108864 134217728 Update List - -2038284033 + -2038284288 129 200 25 + NO 289 {{682, 4}, {85, 32}} - - YES - 67239424 + 67108864 134217728 Close - -2038284033 + -2038284288 129 Gw 200 25 + NO 268 {{17, 320}, {551, 17}} - YES - 67239488 + 67108928 272631808 Ban Exceptions for %@ @@ -390,11 +385,10 @@ + NO {778, 350} - - {{0, 0}, {2560, 1418}} @@ -462,14 +456,6 @@ 44 - - - dataSource - - - - 45 - header @@ -478,13 +464,23 @@ 46 + + + dataSource + + + + 45 + YES 0 - + + YES + @@ -698,7 +694,7 @@ 8.IBPluginDependency 9.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -723,7 +719,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -743,106 +739,7 @@ 46 - - - YES - - ChanBanExceptionSheet - SheetBase - - YES - - YES - header - table - - - YES - NSTextField - ListView - - - - YES - - YES - header - table - - - YES - - header - NSTextField - - - table - ListView - - - - - IBProjectSource - ./Classes/ChanBanExceptionSheet.h - - - - ListView - NSTableView - - IBProjectSource - ./Classes/ListView.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/ChanBanSheet.xib b/English.lproj/TDChanBanSheet.xib similarity index 83% rename from English.lproj/ChanBanSheet.xib rename to English.lproj/TDChanBanSheet.xib index 32d0624ff1..3355b73872 100755 --- a/English.lproj/ChanBanSheet.xib +++ b/English.lproj/TDChanBanSheet.xib @@ -2,44 +2,41 @@ 1060 - 11C26 - 1617 - 1138.11 - 566.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1617 + 2541 YES - NSScroller - NSTableHeaderView NSButton - NSScrollView - NSTextFieldCell NSButtonCell - NSTableView NSCustomObject + NSScrollView + NSScroller + NSTableColumn + NSTableHeaderView + NSTableView + NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextField - NSTableColumn YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES - ChanBanSheet + TDChanBanSheet FirstResponder @@ -58,7 +55,7 @@ {778, 350} - + 256 YES @@ -77,18 +74,16 @@ 256 {778, 247} - - - 2 + YES + NO + YES 256 {778, 17} - - 2 @@ -96,7 +91,6 @@ -2147483392 {{764, 0}, {16, 17}} - 2 YES @@ -106,7 +100,7 @@ 40 1000 - 75628096 + 75497536 2048 Ban Mask @@ -129,7 +123,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -168,7 +162,7 @@ 40 1000 - 75628096 + 75497536 2048 Added By @@ -176,7 +170,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -198,7 +192,7 @@ 10 3.4028234663852886e+38 - 75628096 + 75497536 2048 Date Added @@ -214,7 +208,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -257,9 +251,7 @@ {{1, 17}, {778, 247}} - - 2 4 @@ -269,9 +261,8 @@ -2147483392 {{764, 17}, {15, 229.52600000000001}} - - 2 + NO _doScroller: 0.99596774193548387 @@ -281,9 +272,8 @@ -2147483392 {{1, 246.52600000000001}, {763, 15}} - - 2 + NO 1 _doScroller: @@ -298,9 +288,7 @@ {{1, 0}, {778, 17}} - - 2 4 @@ -308,92 +296,91 @@ {{-1, 43}, {780, 265}} - - - 2 + 133682 QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 292 {{5, 4}, {185, 32}} - YES - 67239424 + 67108864 134217728 Remove Selected Items - -2038284033 + -2038284288 129 DQ 200 25 + NO 289 {{575, 4}, {111, 32}} - YES - 67239424 + 67108864 134217728 Update List - -2038284033 + -2038284288 129 200 25 + NO 289 {{686, 4}, {85, 32}} - - YES - 67239424 + 67108864 134217728 Close - -2038284033 + -2038284288 129 Gw 200 25 + NO 268 {{17, 320}, {666, 17}} - YES - 67239488 + 67108928 272631808 Bans for %@ @@ -410,11 +397,10 @@ + NO {778, 350} - - {{0, 0}, {2560, 1418}} @@ -482,14 +468,6 @@ 32 - - - dataSource - - - - 35 - header @@ -498,13 +476,23 @@ 37 + + + dataSource + + + + 35 + YES 0 - + + YES + @@ -722,7 +710,7 @@ 8.IBPluginDependency 9.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -747,7 +735,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin @@ -771,106 +759,7 @@ 37 - - - YES - - ChanBanSheet - SheetBase - - YES - - YES - header - table - - - YES - NSTextField - ListView - - - - YES - - YES - header - table - - - YES - - header - NSTextField - - - table - ListView - - - - - IBProjectSource - ./Classes/ChanBanSheet.h - - - - ListView - NSTableView - - IBProjectSource - ./Classes/ListView.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/ChanInviteExceptionSheet.xib b/English.lproj/TDChanInviteExceptionSheet.xib similarity index 84% rename from English.lproj/ChanInviteExceptionSheet.xib rename to English.lproj/TDChanInviteExceptionSheet.xib index 88dcc78b57..4dd759f225 100755 --- a/English.lproj/ChanInviteExceptionSheet.xib +++ b/English.lproj/TDChanInviteExceptionSheet.xib @@ -1,29 +1,29 @@ - 1070 - 11C74 - 1938 - 1138.23 - 567.00 + 1080 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 2541 YES - NSScroller - NSTableHeaderView NSButton - NSScrollView - NSTextFieldCell NSButtonCell - NSTableView NSCustomObject + NSScrollView + NSScroller + NSTableColumn + NSTableHeaderView + NSTableView + NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextField - NSTableColumn YES @@ -36,7 +36,7 @@ YES - ChanInviteExceptionSheet + TDChanInviteExceptionSheet FirstResponder @@ -55,7 +55,7 @@ {778, 350} - + 256 YES @@ -74,15 +74,15 @@ 256 {778, 247} - - + YES + NO + YES 256 {778, 17} - @@ -100,7 +100,7 @@ 40 1000 - 75628096 + 75497536 2048 Exception Mask @@ -123,7 +123,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -162,7 +162,7 @@ 40 1000 - 75628096 + 75497536 2048 Added By @@ -170,7 +170,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -192,7 +192,7 @@ 10 3.4028234663852886e+38 - 75628096 + 75497536 2048 Date Added @@ -208,7 +208,7 @@ - 337772096 + 337641536 2048 Text Cell @@ -251,7 +251,6 @@ {{1, 17}, {778, 247}} - @@ -262,8 +261,8 @@ -2147483392 {{764, 17}, {15, 229.52600000000001}} - + NO _doScroller: 0.99596774193548387 @@ -273,8 +272,8 @@ -2147483392 {{1, 246.52600000000001}, {763, 15}} - + NO 1 _doScroller: @@ -289,7 +288,6 @@ {{1, 0}, {778, 17}} - @@ -298,91 +296,91 @@ {{-1, 42}, {780, 265}} - - + 133682 QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 292 {{14, 4}, {185, 32}} - YES - 67239424 + 67108864 134217728 Remove Selected Items - -2038284033 + -2038284288 129 DQ 200 25 + NO 289 {{574, 4}, {111, 32}} - YES - 67239424 + 67108864 134217728 Update List - -2038284033 + -2038284288 129 200 25 + NO 289 {{685, 4}, {85, 32}} - - YES - 67239424 + 67108864 134217728 Close - -2038284033 + -2038284288 129 Gw 200 25 + NO 268 {{17, 320}, {665, 17}} - YES - 67239488 + 67108928 272631808 Invite Exceptions for %@ @@ -399,11 +397,10 @@ + NO {778, 350} - - {{0, 0}, {2560, 1418}} @@ -709,7 +706,7 @@ 8.IBPluginDependency 9.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -719,7 +716,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ListView + TVCListView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -754,106 +751,7 @@ 35 - - - YES - - ChanInviteExceptionSheet - SheetBase - - YES - - YES - header - table - - - YES - NSTextField - ListView - - - - YES - - YES - header - table - - - YES - - header - NSTextField - - - table - ListView - - - - - IBProjectSource - ./Classes/ChanInviteExceptionSheet.h - - - - ListView - NSTableView - - IBProjectSource - ./Classes/ListView.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/ChannelSheet.xib b/English.lproj/TDChannelSheet.xib similarity index 86% rename from English.lproj/ChannelSheet.xib rename to English.lproj/TDChannelSheet.xib index ad8c8fad7e..fe056bcd7e 100755 --- a/English.lproj/ChannelSheet.xib +++ b/English.lproj/TDChannelSheet.xib @@ -2,28 +2,28 @@ 1050 - 11C74 - 1938 - 1138.23 - 567.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 2541 YES - NSUserDefaultsController - NSSegmentedControl + NSBox NSButton - NSTextFieldCell NSButtonCell - NSBox + NSCustomObject NSCustomView NSSegmentedCell + NSSegmentedControl + NSTextField + NSTextFieldCell + NSUserDefaultsController NSView NSWindowTemplate - NSTextField - NSCustomObject YES @@ -36,7 +36,7 @@ YES - ChannelSheet + TDChannelSheet FirstResponder @@ -57,7 +57,7 @@ {213, 107} - + 256 YES @@ -66,11 +66,9 @@ 268 {{47, 387}, {230, 20}} - - YES - 67239424 + 67108864 0 LucidaGrande @@ -99,20 +97,18 @@ 1 3 + NO 268 {325, 388} - NSView {325, 426} - - {{0, 0}, {1920, 1178}} @@ -121,7 +117,7 @@ YES - + 256 YES @@ -130,11 +126,10 @@ 256 {{23, 283}, {65, 17}} - YES - 67239424 + 67108864 71303168 Channel: @@ -162,17 +157,17 @@ + NO 256 {{17, 255}, {71, 17}} - YES - 67239424 + 67108864 71303168 Password: @@ -180,17 +175,17 @@ + NO 256 {{93, 250}, {164, 22}} - YES - -1804468671 + -1804599231 272630784 @@ -212,22 +207,22 @@ + NO 256 {{24, 189}, {195, 18}} - YES - 67239424 + 67108864 0 Join on connect - 1211912703 + 1211912448 2 NSImage @@ -241,22 +236,21 @@ 200 25 + NO 256 {{226, 12}, {82, 32}} - - YES - 67239424 + 67108864 134217728 Save - -2038284033 + -2038284288 1 @@ -264,22 +258,22 @@ 200 25 + NO 256 {{147, 12}, {82, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -287,17 +281,17 @@ 200 25 + NO 256 {{93, 280}, {209, 22}} - YES - -1804468671 + -1804599231 272630784 @@ -306,17 +300,17 @@ + NO 256 {{12, 58}, {301, 5}} - {0, 0} - 67239424 + 67108864 0 Box @@ -336,16 +330,15 @@ 268 {{24, 162}, {181, 18}} - YES - 67239424 + 67108864 0 Allow notifications - 1211912703 + 1211912448 2 @@ -354,17 +347,17 @@ 200 25 + NO 268 {{39, 245}, {49, 11}} - YES - 68288064 + 68157504 272630784 (optional) @@ -384,22 +377,22 @@ + NO 268 {{24, 135}, {168, 18}} - YES - 67239424 + 67108864 0 Disable highlights - 1211912703 + 1211912448 2 @@ -408,22 +401,22 @@ 200 25 + NO 268 {{24, 108}, {168, 18}} - YES - 67239424 + 67108864 0 Disable inline images - 1211912703 + 1211912448 2 @@ -432,22 +425,22 @@ 200 25 + NO 268 {{24, 81}, {209, 18}} - YES - 67239424 + 67108864 0 Disable join/part/quit activity - 1211912703 + 1211912448 2 @@ -456,17 +449,17 @@ 200 25 + NO 256 {{12, 225}, {301, 5}} - {0, 0} - 67239424 + 67108864 0 Box @@ -483,12 +476,10 @@ {325, 331} - - - + 256 YES @@ -497,11 +488,10 @@ 256 {{34, 145}, {53, 17}} - YES - 67239424 + 67108864 71303168 Modes: @@ -509,17 +499,17 @@ + NO 256 {{7, 221}, {80, 17}} - YES - 67239424 + 67108864 71303168 Topic: @@ -527,17 +517,17 @@ + NO 256 {{92, 143}, {211, 22}} - YES - -1804468671 + -1804599231 272630784 @@ -546,17 +536,17 @@ + NO 256 {{92, 175}, {211, 66}} - YES - -1805517311 + -1805647871 4194304 @@ -565,22 +555,21 @@ + NO 256 {{227, 12}, {82, 32}} - - YES - 67239424 + 67108864 134217728 Save - -2038284033 + -2038284288 1 @@ -588,22 +577,22 @@ 200 25 + NO 256 {{148, 12}, {82, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -611,17 +600,17 @@ 200 25 + NO 256 {{89, 76}, {210, 56}} - YES - 69336577 + 69206017 272629760 If you jon a channel that is empty, then the above settings will be used to establish the basic structure of the newly joined channel. @@ -638,17 +627,17 @@ + NO 256 {{14, 58}, {301, 5}} - {0, 0} - 67239424 + 67108864 0 Box @@ -665,12 +654,10 @@ {325, 270} - - - + 256 YES @@ -679,11 +666,10 @@ 256 {{17, 150}, {80, 17}} - YES - 67239424 + 67108864 4194304 Passphrase: @@ -691,22 +677,21 @@ + NO 256 {{229, 12}, {82, 32}} - - YES - 67239424 + 67108864 134217728 Save - -2038284033 + -2038284288 1 @@ -714,22 +699,22 @@ 200 25 + NO 256 {{147, 12}, {82, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 1 @@ -737,17 +722,17 @@ 200 25 + NO 256 {{102, 147}, {203, 22}} - YES - -1804468671 + -1804599231 272630784 @@ -756,17 +741,17 @@ + NO 256 {{99, 78}, {208, 56}} - YES - 69336577 + 69206017 272629760 This passphrase will be used to encrypt and decrypt messages so that only those with it may be able to read the transmitted conversations. @@ -774,17 +759,17 @@ + NO 256 {{12, 58}, {301, 5}} - {0, 0} - 67239424 + 67108864 0 Box @@ -801,8 +786,6 @@ {325, 198} - - @@ -1653,7 +1636,7 @@ 6.IBPluginDependency 6.IBUserGuides - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1751,189 +1734,7 @@ 325 - - - YES - - ChannelSheet - SheetBase - - YES - - YES - JPQActivityCheck - autoJoinCheck - contentView - defaultsView - encryptKeyText - encryptView - generalView - growlCheck - ihighlights - inlineImagesCheck - modeText - nameText - passwordText - tabView - topicText - - - YES - NSButton - NSButton - NSView - NSView - NSTextField - NSView - NSView - NSButton - NSButton - NSButton - NSTextField - NSTextField - NSTextField - NSSegmentedControl - NSTextField - - - - YES - - YES - JPQActivityCheck - autoJoinCheck - contentView - defaultsView - encryptKeyText - encryptView - generalView - growlCheck - ihighlights - inlineImagesCheck - modeText - nameText - passwordText - tabView - topicText - - - YES - - JPQActivityCheck - NSButton - - - autoJoinCheck - NSButton - - - contentView - NSView - - - defaultsView - NSView - - - encryptKeyText - NSTextField - - - encryptView - NSView - - - generalView - NSView - - - growlCheck - NSButton - - - ihighlights - NSButton - - - inlineImagesCheck - NSButton - - - modeText - NSTextField - - - nameText - NSTextField - - - passwordText - NSTextField - - - tabView - NSSegmentedControl - - - topicText - NSTextField - - - - - IBProjectSource - ./Classes/ChannelSheet.h - - - - SheetBase - NSObject - - YES - - YES - cancelButton - okButton - sheet - - - YES - NSButton - NSButton - NSWindow - - - - YES - - YES - cancelButton - okButton - sheet - - - YES - - cancelButton - NSButton - - - okButton - NSButton - - - sheet - NSWindow - - - - - IBProjectSource - ./Classes/SheetBase.h - - - - + 0 IBCocoaFramework diff --git a/English.lproj/InputPromptDialog.xib b/English.lproj/TVCInputPromptDialog.xib similarity index 79% rename from English.lproj/InputPromptDialog.xib rename to English.lproj/TVCInputPromptDialog.xib index db9eeb90e7..3bbf625c6e 100755 --- a/English.lproj/InputPromptDialog.xib +++ b/English.lproj/TVCInputPromptDialog.xib @@ -2,41 +2,38 @@ 1050 - 11A459e - 1565 - 1121.2 - 557.00 + 12A239 + 2541 + 1179.1 + 620.00 com.apple.InterfaceBuilder.CocoaPlugin - 1565 + 2541 YES + NSButton + NSButtonCell + NSCustomObject + NSImageCell + NSImageView NSTextField + NSTextFieldCell NSView NSWindowTemplate - NSTextFieldCell - NSImageCell - NSButtonCell - NSImageView - NSButton - NSCustomObject YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES - InputPromptDialog + TVCInputPromptDialog FirstResponder @@ -54,7 +51,7 @@ - + 256 YES @@ -75,11 +72,10 @@ {{20, 108}, {67, 65}} - YES - 130560 + 134217728 33554432 NSImage @@ -90,6 +86,7 @@ 0 YES + NO YES @@ -97,11 +94,10 @@ 268 {{105, 156}, {298, 17}} - YES - 69336577 + 69206017 272629760 #infoTitle @@ -129,17 +125,17 @@ + NO 269 {{105, 87}, {302, 61}} - YES - 69336577 + 69206017 272629760 #infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText#infoText @@ -152,17 +148,16 @@ + NO 289 {{310, 12}, {97, 32}} - - YES - 67239424 + 67108864 134217728 Continue @@ -171,46 +166,46 @@ 1044 - -2038284033 + -2038284288 129 DQ 200 25 + NO 289 {{214, 12}, {96, 32}} - YES - 67239424 + 67108864 134217728 Cancel - -2038284033 + -2038284288 129 Gw 200 25 + NO 289 {{108, 57}, {292, 22}} - YES - -1805517311 + -1805647871 272629760 @@ -232,11 +227,10 @@ + NO {420, 188} - - {{0, 0}, {1680, 1028}} @@ -317,7 +311,9 @@ YES 0 - + + YES + @@ -452,62 +448,46 @@ YES YES - 1.IBEditorWindowLastContentRect + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency 1.IBPluginDependency 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect 11.IBPluginDependency - 11.IBViewBoundsToFrameTransform 12.IBPluginDependency 13.IBPluginDependency - 13.IBViewBoundsToFrameTransform 14.IBPluginDependency 15.IBPluginDependency - 15.IBViewBoundsToFrameTransform 16.IBPluginDependency 2.IBPluginDependency - 3.IBViewBoundsToFrameTransform + 3.IBPluginDependency + 4.IBPluginDependency 5.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency - 7.IBViewBoundsToFrameTransform 8.IBPluginDependency - + YES - {{492, 718}, {420, 188}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{492, 718}, {420, 188}} - {196, 240} - {{202, 428}, {480, 270}} com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABDmwAAwigAAA - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABDVgAAwigAAA - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABC2AAAwpoAAA - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - AUEAAABDOQAAA - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABC0gAAwxIAAA - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -525,79 +505,7 @@ 28 - - - YES - - InputPromptDialog - NSObject - - YES - - YES - alternateButton - defaultButton - dialogTitle - dialogWindow - informationalText - userInputField - - - YES - NSButton - NSButton - NSTextField - NSWindow - NSTextField - NSTextField - - - - YES - - YES - alternateButton - defaultButton - dialogTitle - dialogWindow - informationalText - userInputField - - - YES - - alternateButton - NSButton - - - defaultButton - NSButton - - - dialogTitle - NSTextField - - - dialogWindow - NSWindow - - - informationalText - NSTextField - - - userInputField - NSTextField - - - - - IBProjectSource - ./Classes/InputPromptDialog.h - - - - + 0 IBCocoaFramework diff --git a/Main Project (Textual).xcodeproj/project.pbxproj b/Main Project (Textual).xcodeproj/project.pbxproj index 63e2c1a2f1..07503adaf7 100644 --- a/Main Project (Textual).xcodeproj/project.pbxproj +++ b/Main Project (Textual).xcodeproj/project.pbxproj @@ -43,34 +43,34 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 4C46CBEC1580429D00846B64 /* GrowlController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB021580429D00846B64 /* GrowlController.m */; }; - 4C46CBED1580429D00846B64 /* MasterController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB031580429D00846B64 /* MasterController.m */; }; - 4C46CBEE1580429D00846B64 /* MenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB041580429D00846B64 /* MenuController.m */; }; - 4C46CBEF1580429D00846B64 /* NickCompletionStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB051580429D00846B64 /* NickCompletionStatus.m */; }; - 4C46CBF01580429D00846B64 /* AboutPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB071580429D00846B64 /* AboutPanel.m */; }; - 4C46CBF11580429D00846B64 /* AddressBookSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB081580429D00846B64 /* AddressBookSheet.m */; }; - 4C46CBF21580429D00846B64 /* ChanBanExceptionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB091580429D00846B64 /* ChanBanExceptionSheet.m */; }; - 4C46CBF31580429D00846B64 /* ChanBanSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0A1580429D00846B64 /* ChanBanSheet.m */; }; - 4C46CBF41580429D00846B64 /* ChanInviteExceptionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0B1580429D00846B64 /* ChanInviteExceptionSheet.m */; }; - 4C46CBF51580429D00846B64 /* ChannelSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0C1580429D00846B64 /* ChannelSheet.m */; }; - 4C46CBF61580429D00846B64 /* HighlightSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0D1580429D00846B64 /* HighlightSheet.m */; }; - 4C46CBF71580429D00846B64 /* InputPromptDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0E1580429D00846B64 /* InputPromptDialog.m */; }; - 4C46CBF81580429D00846B64 /* InviteSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0F1580429D00846B64 /* InviteSheet.m */; }; - 4C46CBF91580429D00846B64 /* ListDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB101580429D00846B64 /* ListDialog.m */; }; - 4C46CBFA1580429D00846B64 /* ModeSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB111580429D00846B64 /* ModeSheet.m */; }; - 4C46CBFB1580429D00846B64 /* NickSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB121580429D00846B64 /* NickSheet.m */; }; - 4C46CBFC1580429D00846B64 /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB141580429D00846B64 /* PreferencesController.m */; }; - 4C46CBFD1580429D00846B64 /* ScriptsWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB151580429D00846B64 /* ScriptsWrapper.m */; }; - 4C46CBFE1580429D00846B64 /* SoundWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB161580429D00846B64 /* SoundWrapper.m */; }; - 4C46CBFF1580429D00846B64 /* ServerSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB171580429D00846B64 /* ServerSheet.m */; }; - 4C46CC001580429D00846B64 /* SheetBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB181580429D00846B64 /* SheetBase.m */; }; - 4C46CC011580429D00846B64 /* TopicSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB191580429D00846B64 /* TopicSheet.m */; }; - 4C46CC021580429D00846B64 /* WelcomeSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB1A1580429D00846B64 /* WelcomeSheet.m */; }; + 4C46CBEC1580429D00846B64 /* TLOGrowlController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB021580429D00846B64 /* TLOGrowlController.m */; }; + 4C46CBED1580429D00846B64 /* TXMasterController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB031580429D00846B64 /* TXMasterController.m */; }; + 4C46CBEE1580429D00846B64 /* TXMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB041580429D00846B64 /* TXMenuController.m */; }; + 4C46CBEF1580429D00846B64 /* TLONickCompletionStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB051580429D00846B64 /* TLONickCompletionStatus.m */; }; + 4C46CBF01580429D00846B64 /* TDCAboutPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB071580429D00846B64 /* TDCAboutPanel.m */; }; + 4C46CBF11580429D00846B64 /* TDCAddressBookSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB081580429D00846B64 /* TDCAddressBookSheet.m */; }; + 4C46CBF21580429D00846B64 /* TDChanBanExceptionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB091580429D00846B64 /* TDChanBanExceptionSheet.m */; }; + 4C46CBF31580429D00846B64 /* TDChanBanSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0A1580429D00846B64 /* TDChanBanSheet.m */; }; + 4C46CBF41580429D00846B64 /* TDChanInviteExceptionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0B1580429D00846B64 /* TDChanInviteExceptionSheet.m */; }; + 4C46CBF51580429D00846B64 /* TDChannelSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0C1580429D00846B64 /* TDChannelSheet.m */; }; + 4C46CBF61580429D00846B64 /* TDCHighlightSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0D1580429D00846B64 /* TDCHighlightSheet.m */; }; + 4C46CBF71580429D00846B64 /* TVCInputPromptDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0E1580429D00846B64 /* TVCInputPromptDialog.m */; }; + 4C46CBF81580429D00846B64 /* TDCInviteSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB0F1580429D00846B64 /* TDCInviteSheet.m */; }; + 4C46CBF91580429D00846B64 /* TDCListDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB101580429D00846B64 /* TDCListDialog.m */; }; + 4C46CBFA1580429D00846B64 /* TDCModeSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB111580429D00846B64 /* TDCModeSheet.m */; }; + 4C46CBFB1580429D00846B64 /* TDCNickSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB121580429D00846B64 /* TDCNickSheet.m */; }; + 4C46CBFC1580429D00846B64 /* TDCPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB141580429D00846B64 /* TDCPreferencesController.m */; }; + 4C46CBFD1580429D00846B64 /* TDCPreferencesScriptWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB151580429D00846B64 /* TDCPreferencesScriptWrapper.m */; }; + 4C46CBFE1580429D00846B64 /* TDCPreferencesSoundWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB161580429D00846B64 /* TDCPreferencesSoundWrapper.m */; }; + 4C46CBFF1580429D00846B64 /* TDCServerSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB171580429D00846B64 /* TDCServerSheet.m */; }; + 4C46CC001580429D00846B64 /* TDCSheetBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB181580429D00846B64 /* TDCSheetBase.m */; }; + 4C46CC011580429D00846B64 /* TDCTopicSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB191580429D00846B64 /* TDCTopicSheet.m */; }; + 4C46CC021580429D00846B64 /* TDCWelcomeSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB1A1580429D00846B64 /* TDCWelcomeSheet.m */; }; 4C46CC031580429D00846B64 /* DDExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB8E1580429D00846B64 /* DDExtensions.m */; }; - 4C46CC041580429D00846B64 /* DDInvocationGrabber.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB8F1580429D00846B64 /* DDInvocationGrabber.m */; }; + 4C46CC041580429D00846B64 /* DDInvocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB8F1580429D00846B64 /* DDInvocation.m */; }; 4C46CC051580429D00846B64 /* GTMBase64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB901580429D00846B64 /* GTMBase64.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 4C46CC061580429D00846B64 /* GTMNSString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB911580429D00846B64 /* GTMNSString+HTML.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 4C46CC071580429D00846B64 /* GTMNSString+URLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB921580429D00846B64 /* GTMNSString+URLArguments.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 4C46CC061580429D00846B64 /* GTMEncodeHTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB911580429D00846B64 /* GTMEncodeHTML.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 4C46CC071580429D00846B64 /* GTMEncodeURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB921580429D00846B64 /* GTMEncodeURL.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 4C46CC081580429D00846B64 /* NSArrayHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB931580429D00846B64 /* NSArrayHelper.m */; }; 4C46CC091580429D00846B64 /* NSBundleHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB941580429D00846B64 /* NSBundleHelper.m */; }; 4C46CC0A1580429D00846B64 /* NSColorHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CB951580429D00846B64 /* NSColorHelper.m */; }; @@ -86,11 +86,11 @@ 4C46CC151580429D00846B64 /* NSStringHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA01580429D00846B64 /* NSStringHelper.m */; }; 4C46CC161580429D00846B64 /* NSTextFieldHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA11580429D00846B64 /* NSTextFieldHelper.m */; }; 4C46CC171580429D00846B64 /* NSWindowHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA21580429D00846B64 /* NSWindowHelper.m */; }; - 4C46CC181580429D00846B64 /* SoundPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA31580429D00846B64 /* SoundPlayer.m */; }; - 4C46CC191580429D00846B64 /* TextualPluginItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA41580429D00846B64 /* TextualPluginItem.m */; }; - 4C46CC1A1580429D00846B64 /* UnicodeHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA51580429D00846B64 /* UnicodeHelper.m */; }; - 4C46CC1B1580429D00846B64 /* URLOpener.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA61580429D00846B64 /* URLOpener.m */; }; - 4C46CC1C1580429D00846B64 /* AddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA81580429D00846B64 /* AddressBook.m */; }; + 4C46CC181580429D00846B64 /* TLOSoundPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA31580429D00846B64 /* TLOSoundPlayer.m */; }; + 4C46CC191580429D00846B64 /* THOPluginItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA41580429D00846B64 /* THOPluginItem.m */; }; + 4C46CC1A1580429D00846B64 /* THOUnicodeHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA51580429D00846B64 /* THOUnicodeHelper.m */; }; + 4C46CC1B1580429D00846B64 /* TLOpenLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA61580429D00846B64 /* TLOpenLink.m */; }; + 4C46CC1C1580429D00846B64 /* IRCAddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBA81580429D00846B64 /* IRCAddressBook.m */; }; 4C46CC1E1580429D00846B64 /* IRCChannel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBAA1580429D00846B64 /* IRCChannel.m */; }; 4C46CC1F1580429D00846B64 /* IRCChannelConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBAB1580429D00846B64 /* IRCChannelConfig.m */; }; 4C46CC201580429D00846B64 /* IRCChannelMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBAC1580429D00846B64 /* IRCChannelMode.m */; }; @@ -107,65 +107,65 @@ 4C46CC2B1580429D00846B64 /* IRCUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBB71580429D00846B64 /* IRCUser.m */; }; 4C46CC2C1580429D00846B64 /* IRCWorld.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBB81580429D00846B64 /* IRCWorld.m */; }; 4C46CC2D1580429D00846B64 /* IRCWorldConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBB91580429D00846B64 /* IRCWorldConfig.m */; }; - 4C46CC2E1580429D00846B64 /* TimerCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBA1580429D00846B64 /* TimerCommand.m */; }; + 4C46CC2E1580429D00846B64 /* TLOTimerCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBA1580429D00846B64 /* TLOTimerCommand.m */; }; 4C46CC2F1580429D00846B64 /* AGKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBC1580429D00846B64 /* AGKeychain.m */; }; - 4C46CC301580429D00846B64 /* AsyncSocketExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBD1580429D00846B64 /* AsyncSocketExtensions.m */; }; - 4C46CC311580429D00846B64 /* FileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBE1580429D00846B64 /* FileLogger.m */; }; + 4C46CC301580429D00846B64 /* GCDAsyncSocketExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBD1580429D00846B64 /* GCDAsyncSocketExtensions.m */; }; + 4C46CC311580429D00846B64 /* TLOFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBE1580429D00846B64 /* TLOFileLogger.m */; }; 4C46CC321580429D00846B64 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBBF1580429D00846B64 /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = " -fobjc-arc"; }; }; - 4C46CC331580429D00846B64 /* GlobalModels.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC01580429D00846B64 /* GlobalModels.m */; }; - 4C46CC341580429D00846B64 /* InputHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC11580429D00846B64 /* InputHistory.m */; }; + 4C46CC331580429D00846B64 /* TXGlobalModels.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC01580429D00846B64 /* TXGlobalModels.m */; }; + 4C46CC341580429D00846B64 /* TLOInputHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC11580429D00846B64 /* TLOInputHistory.m */; }; 4C46CC351580429D00846B64 /* IRCColorFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC21580429D00846B64 /* IRCColorFormat.m */; }; - 4C46CC361580429D00846B64 /* KeyEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC31580429D00846B64 /* KeyEventHandler.m */; }; - 4C46CC371580429D00846B64 /* LanguagePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC41580429D00846B64 /* LanguagePreferences.m */; }; - 4C46CC381580429D00846B64 /* PopupPrompts.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC51580429D00846B64 /* PopupPrompts.m */; }; + 4C46CC361580429D00846B64 /* TLOKeyEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC31580429D00846B64 /* TLOKeyEventHandler.m */; }; + 4C46CC371580429D00846B64 /* TLOLanguagePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC41580429D00846B64 /* TLOLanguagePreferences.m */; }; + 4C46CC381580429D00846B64 /* TLOPopupPrompts.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC51580429D00846B64 /* TLOPopupPrompts.m */; }; 4C46CC391580429D00846B64 /* RegexKitLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC61580429D00846B64 /* RegexKitLite.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 4C46CC3A1580429D00846B64 /* RLMAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC71580429D00846B64 /* RLMAsyncSocket.m */; settings = {COMPILER_FLAGS = " -fobjc-arc"; }; }; - 4C46CC3B1580429D00846B64 /* TCPClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC81580429D00846B64 /* TCPClient.m */; }; - 4C46CC3C1580429D00846B64 /* Timer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC91580429D00846B64 /* Timer.m */; }; - 4C46CC3D1580429D00846B64 /* TXRegularExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBCA1580429D00846B64 /* TXRegularExpression.m */; }; - 4C46CC3E1580429D00846B64 /* URLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBCB1580429D00846B64 /* URLParser.m */; }; + 4C46CC3B1580429D00846B64 /* TLOSocketClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC81580429D00846B64 /* TLOSocketClient.m */; }; + 4C46CC3C1580429D00846B64 /* TLOTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBC91580429D00846B64 /* TLOTimer.m */; }; + 4C46CC3D1580429D00846B64 /* TLORegularExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBCA1580429D00846B64 /* TLORegularExpression.m */; }; + 4C46CC3E1580429D00846B64 /* TLOLinkParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBCB1580429D00846B64 /* TLOLinkParser.m */; }; 4C46CC3F1580429D00846B64 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBCD1580429D00846B64 /* main.m */; }; - 4C46CC411580429D00846B64 /* FileWithContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD11580429D00846B64 /* FileWithContent.m */; }; - 4C46CC421580429D00846B64 /* OtherTheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD21580429D00846B64 /* OtherTheme.m */; }; - 4C46CC431580429D00846B64 /* Preferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD31580429D00846B64 /* Preferences.m */; }; - 4C46CC441580429D00846B64 /* ViewTheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD41580429D00846B64 /* ViewTheme.m */; }; - 4C46CC451580429D00846B64 /* DockIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD61580429D00846B64 /* DockIcon.m */; }; - 4C46CC461580429D00846B64 /* InputTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD71580429D00846B64 /* InputTextField.m */; }; - 4C46CC471580429D00846B64 /* IRCTextFormatterMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD81580429D00846B64 /* IRCTextFormatterMenu.m */; }; - 4C46CC481580429D00846B64 /* ListSeparatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD91580429D00846B64 /* ListSeparatorCell.m */; }; - 4C46CC491580429D00846B64 /* ListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDA1580429D00846B64 /* ListView.m */; }; - 4C46CC4A1580429D00846B64 /* ImageURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDC1580429D00846B64 /* ImageURLParser.m */; }; - 4C46CC4B1580429D00846B64 /* LogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDD1580429D00846B64 /* LogController.m */; }; - 4C46CC4C1580429D00846B64 /* LogLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDE1580429D00846B64 /* LogLine.m */; }; - 4C46CC4D1580429D00846B64 /* LogPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDF1580429D00846B64 /* LogPolicy.m */; }; - 4C46CC4E1580429D00846B64 /* LogRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE01580429D00846B64 /* LogRenderer.m */; }; - 4C46CC4F1580429D00846B64 /* LogScriptEventSink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE11580429D00846B64 /* LogScriptEventSink.m */; }; - 4C46CC501580429D00846B64 /* LogView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE21580429D00846B64 /* LogView.m */; }; - 4C46CC511580429D00846B64 /* WebViewAutoScroll.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE31580429D00846B64 /* WebViewAutoScroll.m */; }; - 4C46CC521580429D00846B64 /* MainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE41580429D00846B64 /* MainWindow.m */; }; - 4C46CC531580429D00846B64 /* MemberList.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE61580429D00846B64 /* MemberList.m */; }; - 4C46CC541580429D00846B64 /* MemberListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE71580429D00846B64 /* MemberListCell.m */; }; - 4C46CC551580429D00846B64 /* ServerList.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE81580429D00846B64 /* ServerList.m */; }; - 4C46CC561580429D00846B64 /* ServerListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE91580429D00846B64 /* ServerListCell.m */; }; - 4C46CC571580429D00846B64 /* TextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBEA1580429D00846B64 /* TextField.m */; }; - 4C46CC581580429D00846B64 /* ThinSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBEB1580429D00846B64 /* ThinSplitView.m */; }; - 4C46CC7D158042C200846B64 /* AboutPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC5B158042C200846B64 /* AboutPanel.xib */; }; - 4C46CC7E158042C200846B64 /* AddressBookSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC5D158042C200846B64 /* AddressBookSheet.xib */; }; - 4C46CC7F158042C200846B64 /* ChanBanExceptionSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC5F158042C200846B64 /* ChanBanExceptionSheet.xib */; }; - 4C46CC80158042C200846B64 /* ChanBanSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC61158042C200846B64 /* ChanBanSheet.xib */; }; - 4C46CC81158042C200846B64 /* ChanInviteExceptionSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC63158042C200846B64 /* ChanInviteExceptionSheet.xib */; }; - 4C46CC82158042C200846B64 /* ChannelSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC65158042C200846B64 /* ChannelSheet.xib */; }; - 4C46CC83158042C200846B64 /* HighlightSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC67158042C200846B64 /* HighlightSheet.xib */; }; - 4C46CC84158042C200846B64 /* InputPromptDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC69158042C200846B64 /* InputPromptDialog.xib */; }; - 4C46CC85158042C200846B64 /* InviteSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6B158042C200846B64 /* InviteSheet.xib */; }; - 4C46CC86158042C200846B64 /* ListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6D158042C200846B64 /* ListDialog.xib */; }; + 4C46CC411580429D00846B64 /* TLOFileWithContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD11580429D00846B64 /* TLOFileWithContent.m */; }; + 4C46CC421580429D00846B64 /* TPCOtherTheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD21580429D00846B64 /* TPCOtherTheme.m */; }; + 4C46CC431580429D00846B64 /* TPCPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD31580429D00846B64 /* TPCPreferences.m */; }; + 4C46CC441580429D00846B64 /* TPCViewTheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD41580429D00846B64 /* TPCViewTheme.m */; }; + 4C46CC451580429D00846B64 /* TVCDockIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD61580429D00846B64 /* TVCDockIcon.m */; }; + 4C46CC461580429D00846B64 /* TVCInputTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD71580429D00846B64 /* TVCInputTextField.m */; }; + 4C46CC471580429D00846B64 /* TVCTextFormatterMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD81580429D00846B64 /* TVCTextFormatterMenu.m */; }; + 4C46CC481580429D00846B64 /* TVCListSeparatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBD91580429D00846B64 /* TVCListSeparatorCell.m */; }; + 4C46CC491580429D00846B64 /* TVCListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDA1580429D00846B64 /* TVCListView.m */; }; + 4C46CC4A1580429D00846B64 /* TVCImageURLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDC1580429D00846B64 /* TVCImageURLParser.m */; }; + 4C46CC4B1580429D00846B64 /* TVCLogController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDD1580429D00846B64 /* TVCLogController.m */; }; + 4C46CC4C1580429D00846B64 /* TVCLogLine.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDE1580429D00846B64 /* TVCLogLine.m */; }; + 4C46CC4D1580429D00846B64 /* TVCLogPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBDF1580429D00846B64 /* TVCLogPolicy.m */; }; + 4C46CC4E1580429D00846B64 /* LVCLogRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE01580429D00846B64 /* LVCLogRenderer.m */; }; + 4C46CC4F1580429D00846B64 /* TVCLogScriptEventSink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE11580429D00846B64 /* TVCLogScriptEventSink.m */; }; + 4C46CC501580429D00846B64 /* TVCLogView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE21580429D00846B64 /* TVCLogView.m */; }; + 4C46CC511580429D00846B64 /* TVCWebViewAutoScroll.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE31580429D00846B64 /* TVCWebViewAutoScroll.m */; }; + 4C46CC521580429D00846B64 /* TVCMainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE41580429D00846B64 /* TVCMainWindow.m */; }; + 4C46CC531580429D00846B64 /* TVCMemberList.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE61580429D00846B64 /* TVCMemberList.m */; }; + 4C46CC541580429D00846B64 /* TVCMemberListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE71580429D00846B64 /* TVCMemberListCell.m */; }; + 4C46CC551580429D00846B64 /* TVCServerList.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE81580429D00846B64 /* TVCServerList.m */; }; + 4C46CC561580429D00846B64 /* TVCServerListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBE91580429D00846B64 /* TVCServerListCell.m */; }; + 4C46CC571580429D00846B64 /* TVCTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBEA1580429D00846B64 /* TVCTextField.m */; }; + 4C46CC581580429D00846B64 /* TVCThinSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46CBEB1580429D00846B64 /* TVCThinSplitView.m */; }; + 4C46CC7D158042C200846B64 /* TDCAboutPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC5B158042C200846B64 /* TDCAboutPanel.xib */; }; + 4C46CC7E158042C200846B64 /* TDCAddressBookSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC5D158042C200846B64 /* TDCAddressBookSheet.xib */; }; + 4C46CC7F158042C200846B64 /* TDChanBanExceptionSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC5F158042C200846B64 /* TDChanBanExceptionSheet.xib */; }; + 4C46CC80158042C200846B64 /* TDChanBanSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC61158042C200846B64 /* TDChanBanSheet.xib */; }; + 4C46CC81158042C200846B64 /* TDChanInviteExceptionSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC63158042C200846B64 /* TDChanInviteExceptionSheet.xib */; }; + 4C46CC82158042C200846B64 /* TDChannelSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC65158042C200846B64 /* TDChannelSheet.xib */; }; + 4C46CC83158042C200846B64 /* TDCHighlightSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC67158042C200846B64 /* TDCHighlightSheet.xib */; }; + 4C46CC84158042C200846B64 /* TVCInputPromptDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC69158042C200846B64 /* TVCInputPromptDialog.xib */; }; + 4C46CC85158042C200846B64 /* TDCInviteSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6B158042C200846B64 /* TDCInviteSheet.xib */; }; + 4C46CC86158042C200846B64 /* TDCListDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6D158042C200846B64 /* TDCListDialog.xib */; }; 4C46CC87158042C200846B64 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC6F158042C200846B64 /* MainMenu.xib */; }; - 4C46CC88158042C200846B64 /* ModeSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC71158042C200846B64 /* ModeSheet.xib */; }; - 4C46CC89158042C200846B64 /* NickSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC73158042C200846B64 /* NickSheet.xib */; }; - 4C46CC8A158042C200846B64 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC75158042C200846B64 /* Preferences.xib */; }; - 4C46CC8B158042C200846B64 /* ServerSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC77158042C200846B64 /* ServerSheet.xib */; }; - 4C46CC8C158042C200846B64 /* TopicSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC79158042C200846B64 /* TopicSheet.xib */; }; - 4C46CC8D158042C200846B64 /* WelcomeSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC7B158042C200846B64 /* WelcomeSheet.xib */; }; + 4C46CC88158042C200846B64 /* TDCModeSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC71158042C200846B64 /* TDCModeSheet.xib */; }; + 4C46CC89158042C200846B64 /* TDCNickSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC73158042C200846B64 /* TDCNickSheet.xib */; }; + 4C46CC8A158042C200846B64 /* TDCPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC75158042C200846B64 /* TDCPreferences.xib */; }; + 4C46CC8B158042C200846B64 /* TDCServerSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC77158042C200846B64 /* TDCServerSheet.xib */; }; + 4C46CC8C158042C200846B64 /* TDCTopicSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC79158042C200846B64 /* TDCTopicSheet.xib */; }; + 4C46CC8D158042C200846B64 /* TDCWelcomeSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C46CC7B158042C200846B64 /* TDCWelcomeSheet.xib */; }; 4C46CCB71580468900846B64 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C46CCB51580468900846B64 /* libcrypto.dylib */; }; 4C46CCB81580468900846B64 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C46CCB61580468900846B64 /* libicucore.dylib */; }; 4C46CCC41580469E00846B64 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C46CCBB1580469E00846B64 /* AppKit.framework */; }; @@ -236,34 +236,34 @@ 4CCF2F9B15804BF8006FFE21 /* AutoHyperlinks.framework in Copy Additional Frameworks */ = {isa = PBXBuildFile; fileRef = 4CCF2EE61580471B006FFE21 /* AutoHyperlinks.framework */; }; 4CCF2F9C15804BF8006FFE21 /* BlowfishEncryption.framework in Copy Additional Frameworks */ = {isa = PBXBuildFile; fileRef = 4CCF2EE41580470C006FFE21 /* BlowfishEncryption.framework */; }; 4CCF2F9D15804BF8006FFE21 /* Growl.framework in Copy Additional Frameworks */ = {isa = PBXBuildFile; fileRef = 4CCF2EE1158046F9006FFE21 /* Growl.framework */; }; - 4CCF2F9F15804C32006FFE21 /* AboutPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB1C1580429D00846B64 /* AboutPanel.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA015804C32006FFE21 /* AddressBook.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB1D1580429D00846B64 /* AddressBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA115804C32006FFE21 /* AddressBookSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB1E1580429D00846B64 /* AddressBookSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2F9F15804C32006FFE21 /* TDCAboutPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB1C1580429D00846B64 /* TDCAboutPanel.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA015804C32006FFE21 /* IRCAddressBook.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB1D1580429D00846B64 /* IRCAddressBook.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA115804C32006FFE21 /* TDCAddressBookSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB1E1580429D00846B64 /* TDCAddressBookSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FA215804C32006FFE21 /* AGKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB1F1580429D00846B64 /* AGKeychain.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA315804C32006FFE21 /* AsyncSocketExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB201580429D00846B64 /* AsyncSocketExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA415804C32006FFE21 /* ChanBanExceptionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB211580429D00846B64 /* ChanBanExceptionSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA515804C32006FFE21 /* ChanBanSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB221580429D00846B64 /* ChanBanSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA615804C32006FFE21 /* ChanInviteExceptionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB231580429D00846B64 /* ChanInviteExceptionSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA715804C32006FFE21 /* ChannelSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB241580429D00846B64 /* ChannelSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA315804C32006FFE21 /* GCDAsyncSocketExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB201580429D00846B64 /* GCDAsyncSocketExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA415804C32006FFE21 /* TDChanBanExceptionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB211580429D00846B64 /* TDChanBanExceptionSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA515804C32006FFE21 /* TDChanBanSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB221580429D00846B64 /* TDChanBanSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA615804C32006FFE21 /* TDChanInviteExceptionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB231580429D00846B64 /* TDChanInviteExceptionSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA715804C32006FFE21 /* TDChannelSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB241580429D00846B64 /* TDChannelSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FA815804C32006FFE21 /* DDExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB251580429D00846B64 /* DDExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FA915804C32006FFE21 /* DDInvocationGrabber.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB261580429D00846B64 /* DDInvocationGrabber.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FAA15804C32006FFE21 /* DockIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB271580429D00846B64 /* DockIcon.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FAB15804C32006FFE21 /* FileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB281580429D00846B64 /* FileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FAC15804C32006FFE21 /* FileWithContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB291580429D00846B64 /* FileWithContent.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FA915804C32006FFE21 /* DDInvocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB261580429D00846B64 /* DDInvocation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FAA15804C32006FFE21 /* TVCDockIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB271580429D00846B64 /* TVCDockIcon.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FAB15804C32006FFE21 /* TLOFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB281580429D00846B64 /* TLOFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FAC15804C32006FFE21 /* TLOFileWithContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB291580429D00846B64 /* TLOFileWithContent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FAD15804C32006FFE21 /* GCDAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2A1580429D00846B64 /* GCDAsyncSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FAE15804C32006FFE21 /* GlobalModels.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2B1580429D00846B64 /* GlobalModels.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FAF15804C32006FFE21 /* GrowlController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2C1580429D00846B64 /* GrowlController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FAE15804C32006FFE21 /* TXGlobalModels.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2B1580429D00846B64 /* TXGlobalModels.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FAF15804C32006FFE21 /* TLOGrowlController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2C1580429D00846B64 /* TLOGrowlController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FB015804C32006FFE21 /* GTMBase64.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2D1580429D00846B64 /* GTMBase64.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FB115804C32006FFE21 /* GTMDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2E1580429D00846B64 /* GTMDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FB215804C32006FFE21 /* GTMGarbageCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB2F1580429D00846B64 /* GTMGarbageCollection.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FB315804C32006FFE21 /* GTMNSString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB301580429D00846B64 /* GTMNSString+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FB415804C32006FFE21 /* GTMNSString+URLArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB311580429D00846B64 /* GTMNSString+URLArguments.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FB515804C32006FFE21 /* HighlightSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB321580429D00846B64 /* HighlightSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FB615804C32006FFE21 /* ImageURLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB331580429D00846B64 /* ImageURLParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FB715804C32006FFE21 /* InputHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB341580429D00846B64 /* InputHistory.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FB815804C32006FFE21 /* InputPromptDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB351580429D00846B64 /* InputPromptDialog.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FB915804C32006FFE21 /* InputTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB361580429D00846B64 /* InputTextField.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FBA15804C32006FFE21 /* InviteSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB371580429D00846B64 /* InviteSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FB315804C32006FFE21 /* GTMEncodeHTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB301580429D00846B64 /* GTMEncodeHTML.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FB415804C32006FFE21 /* GTMEncodeURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB311580429D00846B64 /* GTMEncodeURL.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FB515804C32006FFE21 /* TDCHighlightSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB321580429D00846B64 /* TDCHighlightSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FB615804C32006FFE21 /* TVCImageURLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB331580429D00846B64 /* TVCImageURLParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FB715804C32006FFE21 /* TLOInputHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB341580429D00846B64 /* TLOInputHistory.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FB815804C32006FFE21 /* TVCInputPromptDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB351580429D00846B64 /* TVCInputPromptDialog.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FB915804C32006FFE21 /* TVCInputTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB361580429D00846B64 /* TVCInputTextField.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FBA15804C32006FFE21 /* TDCInviteSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB371580429D00846B64 /* TDCInviteSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FBB15804C32006FFE21 /* IRC.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB381580429D00846B64 /* IRC.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FBC15804C32006FFE21 /* IRCChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB391580429D00846B64 /* IRCChannel.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FBD15804C32006FFE21 /* IRCChannelConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB3A1580429D00846B64 /* IRCChannelConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -278,30 +278,30 @@ 4CCF2FC615804C32006FFE21 /* IRCModeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB431580429D00846B64 /* IRCModeInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FC715804C32006FFE21 /* IRCPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB441580429D00846B64 /* IRCPrefix.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FC815804C32006FFE21 /* IRCSendingMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB451580429D00846B64 /* IRCSendingMessage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FC915804C32006FFE21 /* IRCTextFormatterMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB461580429D00846B64 /* IRCTextFormatterMenu.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FC915804C32006FFE21 /* TVCTextFormatterMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB461580429D00846B64 /* TVCTextFormatterMenu.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FCA15804C32006FFE21 /* IRCTreeItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB471580429D00846B64 /* IRCTreeItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FCB15804C32006FFE21 /* IRCUser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB481580429D00846B64 /* IRCUser.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FCC15804C32006FFE21 /* IRCWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB491580429D00846B64 /* IRCWorld.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FCD15804C32006FFE21 /* IRCWorldConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4A1580429D00846B64 /* IRCWorldConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FCE15804C32006FFE21 /* KeyEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4B1580429D00846B64 /* KeyEventHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FCF15804C32006FFE21 /* LanguagePreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4C1580429D00846B64 /* LanguagePreferences.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD015804C32006FFE21 /* ListDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4D1580429D00846B64 /* ListDialog.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD115804C32006FFE21 /* ListSeparatorCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4E1580429D00846B64 /* ListSeparatorCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD215804C32006FFE21 /* ListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4F1580429D00846B64 /* ListView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD315804C32006FFE21 /* LogController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB501580429D00846B64 /* LogController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD415804C32006FFE21 /* LogLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB511580429D00846B64 /* LogLine.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD515804C32006FFE21 /* LogPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB521580429D00846B64 /* LogPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD615804C32006FFE21 /* LogRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB531580429D00846B64 /* LogRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD715804C32006FFE21 /* LogScriptEventSink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB541580429D00846B64 /* LogScriptEventSink.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD815804C32006FFE21 /* LogView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB551580429D00846B64 /* LogView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FD915804C32006FFE21 /* MainWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB561580429D00846B64 /* MainWindow.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FDA15804C32006FFE21 /* MasterController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB571580429D00846B64 /* MasterController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FDB15804C32006FFE21 /* MemberList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB581580429D00846B64 /* MemberList.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FDC15804C32006FFE21 /* MemberListCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB591580429D00846B64 /* MemberListCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FDD15804C32006FFE21 /* MenuController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5A1580429D00846B64 /* MenuController.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FDE15804C32006FFE21 /* ModeSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5B1580429D00846B64 /* ModeSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FDF15804C32006FFE21 /* NickCompletionStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5C1580429D00846B64 /* NickCompletionStatus.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FE015804C32006FFE21 /* NickSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5D1580429D00846B64 /* NickSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FCE15804C32006FFE21 /* TLOKeyEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4B1580429D00846B64 /* TLOKeyEventHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FCF15804C32006FFE21 /* TLOLanguagePreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4C1580429D00846B64 /* TLOLanguagePreferences.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD015804C32006FFE21 /* TDCListDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4D1580429D00846B64 /* TDCListDialog.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD115804C32006FFE21 /* TVCListSeparatorCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4E1580429D00846B64 /* TVCListSeparatorCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD215804C32006FFE21 /* TVCListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB4F1580429D00846B64 /* TVCListView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD315804C32006FFE21 /* TVCLogController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB501580429D00846B64 /* TVCLogController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD415804C32006FFE21 /* TVCLogLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB511580429D00846B64 /* TVCLogLine.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD515804C32006FFE21 /* TVCLogPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB521580429D00846B64 /* TVCLogPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD615804C32006FFE21 /* TVCLogRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB531580429D00846B64 /* TVCLogRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD715804C32006FFE21 /* TVCLogScriptEventSink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB541580429D00846B64 /* TVCLogScriptEventSink.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD815804C32006FFE21 /* TVCLogView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB551580429D00846B64 /* TVCLogView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FD915804C32006FFE21 /* TVCMainWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB561580429D00846B64 /* TVCMainWindow.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FDA15804C32006FFE21 /* TXMasterController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB571580429D00846B64 /* TXMasterController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FDB15804C32006FFE21 /* TVCMemberList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB581580429D00846B64 /* TVCMemberList.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FDC15804C32006FFE21 /* TVCMemberListCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB591580429D00846B64 /* TVCMemberListCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FDD15804C32006FFE21 /* TXMenuController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5A1580429D00846B64 /* TXMenuController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FDE15804C32006FFE21 /* TDCModeSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5B1580429D00846B64 /* TDCModeSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FDF15804C32006FFE21 /* TLONickCompletionStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5C1580429D00846B64 /* TLONickCompletionStatus.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FE015804C32006FFE21 /* TDCNickSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5D1580429D00846B64 /* TDCNickSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FE115804C32006FFE21 /* NSArrayHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5E1580429D00846B64 /* NSArrayHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FE215804C32006FFE21 /* NSBundleHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB5F1580429D00846B64 /* NSBundleHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FE315804C32006FFE21 /* NSColorHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB601580429D00846B64 /* NSColorHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -317,36 +317,36 @@ 4CCF2FEE15804C32006FFE21 /* NSStringHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB6B1580429D00846B64 /* NSStringHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FEF15804C32006FFE21 /* NSTextFieldHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB6C1580429D00846B64 /* NSTextFieldHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FF015804C32006FFE21 /* NSWindowHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB6D1580429D00846B64 /* NSWindowHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FF115804C32006FFE21 /* OtherTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB6E1580429D00846B64 /* OtherTheme.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FF215804C32006FFE21 /* PluginProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB6F1580429D00846B64 /* PluginProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FF315804C32006FFE21 /* PopupPrompts.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB701580429D00846B64 /* PopupPrompts.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FF415804C32006FFE21 /* Preferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB711580429D00846B64 /* Preferences.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FF515804C32006FFE21 /* PreferencesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB721580429D00846B64 /* PreferencesController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FF115804C32006FFE21 /* TPCOtherTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB6E1580429D00846B64 /* TPCOtherTheme.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FF215804C32006FFE21 /* THOPluginProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB6F1580429D00846B64 /* THOPluginProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FF315804C32006FFE21 /* TLOPopupPrompts.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB701580429D00846B64 /* TLOPopupPrompts.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FF415804C32006FFE21 /* TPCPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB711580429D00846B64 /* TPCPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FF515804C32006FFE21 /* TDCPreferencesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB721580429D00846B64 /* TDCPreferencesController.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FF615804C32006FFE21 /* RegexKitLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB731580429D00846B64 /* RegexKitLite.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FF715804C32006FFE21 /* RLMAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB741580429D00846B64 /* RLMAsyncSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FF815804C32006FFE21 /* ScriptsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB751580429D00846B64 /* ScriptsWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FF915804C32006FFE21 /* ServerList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB761580429D00846B64 /* ServerList.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FFA15804C32006FFE21 /* ServerListCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB771580429D00846B64 /* ServerListCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FFB15804C32006FFE21 /* ServerSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB781580429D00846B64 /* ServerSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FFC15804C32006FFE21 /* SheetBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB791580429D00846B64 /* SheetBase.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FFD15804C32006FFE21 /* SoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7A1580429D00846B64 /* SoundPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF2FFE15804C32006FFE21 /* SoundWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7B1580429D00846B64 /* SoundWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FF815804C32006FFE21 /* TDCPreferencesScriptWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB751580429D00846B64 /* TDCPreferencesScriptWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FF915804C32006FFE21 /* TVCServerList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB761580429D00846B64 /* TVCServerList.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FFA15804C32006FFE21 /* TVCServerListCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB771580429D00846B64 /* TVCServerListCell.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FFB15804C32006FFE21 /* TDCServerSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB781580429D00846B64 /* TDCServerSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FFC15804C32006FFE21 /* TDCSheetBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB791580429D00846B64 /* TDCSheetBase.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FFD15804C32006FFE21 /* TLOSoundPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7A1580429D00846B64 /* TLOSoundPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF2FFE15804C32006FFE21 /* TDCPreferencesSoundWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7B1580429D00846B64 /* TDCPreferencesSoundWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF2FFF15804C32006FFE21 /* StaticDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7C1580429D00846B64 /* StaticDefinitions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300015804C32006FFE21 /* TCPClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7D1580429D00846B64 /* TCPClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300115804C32006FFE21 /* TextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7E1580429D00846B64 /* TextField.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300015804C32006FFE21 /* TLOSocketClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7D1580429D00846B64 /* TLOSocketClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300115804C32006FFE21 /* TVCTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7E1580429D00846B64 /* TVCTextField.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF300215804C32006FFE21 /* TextualApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB7F1580429D00846B64 /* TextualApplication.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300315804C32006FFE21 /* TextualPluginItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB801580429D00846B64 /* TextualPluginItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300415804C32006FFE21 /* ThinSplitView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB811580429D00846B64 /* ThinSplitView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300515804C32006FFE21 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB821580429D00846B64 /* Timer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300615804C32006FFE21 /* TimerCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB831580429D00846B64 /* TimerCommand.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300715804C32006FFE21 /* TopicSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB841580429D00846B64 /* TopicSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300815804C32006FFE21 /* TXRegularExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB851580429D00846B64 /* TXRegularExpression.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300915804C32006FFE21 /* UnicodeHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB861580429D00846B64 /* UnicodeHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300A15804C32006FFE21 /* URLOpener.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB871580429D00846B64 /* URLOpener.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300B15804C32006FFE21 /* URLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB881580429D00846B64 /* URLParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300D15804C32006FFE21 /* ViewTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB8A1580429D00846B64 /* ViewTheme.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300E15804C32006FFE21 /* WebViewAutoScroll.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB8B1580429D00846B64 /* WebViewAutoScroll.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4CCF300F15804C32006FFE21 /* WelcomeSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB8C1580429D00846B64 /* WelcomeSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300315804C32006FFE21 /* THOPluginItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB801580429D00846B64 /* THOPluginItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300415804C32006FFE21 /* TVCThinSplitView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB811580429D00846B64 /* TVCThinSplitView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300515804C32006FFE21 /* TLOTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB821580429D00846B64 /* TLOTimer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300615804C32006FFE21 /* TLOTimerCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB831580429D00846B64 /* TLOTimerCommand.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300715804C32006FFE21 /* TDCTopicSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB841580429D00846B64 /* TDCTopicSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300815804C32006FFE21 /* TLORegularExpression.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB851580429D00846B64 /* TLORegularExpression.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300915804C32006FFE21 /* THOUnicodeHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB861580429D00846B64 /* THOUnicodeHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300A15804C32006FFE21 /* TLOpenLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB871580429D00846B64 /* TLOpenLink.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300B15804C32006FFE21 /* TLOLinkParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB881580429D00846B64 /* TLOLinkParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300D15804C32006FFE21 /* TPCViewTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB8A1580429D00846B64 /* TPCViewTheme.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300E15804C32006FFE21 /* TVCWebViewAutoScroll.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB8B1580429D00846B64 /* TVCWebViewAutoScroll.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CCF300F15804C32006FFE21 /* TDCWelcomeSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C46CB8C1580429D00846B64 /* TDCWelcomeSheet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4CCF30251580693E006FFE21 /* PLWeakCompatibilityStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CCF30201580693E006FFE21 /* PLWeakCompatibilityStubs.m */; }; /* End PBXBuildFile section */ @@ -437,57 +437,57 @@ /* Begin PBXFileReference section */ 4C1DC5521580420500A47BC9 /* Textual.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Textual.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 4C46CB021580429D00846B64 /* GrowlController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GrowlController.m; sourceTree = ""; }; - 4C46CB031580429D00846B64 /* MasterController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MasterController.m; sourceTree = ""; }; - 4C46CB041580429D00846B64 /* MenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuController.m; sourceTree = ""; }; - 4C46CB051580429D00846B64 /* NickCompletionStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NickCompletionStatus.m; sourceTree = ""; }; - 4C46CB071580429D00846B64 /* AboutPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutPanel.m; sourceTree = ""; }; - 4C46CB081580429D00846B64 /* AddressBookSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddressBookSheet.m; sourceTree = ""; }; - 4C46CB091580429D00846B64 /* ChanBanExceptionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChanBanExceptionSheet.m; sourceTree = ""; }; - 4C46CB0A1580429D00846B64 /* ChanBanSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChanBanSheet.m; sourceTree = ""; }; - 4C46CB0B1580429D00846B64 /* ChanInviteExceptionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChanInviteExceptionSheet.m; sourceTree = ""; }; - 4C46CB0C1580429D00846B64 /* ChannelSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChannelSheet.m; sourceTree = ""; }; - 4C46CB0D1580429D00846B64 /* HighlightSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HighlightSheet.m; sourceTree = ""; }; - 4C46CB0E1580429D00846B64 /* InputPromptDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputPromptDialog.m; sourceTree = ""; }; - 4C46CB0F1580429D00846B64 /* InviteSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InviteSheet.m; sourceTree = ""; }; - 4C46CB101580429D00846B64 /* ListDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListDialog.m; sourceTree = ""; }; - 4C46CB111580429D00846B64 /* ModeSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModeSheet.m; sourceTree = ""; }; - 4C46CB121580429D00846B64 /* NickSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NickSheet.m; sourceTree = ""; }; - 4C46CB141580429D00846B64 /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = ""; }; - 4C46CB151580429D00846B64 /* ScriptsWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScriptsWrapper.m; sourceTree = ""; }; - 4C46CB161580429D00846B64 /* SoundWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SoundWrapper.m; sourceTree = ""; }; - 4C46CB171580429D00846B64 /* ServerSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerSheet.m; sourceTree = ""; }; - 4C46CB181580429D00846B64 /* SheetBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SheetBase.m; sourceTree = ""; }; - 4C46CB191580429D00846B64 /* TopicSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopicSheet.m; sourceTree = ""; }; - 4C46CB1A1580429D00846B64 /* WelcomeSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WelcomeSheet.m; sourceTree = ""; }; - 4C46CB1C1580429D00846B64 /* AboutPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutPanel.h; sourceTree = ""; }; - 4C46CB1D1580429D00846B64 /* AddressBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressBook.h; sourceTree = ""; }; - 4C46CB1E1580429D00846B64 /* AddressBookSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressBookSheet.h; sourceTree = ""; }; + 4C46CB021580429D00846B64 /* TLOGrowlController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TLOGrowlController.m; path = ../Controllers/TLOGrowlController.m; sourceTree = ""; }; + 4C46CB031580429D00846B64 /* TXMasterController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXMasterController.m; sourceTree = ""; }; + 4C46CB041580429D00846B64 /* TXMenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXMenuController.m; sourceTree = ""; }; + 4C46CB051580429D00846B64 /* TLONickCompletionStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TLONickCompletionStatus.m; path = ../Controllers/TLONickCompletionStatus.m; sourceTree = ""; }; + 4C46CB071580429D00846B64 /* TDCAboutPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCAboutPanel.m; sourceTree = ""; }; + 4C46CB081580429D00846B64 /* TDCAddressBookSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCAddressBookSheet.m; sourceTree = ""; }; + 4C46CB091580429D00846B64 /* TDChanBanExceptionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDChanBanExceptionSheet.m; sourceTree = ""; }; + 4C46CB0A1580429D00846B64 /* TDChanBanSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDChanBanSheet.m; sourceTree = ""; }; + 4C46CB0B1580429D00846B64 /* TDChanInviteExceptionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDChanInviteExceptionSheet.m; sourceTree = ""; }; + 4C46CB0C1580429D00846B64 /* TDChannelSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDChannelSheet.m; sourceTree = ""; }; + 4C46CB0D1580429D00846B64 /* TDCHighlightSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCHighlightSheet.m; sourceTree = ""; }; + 4C46CB0E1580429D00846B64 /* TVCInputPromptDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TVCInputPromptDialog.m; path = ../Dialogs/TVCInputPromptDialog.m; sourceTree = ""; }; + 4C46CB0F1580429D00846B64 /* TDCInviteSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCInviteSheet.m; sourceTree = ""; }; + 4C46CB101580429D00846B64 /* TDCListDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCListDialog.m; sourceTree = ""; }; + 4C46CB111580429D00846B64 /* TDCModeSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCModeSheet.m; sourceTree = ""; }; + 4C46CB121580429D00846B64 /* TDCNickSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCNickSheet.m; sourceTree = ""; }; + 4C46CB141580429D00846B64 /* TDCPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCPreferencesController.m; sourceTree = ""; }; + 4C46CB151580429D00846B64 /* TDCPreferencesScriptWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCPreferencesScriptWrapper.m; sourceTree = ""; }; + 4C46CB161580429D00846B64 /* TDCPreferencesSoundWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCPreferencesSoundWrapper.m; sourceTree = ""; }; + 4C46CB171580429D00846B64 /* TDCServerSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCServerSheet.m; sourceTree = ""; }; + 4C46CB181580429D00846B64 /* TDCSheetBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCSheetBase.m; sourceTree = ""; }; + 4C46CB191580429D00846B64 /* TDCTopicSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCTopicSheet.m; sourceTree = ""; }; + 4C46CB1A1580429D00846B64 /* TDCWelcomeSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TDCWelcomeSheet.m; sourceTree = ""; }; + 4C46CB1C1580429D00846B64 /* TDCAboutPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCAboutPanel.h; sourceTree = ""; }; + 4C46CB1D1580429D00846B64 /* IRCAddressBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCAddressBook.h; sourceTree = ""; }; + 4C46CB1E1580429D00846B64 /* TDCAddressBookSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCAddressBookSheet.h; sourceTree = ""; }; 4C46CB1F1580429D00846B64 /* AGKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AGKeychain.h; sourceTree = ""; }; - 4C46CB201580429D00846B64 /* AsyncSocketExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncSocketExtensions.h; sourceTree = ""; }; - 4C46CB211580429D00846B64 /* ChanBanExceptionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChanBanExceptionSheet.h; sourceTree = ""; }; - 4C46CB221580429D00846B64 /* ChanBanSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChanBanSheet.h; sourceTree = ""; }; - 4C46CB231580429D00846B64 /* ChanInviteExceptionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChanInviteExceptionSheet.h; sourceTree = ""; }; - 4C46CB241580429D00846B64 /* ChannelSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChannelSheet.h; sourceTree = ""; }; + 4C46CB201580429D00846B64 /* GCDAsyncSocketExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocketExtensions.h; sourceTree = ""; }; + 4C46CB211580429D00846B64 /* TDChanBanExceptionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDChanBanExceptionSheet.h; sourceTree = ""; }; + 4C46CB221580429D00846B64 /* TDChanBanSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDChanBanSheet.h; sourceTree = ""; }; + 4C46CB231580429D00846B64 /* TDChanInviteExceptionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDChanInviteExceptionSheet.h; sourceTree = ""; }; + 4C46CB241580429D00846B64 /* TDChannelSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDChannelSheet.h; sourceTree = ""; }; 4C46CB251580429D00846B64 /* DDExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDExtensions.h; sourceTree = ""; }; - 4C46CB261580429D00846B64 /* DDInvocationGrabber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDInvocationGrabber.h; sourceTree = ""; }; - 4C46CB271580429D00846B64 /* DockIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DockIcon.h; sourceTree = ""; }; - 4C46CB281580429D00846B64 /* FileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileLogger.h; sourceTree = ""; }; - 4C46CB291580429D00846B64 /* FileWithContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileWithContent.h; sourceTree = ""; }; + 4C46CB261580429D00846B64 /* DDInvocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDInvocation.h; sourceTree = ""; }; + 4C46CB271580429D00846B64 /* TVCDockIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCDockIcon.h; sourceTree = ""; }; + 4C46CB281580429D00846B64 /* TLOFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOFileLogger.h; sourceTree = ""; }; + 4C46CB291580429D00846B64 /* TLOFileWithContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOFileWithContent.h; sourceTree = ""; }; 4C46CB2A1580429D00846B64 /* GCDAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = ""; }; - 4C46CB2B1580429D00846B64 /* GlobalModels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalModels.h; sourceTree = ""; }; - 4C46CB2C1580429D00846B64 /* GrowlController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GrowlController.h; sourceTree = ""; }; + 4C46CB2B1580429D00846B64 /* TXGlobalModels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXGlobalModels.h; sourceTree = ""; }; + 4C46CB2C1580429D00846B64 /* TLOGrowlController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOGrowlController.h; sourceTree = ""; }; 4C46CB2D1580429D00846B64 /* GTMBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMBase64.h; sourceTree = ""; }; 4C46CB2E1580429D00846B64 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = ""; }; 4C46CB2F1580429D00846B64 /* GTMGarbageCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMGarbageCollection.h; sourceTree = ""; }; - 4C46CB301580429D00846B64 /* GTMNSString+HTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+HTML.h"; sourceTree = ""; }; - 4C46CB311580429D00846B64 /* GTMNSString+URLArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+URLArguments.h"; sourceTree = ""; }; - 4C46CB321580429D00846B64 /* HighlightSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HighlightSheet.h; sourceTree = ""; }; - 4C46CB331580429D00846B64 /* ImageURLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageURLParser.h; sourceTree = ""; }; - 4C46CB341580429D00846B64 /* InputHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputHistory.h; sourceTree = ""; }; - 4C46CB351580429D00846B64 /* InputPromptDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputPromptDialog.h; sourceTree = ""; }; - 4C46CB361580429D00846B64 /* InputTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputTextField.h; sourceTree = ""; }; - 4C46CB371580429D00846B64 /* InviteSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InviteSheet.h; sourceTree = ""; }; + 4C46CB301580429D00846B64 /* GTMEncodeHTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMEncodeHTML.h; sourceTree = ""; }; + 4C46CB311580429D00846B64 /* GTMEncodeURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMEncodeURL.h; sourceTree = ""; }; + 4C46CB321580429D00846B64 /* TDCHighlightSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCHighlightSheet.h; sourceTree = ""; }; + 4C46CB331580429D00846B64 /* TVCImageURLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCImageURLParser.h; sourceTree = ""; }; + 4C46CB341580429D00846B64 /* TLOInputHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOInputHistory.h; sourceTree = ""; }; + 4C46CB351580429D00846B64 /* TVCInputPromptDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCInputPromptDialog.h; sourceTree = ""; }; + 4C46CB361580429D00846B64 /* TVCInputTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCInputTextField.h; sourceTree = ""; }; + 4C46CB371580429D00846B64 /* TDCInviteSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCInviteSheet.h; sourceTree = ""; }; 4C46CB381580429D00846B64 /* IRC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRC.h; sourceTree = ""; }; 4C46CB391580429D00846B64 /* IRCChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCChannel.h; sourceTree = ""; }; 4C46CB3A1580429D00846B64 /* IRCChannelConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCChannelConfig.h; sourceTree = ""; }; @@ -502,30 +502,30 @@ 4C46CB431580429D00846B64 /* IRCModeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCModeInfo.h; sourceTree = ""; }; 4C46CB441580429D00846B64 /* IRCPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCPrefix.h; sourceTree = ""; }; 4C46CB451580429D00846B64 /* IRCSendingMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCSendingMessage.h; sourceTree = ""; }; - 4C46CB461580429D00846B64 /* IRCTextFormatterMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCTextFormatterMenu.h; sourceTree = ""; }; + 4C46CB461580429D00846B64 /* TVCTextFormatterMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCTextFormatterMenu.h; sourceTree = ""; }; 4C46CB471580429D00846B64 /* IRCTreeItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCTreeItem.h; sourceTree = ""; }; 4C46CB481580429D00846B64 /* IRCUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCUser.h; sourceTree = ""; }; 4C46CB491580429D00846B64 /* IRCWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCWorld.h; sourceTree = ""; }; 4C46CB4A1580429D00846B64 /* IRCWorldConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRCWorldConfig.h; sourceTree = ""; }; - 4C46CB4B1580429D00846B64 /* KeyEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyEventHandler.h; sourceTree = ""; }; - 4C46CB4C1580429D00846B64 /* LanguagePreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LanguagePreferences.h; sourceTree = ""; }; - 4C46CB4D1580429D00846B64 /* ListDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListDialog.h; sourceTree = ""; }; - 4C46CB4E1580429D00846B64 /* ListSeparatorCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListSeparatorCell.h; sourceTree = ""; }; - 4C46CB4F1580429D00846B64 /* ListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListView.h; sourceTree = ""; }; - 4C46CB501580429D00846B64 /* LogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogController.h; sourceTree = ""; }; - 4C46CB511580429D00846B64 /* LogLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogLine.h; sourceTree = ""; }; - 4C46CB521580429D00846B64 /* LogPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogPolicy.h; sourceTree = ""; }; - 4C46CB531580429D00846B64 /* LogRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogRenderer.h; sourceTree = ""; }; - 4C46CB541580429D00846B64 /* LogScriptEventSink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogScriptEventSink.h; sourceTree = ""; }; - 4C46CB551580429D00846B64 /* LogView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogView.h; sourceTree = ""; }; - 4C46CB561580429D00846B64 /* MainWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainWindow.h; sourceTree = ""; }; - 4C46CB571580429D00846B64 /* MasterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MasterController.h; sourceTree = ""; }; - 4C46CB581580429D00846B64 /* MemberList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemberList.h; sourceTree = ""; }; - 4C46CB591580429D00846B64 /* MemberListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemberListCell.h; sourceTree = ""; }; - 4C46CB5A1580429D00846B64 /* MenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuController.h; sourceTree = ""; }; - 4C46CB5B1580429D00846B64 /* ModeSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModeSheet.h; sourceTree = ""; }; - 4C46CB5C1580429D00846B64 /* NickCompletionStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NickCompletionStatus.h; sourceTree = ""; }; - 4C46CB5D1580429D00846B64 /* NickSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NickSheet.h; sourceTree = ""; }; + 4C46CB4B1580429D00846B64 /* TLOKeyEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOKeyEventHandler.h; sourceTree = ""; }; + 4C46CB4C1580429D00846B64 /* TLOLanguagePreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOLanguagePreferences.h; sourceTree = ""; }; + 4C46CB4D1580429D00846B64 /* TDCListDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCListDialog.h; sourceTree = ""; }; + 4C46CB4E1580429D00846B64 /* TVCListSeparatorCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCListSeparatorCell.h; sourceTree = ""; }; + 4C46CB4F1580429D00846B64 /* TVCListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCListView.h; sourceTree = ""; }; + 4C46CB501580429D00846B64 /* TVCLogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCLogController.h; sourceTree = ""; }; + 4C46CB511580429D00846B64 /* TVCLogLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCLogLine.h; sourceTree = ""; }; + 4C46CB521580429D00846B64 /* TVCLogPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCLogPolicy.h; sourceTree = ""; }; + 4C46CB531580429D00846B64 /* TVCLogRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCLogRenderer.h; sourceTree = ""; }; + 4C46CB541580429D00846B64 /* TVCLogScriptEventSink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCLogScriptEventSink.h; sourceTree = ""; }; + 4C46CB551580429D00846B64 /* TVCLogView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCLogView.h; sourceTree = ""; }; + 4C46CB561580429D00846B64 /* TVCMainWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCMainWindow.h; sourceTree = ""; }; + 4C46CB571580429D00846B64 /* TXMasterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXMasterController.h; sourceTree = ""; }; + 4C46CB581580429D00846B64 /* TVCMemberList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCMemberList.h; sourceTree = ""; }; + 4C46CB591580429D00846B64 /* TVCMemberListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCMemberListCell.h; sourceTree = ""; }; + 4C46CB5A1580429D00846B64 /* TXMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXMenuController.h; sourceTree = ""; }; + 4C46CB5B1580429D00846B64 /* TDCModeSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCModeSheet.h; sourceTree = ""; }; + 4C46CB5C1580429D00846B64 /* TLONickCompletionStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLONickCompletionStatus.h; sourceTree = ""; }; + 4C46CB5D1580429D00846B64 /* TDCNickSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCNickSheet.h; sourceTree = ""; }; 4C46CB5E1580429D00846B64 /* NSArrayHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSArrayHelper.h; sourceTree = ""; }; 4C46CB5F1580429D00846B64 /* NSBundleHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSBundleHelper.h; sourceTree = ""; }; 4C46CB601580429D00846B64 /* NSColorHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSColorHelper.h; sourceTree = ""; }; @@ -541,41 +541,41 @@ 4C46CB6B1580429D00846B64 /* NSStringHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSStringHelper.h; sourceTree = ""; }; 4C46CB6C1580429D00846B64 /* NSTextFieldHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSTextFieldHelper.h; sourceTree = ""; }; 4C46CB6D1580429D00846B64 /* NSWindowHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSWindowHelper.h; sourceTree = ""; }; - 4C46CB6E1580429D00846B64 /* OtherTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OtherTheme.h; sourceTree = ""; }; - 4C46CB6F1580429D00846B64 /* PluginProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProtocol.h; sourceTree = ""; }; - 4C46CB701580429D00846B64 /* PopupPrompts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupPrompts.h; sourceTree = ""; }; - 4C46CB711580429D00846B64 /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Preferences.h; sourceTree = ""; }; - 4C46CB721580429D00846B64 /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = ""; }; + 4C46CB6E1580429D00846B64 /* TPCOtherTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCOtherTheme.h; sourceTree = ""; }; + 4C46CB6F1580429D00846B64 /* THOPluginProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = THOPluginProtocol.h; sourceTree = ""; }; + 4C46CB701580429D00846B64 /* TLOPopupPrompts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOPopupPrompts.h; sourceTree = ""; }; + 4C46CB711580429D00846B64 /* TPCPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCPreferences.h; sourceTree = ""; }; + 4C46CB721580429D00846B64 /* TDCPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCPreferencesController.h; sourceTree = ""; }; 4C46CB731580429D00846B64 /* RegexKitLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegexKitLite.h; sourceTree = ""; }; 4C46CB741580429D00846B64 /* RLMAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RLMAsyncSocket.h; sourceTree = ""; }; - 4C46CB751580429D00846B64 /* ScriptsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptsWrapper.h; sourceTree = ""; }; - 4C46CB761580429D00846B64 /* ServerList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerList.h; sourceTree = ""; }; - 4C46CB771580429D00846B64 /* ServerListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerListCell.h; sourceTree = ""; }; - 4C46CB781580429D00846B64 /* ServerSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerSheet.h; sourceTree = ""; }; - 4C46CB791580429D00846B64 /* SheetBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SheetBase.h; sourceTree = ""; }; - 4C46CB7A1580429D00846B64 /* SoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundPlayer.h; sourceTree = ""; }; - 4C46CB7B1580429D00846B64 /* SoundWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundWrapper.h; sourceTree = ""; }; + 4C46CB751580429D00846B64 /* TDCPreferencesScriptWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCPreferencesScriptWrapper.h; sourceTree = ""; }; + 4C46CB761580429D00846B64 /* TVCServerList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCServerList.h; sourceTree = ""; }; + 4C46CB771580429D00846B64 /* TVCServerListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCServerListCell.h; sourceTree = ""; }; + 4C46CB781580429D00846B64 /* TDCServerSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCServerSheet.h; sourceTree = ""; }; + 4C46CB791580429D00846B64 /* TDCSheetBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCSheetBase.h; sourceTree = ""; }; + 4C46CB7A1580429D00846B64 /* TLOSoundPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOSoundPlayer.h; sourceTree = ""; }; + 4C46CB7B1580429D00846B64 /* TDCPreferencesSoundWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCPreferencesSoundWrapper.h; sourceTree = ""; }; 4C46CB7C1580429D00846B64 /* StaticDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StaticDefinitions.h; path = ../Headers/StaticDefinitions.h; sourceTree = ""; }; - 4C46CB7D1580429D00846B64 /* TCPClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCPClient.h; sourceTree = ""; }; - 4C46CB7E1580429D00846B64 /* TextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextField.h; sourceTree = ""; }; + 4C46CB7D1580429D00846B64 /* TLOSocketClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOSocketClient.h; sourceTree = ""; }; + 4C46CB7E1580429D00846B64 /* TVCTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCTextField.h; sourceTree = ""; }; 4C46CB7F1580429D00846B64 /* TextualApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextualApplication.h; path = ../Headers/TextualApplication.h; sourceTree = ""; }; - 4C46CB801580429D00846B64 /* TextualPluginItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextualPluginItem.h; sourceTree = ""; }; - 4C46CB811580429D00846B64 /* ThinSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThinSplitView.h; sourceTree = ""; }; - 4C46CB821580429D00846B64 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = ""; }; - 4C46CB831580429D00846B64 /* TimerCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimerCommand.h; sourceTree = ""; }; - 4C46CB841580429D00846B64 /* TopicSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopicSheet.h; sourceTree = ""; }; - 4C46CB851580429D00846B64 /* TXRegularExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXRegularExpression.h; sourceTree = ""; }; - 4C46CB861580429D00846B64 /* UnicodeHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnicodeHelper.h; sourceTree = ""; }; - 4C46CB871580429D00846B64 /* URLOpener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLOpener.h; sourceTree = ""; }; - 4C46CB881580429D00846B64 /* URLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLParser.h; sourceTree = ""; }; - 4C46CB8A1580429D00846B64 /* ViewTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewTheme.h; sourceTree = ""; }; - 4C46CB8B1580429D00846B64 /* WebViewAutoScroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewAutoScroll.h; sourceTree = ""; }; - 4C46CB8C1580429D00846B64 /* WelcomeSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelcomeSheet.h; sourceTree = ""; }; + 4C46CB801580429D00846B64 /* THOPluginItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = THOPluginItem.h; sourceTree = ""; }; + 4C46CB811580429D00846B64 /* TVCThinSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCThinSplitView.h; sourceTree = ""; }; + 4C46CB821580429D00846B64 /* TLOTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOTimer.h; sourceTree = ""; }; + 4C46CB831580429D00846B64 /* TLOTimerCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOTimerCommand.h; sourceTree = ""; }; + 4C46CB841580429D00846B64 /* TDCTopicSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCTopicSheet.h; sourceTree = ""; }; + 4C46CB851580429D00846B64 /* TLORegularExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLORegularExpression.h; sourceTree = ""; }; + 4C46CB861580429D00846B64 /* THOUnicodeHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = THOUnicodeHelper.h; sourceTree = ""; }; + 4C46CB871580429D00846B64 /* TLOpenLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOpenLink.h; sourceTree = ""; }; + 4C46CB881580429D00846B64 /* TLOLinkParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLOLinkParser.h; sourceTree = ""; }; + 4C46CB8A1580429D00846B64 /* TPCViewTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCViewTheme.h; sourceTree = ""; }; + 4C46CB8B1580429D00846B64 /* TVCWebViewAutoScroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCWebViewAutoScroll.h; sourceTree = ""; }; + 4C46CB8C1580429D00846B64 /* TDCWelcomeSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDCWelcomeSheet.h; sourceTree = ""; }; 4C46CB8E1580429D00846B64 /* DDExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDExtensions.m; sourceTree = ""; }; - 4C46CB8F1580429D00846B64 /* DDInvocationGrabber.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDInvocationGrabber.m; sourceTree = ""; }; + 4C46CB8F1580429D00846B64 /* DDInvocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDInvocation.m; sourceTree = ""; }; 4C46CB901580429D00846B64 /* GTMBase64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMBase64.m; sourceTree = ""; }; - 4C46CB911580429D00846B64 /* GTMNSString+HTML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+HTML.m"; sourceTree = ""; }; - 4C46CB921580429D00846B64 /* GTMNSString+URLArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+URLArguments.m"; sourceTree = ""; }; + 4C46CB911580429D00846B64 /* GTMEncodeHTML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMEncodeHTML.m; sourceTree = ""; }; + 4C46CB921580429D00846B64 /* GTMEncodeURL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMEncodeURL.m; sourceTree = ""; }; 4C46CB931580429D00846B64 /* NSArrayHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSArrayHelper.m; sourceTree = ""; }; 4C46CB941580429D00846B64 /* NSBundleHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSBundleHelper.m; sourceTree = ""; }; 4C46CB951580429D00846B64 /* NSColorHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSColorHelper.m; sourceTree = ""; }; @@ -591,11 +591,11 @@ 4C46CBA01580429D00846B64 /* NSStringHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSStringHelper.m; sourceTree = ""; }; 4C46CBA11580429D00846B64 /* NSTextFieldHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTextFieldHelper.m; sourceTree = ""; }; 4C46CBA21580429D00846B64 /* NSWindowHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSWindowHelper.m; sourceTree = ""; }; - 4C46CBA31580429D00846B64 /* SoundPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SoundPlayer.m; sourceTree = ""; }; - 4C46CBA41580429D00846B64 /* TextualPluginItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextualPluginItem.m; sourceTree = ""; }; - 4C46CBA51580429D00846B64 /* UnicodeHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnicodeHelper.m; sourceTree = ""; }; - 4C46CBA61580429D00846B64 /* URLOpener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLOpener.m; sourceTree = ""; }; - 4C46CBA81580429D00846B64 /* AddressBook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddressBook.m; sourceTree = ""; }; + 4C46CBA31580429D00846B64 /* TLOSoundPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TLOSoundPlayer.m; path = ../Helpers/TLOSoundPlayer.m; sourceTree = ""; }; + 4C46CBA41580429D00846B64 /* THOPluginItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = THOPluginItem.m; sourceTree = ""; }; + 4C46CBA51580429D00846B64 /* THOUnicodeHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = THOUnicodeHelper.m; sourceTree = ""; }; + 4C46CBA61580429D00846B64 /* TLOpenLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TLOpenLink.m; path = ../Helpers/TLOpenLink.m; sourceTree = ""; }; + 4C46CBA81580429D00846B64 /* IRCAddressBook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCAddressBook.m; sourceTree = ""; }; 4C46CBAA1580429D00846B64 /* IRCChannel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCChannel.m; sourceTree = ""; }; 4C46CBAB1580429D00846B64 /* IRCChannelConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCChannelConfig.m; sourceTree = ""; }; 4C46CBAC1580429D00846B64 /* IRCChannelMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCChannelMode.m; sourceTree = ""; }; @@ -612,66 +612,66 @@ 4C46CBB71580429D00846B64 /* IRCUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCUser.m; sourceTree = ""; }; 4C46CBB81580429D00846B64 /* IRCWorld.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCWorld.m; sourceTree = ""; }; 4C46CBB91580429D00846B64 /* IRCWorldConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCWorldConfig.m; sourceTree = ""; }; - 4C46CBBA1580429D00846B64 /* TimerCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TimerCommand.m; path = ../IRC/TimerCommand.m; sourceTree = ""; }; + 4C46CBBA1580429D00846B64 /* TLOTimerCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TLOTimerCommand.m; path = ../IRC/TLOTimerCommand.m; sourceTree = ""; }; 4C46CBBC1580429D00846B64 /* AGKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AGKeychain.m; sourceTree = ""; }; - 4C46CBBD1580429D00846B64 /* AsyncSocketExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsyncSocketExtensions.m; sourceTree = ""; }; - 4C46CBBE1580429D00846B64 /* FileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileLogger.m; sourceTree = ""; }; + 4C46CBBD1580429D00846B64 /* GCDAsyncSocketExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocketExtensions.m; sourceTree = ""; }; + 4C46CBBE1580429D00846B64 /* TLOFileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOFileLogger.m; sourceTree = ""; }; 4C46CBBF1580429D00846B64 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = ""; }; - 4C46CBC01580429D00846B64 /* GlobalModels.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GlobalModels.m; sourceTree = ""; }; - 4C46CBC11580429D00846B64 /* InputHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputHistory.m; sourceTree = ""; }; + 4C46CBC01580429D00846B64 /* TXGlobalModels.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TXGlobalModels.m; path = ../Library/TXGlobalModels.m; sourceTree = ""; }; + 4C46CBC11580429D00846B64 /* TLOInputHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOInputHistory.m; sourceTree = ""; }; 4C46CBC21580429D00846B64 /* IRCColorFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRCColorFormat.m; sourceTree = ""; }; - 4C46CBC31580429D00846B64 /* KeyEventHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeyEventHandler.m; sourceTree = ""; }; - 4C46CBC41580429D00846B64 /* LanguagePreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LanguagePreferences.m; sourceTree = ""; }; - 4C46CBC51580429D00846B64 /* PopupPrompts.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopupPrompts.m; sourceTree = ""; }; + 4C46CBC31580429D00846B64 /* TLOKeyEventHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOKeyEventHandler.m; sourceTree = ""; }; + 4C46CBC41580429D00846B64 /* TLOLanguagePreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOLanguagePreferences.m; sourceTree = ""; }; + 4C46CBC51580429D00846B64 /* TLOPopupPrompts.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOPopupPrompts.m; sourceTree = ""; }; 4C46CBC61580429D00846B64 /* RegexKitLite.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegexKitLite.m; sourceTree = ""; }; 4C46CBC71580429D00846B64 /* RLMAsyncSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RLMAsyncSocket.m; sourceTree = ""; }; - 4C46CBC81580429D00846B64 /* TCPClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TCPClient.m; sourceTree = ""; }; - 4C46CBC91580429D00846B64 /* Timer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Timer.m; sourceTree = ""; }; - 4C46CBCA1580429D00846B64 /* TXRegularExpression.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXRegularExpression.m; sourceTree = ""; }; - 4C46CBCB1580429D00846B64 /* URLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLParser.m; sourceTree = ""; }; + 4C46CBC81580429D00846B64 /* TLOSocketClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOSocketClient.m; sourceTree = ""; }; + 4C46CBC91580429D00846B64 /* TLOTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOTimer.m; sourceTree = ""; }; + 4C46CBCA1580429D00846B64 /* TLORegularExpression.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLORegularExpression.m; sourceTree = ""; }; + 4C46CBCB1580429D00846B64 /* TLOLinkParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TLOLinkParser.m; sourceTree = ""; }; 4C46CBCD1580429D00846B64 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 4C46CBCE1580429D00846B64 /* Textual_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Textual_Prefix.pch; sourceTree = ""; }; - 4C46CBD11580429D00846B64 /* FileWithContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileWithContent.m; sourceTree = ""; }; - 4C46CBD21580429D00846B64 /* OtherTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OtherTheme.m; sourceTree = ""; }; - 4C46CBD31580429D00846B64 /* Preferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Preferences.m; sourceTree = ""; }; - 4C46CBD41580429D00846B64 /* ViewTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewTheme.m; sourceTree = ""; }; - 4C46CBD61580429D00846B64 /* DockIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DockIcon.m; sourceTree = ""; }; - 4C46CBD71580429D00846B64 /* InputTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InputTextField.m; sourceTree = ""; }; - 4C46CBD81580429D00846B64 /* IRCTextFormatterMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IRCTextFormatterMenu.m; path = ../Views/IRCTextFormatterMenu.m; sourceTree = ""; }; - 4C46CBD91580429D00846B64 /* ListSeparatorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListSeparatorCell.m; sourceTree = ""; }; - 4C46CBDA1580429D00846B64 /* ListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListView.m; sourceTree = ""; }; - 4C46CBDC1580429D00846B64 /* ImageURLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageURLParser.m; sourceTree = ""; }; - 4C46CBDD1580429D00846B64 /* LogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogController.m; sourceTree = ""; }; - 4C46CBDE1580429D00846B64 /* LogLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogLine.m; sourceTree = ""; }; - 4C46CBDF1580429D00846B64 /* LogPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogPolicy.m; sourceTree = ""; }; - 4C46CBE01580429D00846B64 /* LogRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogRenderer.m; sourceTree = ""; }; - 4C46CBE11580429D00846B64 /* LogScriptEventSink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogScriptEventSink.m; sourceTree = ""; }; - 4C46CBE21580429D00846B64 /* LogView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogView.m; sourceTree = ""; }; - 4C46CBE31580429D00846B64 /* WebViewAutoScroll.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewAutoScroll.m; sourceTree = ""; }; - 4C46CBE41580429D00846B64 /* MainWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainWindow.m; sourceTree = ""; }; - 4C46CBE61580429D00846B64 /* MemberList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MemberList.m; sourceTree = ""; }; - 4C46CBE71580429D00846B64 /* MemberListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MemberListCell.m; sourceTree = ""; }; - 4C46CBE81580429D00846B64 /* ServerList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerList.m; sourceTree = ""; }; - 4C46CBE91580429D00846B64 /* ServerListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerListCell.m; sourceTree = ""; }; - 4C46CBEA1580429D00846B64 /* TextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextField.m; sourceTree = ""; }; - 4C46CBEB1580429D00846B64 /* ThinSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThinSplitView.m; sourceTree = ""; }; - 4C46CC5C158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/AboutPanel.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC5E158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/AddressBookSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC60158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ChanBanExceptionSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC62158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ChanBanSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC64158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ChanInviteExceptionSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC66158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ChannelSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC68158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/HighlightSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC6A158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/InputPromptDialog.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC6C158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/InviteSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC6E158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ListDialog.xib; sourceTree = SOURCE_ROOT; }; + 4C46CBD11580429D00846B64 /* TLOFileWithContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TLOFileWithContent.m; path = ../Preferences/TLOFileWithContent.m; sourceTree = ""; }; + 4C46CBD21580429D00846B64 /* TPCOtherTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPCOtherTheme.m; sourceTree = ""; }; + 4C46CBD31580429D00846B64 /* TPCPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPCPreferences.m; sourceTree = ""; }; + 4C46CBD41580429D00846B64 /* TPCViewTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPCViewTheme.m; sourceTree = ""; }; + 4C46CBD61580429D00846B64 /* TVCDockIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCDockIcon.m; sourceTree = ""; }; + 4C46CBD71580429D00846B64 /* TVCInputTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCInputTextField.m; sourceTree = ""; }; + 4C46CBD81580429D00846B64 /* TVCTextFormatterMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCTextFormatterMenu.m; sourceTree = ""; }; + 4C46CBD91580429D00846B64 /* TVCListSeparatorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCListSeparatorCell.m; sourceTree = ""; }; + 4C46CBDA1580429D00846B64 /* TVCListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCListView.m; sourceTree = ""; }; + 4C46CBDC1580429D00846B64 /* TVCImageURLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCImageURLParser.m; sourceTree = ""; }; + 4C46CBDD1580429D00846B64 /* TVCLogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCLogController.m; sourceTree = ""; }; + 4C46CBDE1580429D00846B64 /* TVCLogLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCLogLine.m; sourceTree = ""; }; + 4C46CBDF1580429D00846B64 /* TVCLogPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCLogPolicy.m; sourceTree = ""; }; + 4C46CBE01580429D00846B64 /* LVCLogRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLogRenderer.m; sourceTree = ""; }; + 4C46CBE11580429D00846B64 /* TVCLogScriptEventSink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCLogScriptEventSink.m; sourceTree = ""; }; + 4C46CBE21580429D00846B64 /* TVCLogView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCLogView.m; sourceTree = ""; }; + 4C46CBE31580429D00846B64 /* TVCWebViewAutoScroll.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCWebViewAutoScroll.m; sourceTree = ""; }; + 4C46CBE41580429D00846B64 /* TVCMainWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCMainWindow.m; sourceTree = ""; }; + 4C46CBE61580429D00846B64 /* TVCMemberList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCMemberList.m; sourceTree = ""; }; + 4C46CBE71580429D00846B64 /* TVCMemberListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCMemberListCell.m; sourceTree = ""; }; + 4C46CBE81580429D00846B64 /* TVCServerList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCServerList.m; sourceTree = ""; }; + 4C46CBE91580429D00846B64 /* TVCServerListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCServerListCell.m; sourceTree = ""; }; + 4C46CBEA1580429D00846B64 /* TVCTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCTextField.m; sourceTree = ""; }; + 4C46CBEB1580429D00846B64 /* TVCThinSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVCThinSplitView.m; sourceTree = ""; }; + 4C46CC5C158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCAboutPanel.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC5E158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCAddressBookSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC60158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDChanBanExceptionSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC62158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDChanBanSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC64158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDChanInviteExceptionSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC66158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDChannelSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC68158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCHighlightSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC6A158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TVCInputPromptDialog.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC6C158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCInviteSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC6E158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCListDialog.xib; sourceTree = SOURCE_ROOT; }; 4C46CC70158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC72158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ModeSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC74158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NickSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC76158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC78158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ServerSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC7A158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TopicSheet.xib; sourceTree = SOURCE_ROOT; }; - 4C46CC7C158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/WelcomeSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC72158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCModeSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC74158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCNickSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC76158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCPreferences.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC78158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCServerSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC7A158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCTopicSheet.xib; sourceTree = SOURCE_ROOT; }; + 4C46CC7C158042C200846B64 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TDCWelcomeSheet.xib; sourceTree = SOURCE_ROOT; }; 4C46CCB51580468900846B64 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = ../../../../usr/lib/libcrypto.dylib; sourceTree = ""; }; 4C46CCB61580468900846B64 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = ../../../../usr/lib/libicucore.dylib; sourceTree = ""; }; 4C46CCBB1580469E00846B64 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; @@ -772,6 +772,14 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4C109826158A67AC006A1F97 /* IRC */ = { + isa = PBXGroup; + children = ( + 4C46CCB0158044E200846B64 /* Address Book */, + ); + name = IRC; + sourceTree = ""; + }; 4C1DC5471580420500A47BC9 = { isa = PBXGroup; children = ( @@ -815,15 +823,8 @@ 4C46CB001580429D00846B64 /* Source Code */ = { isa = PBXGroup; children = ( - 4C46CB011580429D00846B64 /* Controllers */, - 4C46CB061580429D00846B64 /* Dialogs */, - 4C46CB1B1580429D00846B64 /* Headers */, - 4C46CB8D1580429D00846B64 /* Helpers */, - 4C46CBA71580429D00846B64 /* IRC */, - 4C46CBBB1580429D00846B64 /* Library */, - 4C46CBCC1580429D00846B64 /* Others */, - 4C46CBD01580429D00846B64 /* Preferences */, - 4C46CBD51580429D00846B64 /* Views */, + 4CEE4D441589B1EA00440072 /* Legacy Code */, + 4CEE4D2F1589AF6900440072 /* Modern Code */, ); name = "Source Code"; path = Classes; @@ -834,10 +835,9 @@ children = ( 4C46CB7C1580429D00846B64 /* StaticDefinitions.h */, 4C46CB7F1580429D00846B64 /* TextualApplication.h */, - 4C46CB021580429D00846B64 /* GrowlController.m */, - 4C46CB031580429D00846B64 /* MasterController.m */, - 4C46CB041580429D00846B64 /* MenuController.m */, - 4C46CB051580429D00846B64 /* NickCompletionStatus.m */, + 4C46CBC01580429D00846B64 /* TXGlobalModels.m */, + 4C46CB031580429D00846B64 /* TXMasterController.m */, + 4C46CB041580429D00846B64 /* TXMenuController.m */, ); path = Controllers; sourceTree = ""; @@ -846,22 +846,21 @@ isa = PBXGroup; children = ( 4C46CB131580429D00846B64 /* Preferences */, - 4C46CB071580429D00846B64 /* AboutPanel.m */, - 4C46CB081580429D00846B64 /* AddressBookSheet.m */, - 4C46CB091580429D00846B64 /* ChanBanExceptionSheet.m */, - 4C46CB0A1580429D00846B64 /* ChanBanSheet.m */, - 4C46CB0B1580429D00846B64 /* ChanInviteExceptionSheet.m */, - 4C46CB0C1580429D00846B64 /* ChannelSheet.m */, - 4C46CB0D1580429D00846B64 /* HighlightSheet.m */, - 4C46CB0E1580429D00846B64 /* InputPromptDialog.m */, - 4C46CB0F1580429D00846B64 /* InviteSheet.m */, - 4C46CB101580429D00846B64 /* ListDialog.m */, - 4C46CB111580429D00846B64 /* ModeSheet.m */, - 4C46CB121580429D00846B64 /* NickSheet.m */, - 4C46CB171580429D00846B64 /* ServerSheet.m */, - 4C46CB181580429D00846B64 /* SheetBase.m */, - 4C46CB191580429D00846B64 /* TopicSheet.m */, - 4C46CB1A1580429D00846B64 /* WelcomeSheet.m */, + 4C46CB071580429D00846B64 /* TDCAboutPanel.m */, + 4C46CB081580429D00846B64 /* TDCAddressBookSheet.m */, + 4C46CB091580429D00846B64 /* TDChanBanExceptionSheet.m */, + 4C46CB0A1580429D00846B64 /* TDChanBanSheet.m */, + 4C46CB0B1580429D00846B64 /* TDChanInviteExceptionSheet.m */, + 4C46CB0C1580429D00846B64 /* TDChannelSheet.m */, + 4C46CB0D1580429D00846B64 /* TDCHighlightSheet.m */, + 4C46CB0F1580429D00846B64 /* TDCInviteSheet.m */, + 4C46CB101580429D00846B64 /* TDCListDialog.m */, + 4C46CB111580429D00846B64 /* TDCModeSheet.m */, + 4C46CB121580429D00846B64 /* TDCNickSheet.m */, + 4C46CB171580429D00846B64 /* TDCServerSheet.m */, + 4C46CB181580429D00846B64 /* TDCSheetBase.m */, + 4C46CB191580429D00846B64 /* TDCTopicSheet.m */, + 4C46CB1A1580429D00846B64 /* TDCWelcomeSheet.m */, ); path = Dialogs; sourceTree = ""; @@ -869,9 +868,9 @@ 4C46CB131580429D00846B64 /* Preferences */ = { isa = PBXGroup; children = ( - 4C46CB141580429D00846B64 /* PreferencesController.m */, - 4C46CB151580429D00846B64 /* ScriptsWrapper.m */, - 4C46CB161580429D00846B64 /* SoundWrapper.m */, + 4C46CB141580429D00846B64 /* TDCPreferencesController.m */, + 4C46CB151580429D00846B64 /* TDCPreferencesScriptWrapper.m */, + 4C46CB161580429D00846B64 /* TDCPreferencesSoundWrapper.m */, ); path = Preferences; sourceTree = ""; @@ -879,35 +878,9 @@ 4C46CB1B1580429D00846B64 /* Headers */ = { isa = PBXGroup; children = ( - 4C46CB1C1580429D00846B64 /* AboutPanel.h */, - 4C46CB1D1580429D00846B64 /* AddressBook.h */, - 4C46CB1E1580429D00846B64 /* AddressBookSheet.h */, - 4C46CB1F1580429D00846B64 /* AGKeychain.h */, - 4C46CB201580429D00846B64 /* AsyncSocketExtensions.h */, - 4C46CB211580429D00846B64 /* ChanBanExceptionSheet.h */, - 4C46CB221580429D00846B64 /* ChanBanSheet.h */, - 4C46CB231580429D00846B64 /* ChanInviteExceptionSheet.h */, - 4C46CB241580429D00846B64 /* ChannelSheet.h */, - 4C46CB251580429D00846B64 /* DDExtensions.h */, - 4C46CB261580429D00846B64 /* DDInvocationGrabber.h */, - 4C46CB271580429D00846B64 /* DockIcon.h */, - 4C46CB281580429D00846B64 /* FileLogger.h */, - 4C46CB291580429D00846B64 /* FileWithContent.h */, - 4C46CB2A1580429D00846B64 /* GCDAsyncSocket.h */, - 4C46CB2B1580429D00846B64 /* GlobalModels.h */, - 4C46CB2C1580429D00846B64 /* GrowlController.h */, - 4C46CB2D1580429D00846B64 /* GTMBase64.h */, - 4C46CB2E1580429D00846B64 /* GTMDefines.h */, - 4C46CB2F1580429D00846B64 /* GTMGarbageCollection.h */, - 4C46CB301580429D00846B64 /* GTMNSString+HTML.h */, - 4C46CB311580429D00846B64 /* GTMNSString+URLArguments.h */, - 4C46CB321580429D00846B64 /* HighlightSheet.h */, - 4C46CB331580429D00846B64 /* ImageURLParser.h */, - 4C46CB341580429D00846B64 /* InputHistory.h */, - 4C46CB351580429D00846B64 /* InputPromptDialog.h */, - 4C46CB361580429D00846B64 /* InputTextField.h */, - 4C46CB371580429D00846B64 /* InviteSheet.h */, + 4CB81B751589CA7600F20A35 /* External Libraries */, 4C46CB381580429D00846B64 /* IRC.h */, + 4C46CB1D1580429D00846B64 /* IRCAddressBook.h */, 4C46CB391580429D00846B64 /* IRCChannel.h */, 4C46CB3A1580429D00846B64 /* IRCChannelConfig.h */, 4C46CB3B1580429D00846B64 /* IRCChannelMode.h */, @@ -921,30 +894,10 @@ 4C46CB431580429D00846B64 /* IRCModeInfo.h */, 4C46CB441580429D00846B64 /* IRCPrefix.h */, 4C46CB451580429D00846B64 /* IRCSendingMessage.h */, - 4C46CB461580429D00846B64 /* IRCTextFormatterMenu.h */, 4C46CB471580429D00846B64 /* IRCTreeItem.h */, 4C46CB481580429D00846B64 /* IRCUser.h */, 4C46CB491580429D00846B64 /* IRCWorld.h */, 4C46CB4A1580429D00846B64 /* IRCWorldConfig.h */, - 4C46CB4B1580429D00846B64 /* KeyEventHandler.h */, - 4C46CB4C1580429D00846B64 /* LanguagePreferences.h */, - 4C46CB4D1580429D00846B64 /* ListDialog.h */, - 4C46CB4E1580429D00846B64 /* ListSeparatorCell.h */, - 4C46CB4F1580429D00846B64 /* ListView.h */, - 4C46CB501580429D00846B64 /* LogController.h */, - 4C46CB511580429D00846B64 /* LogLine.h */, - 4C46CB521580429D00846B64 /* LogPolicy.h */, - 4C46CB531580429D00846B64 /* LogRenderer.h */, - 4C46CB541580429D00846B64 /* LogScriptEventSink.h */, - 4C46CB551580429D00846B64 /* LogView.h */, - 4C46CB561580429D00846B64 /* MainWindow.h */, - 4C46CB571580429D00846B64 /* MasterController.h */, - 4C46CB581580429D00846B64 /* MemberList.h */, - 4C46CB591580429D00846B64 /* MemberListCell.h */, - 4C46CB5A1580429D00846B64 /* MenuController.h */, - 4C46CB5B1580429D00846B64 /* ModeSheet.h */, - 4C46CB5C1580429D00846B64 /* NickCompletionStatus.h */, - 4C46CB5D1580429D00846B64 /* NickSheet.h */, 4C46CB5E1580429D00846B64 /* NSArrayHelper.h */, 4C46CB5F1580429D00846B64 /* NSBundleHelper.h */, 4C46CB601580429D00846B64 /* NSColorHelper.h */, @@ -960,34 +913,71 @@ 4C46CB6B1580429D00846B64 /* NSStringHelper.h */, 4C46CB6C1580429D00846B64 /* NSTextFieldHelper.h */, 4C46CB6D1580429D00846B64 /* NSWindowHelper.h */, - 4C46CB6E1580429D00846B64 /* OtherTheme.h */, - 4C46CB6F1580429D00846B64 /* PluginProtocol.h */, - 4C46CB701580429D00846B64 /* PopupPrompts.h */, - 4C46CB711580429D00846B64 /* Preferences.h */, - 4C46CB721580429D00846B64 /* PreferencesController.h */, 4C46CB731580429D00846B64 /* RegexKitLite.h */, 4C46CB741580429D00846B64 /* RLMAsyncSocket.h */, - 4C46CB751580429D00846B64 /* ScriptsWrapper.h */, - 4C46CB761580429D00846B64 /* ServerList.h */, - 4C46CB771580429D00846B64 /* ServerListCell.h */, - 4C46CB781580429D00846B64 /* ServerSheet.h */, - 4C46CB791580429D00846B64 /* SheetBase.h */, - 4C46CB7A1580429D00846B64 /* SoundPlayer.h */, - 4C46CB7B1580429D00846B64 /* SoundWrapper.h */, - 4C46CB7D1580429D00846B64 /* TCPClient.h */, - 4C46CB7E1580429D00846B64 /* TextField.h */, - 4C46CB801580429D00846B64 /* TextualPluginItem.h */, - 4C46CB811580429D00846B64 /* ThinSplitView.h */, - 4C46CB821580429D00846B64 /* Timer.h */, - 4C46CB831580429D00846B64 /* TimerCommand.h */, - 4C46CB841580429D00846B64 /* TopicSheet.h */, - 4C46CB851580429D00846B64 /* TXRegularExpression.h */, - 4C46CB861580429D00846B64 /* UnicodeHelper.h */, - 4C46CB871580429D00846B64 /* URLOpener.h */, - 4C46CB881580429D00846B64 /* URLParser.h */, - 4C46CB8A1580429D00846B64 /* ViewTheme.h */, - 4C46CB8B1580429D00846B64 /* WebViewAutoScroll.h */, - 4C46CB8C1580429D00846B64 /* WelcomeSheet.h */, + 4C46CB1C1580429D00846B64 /* TDCAboutPanel.h */, + 4C46CB1E1580429D00846B64 /* TDCAddressBookSheet.h */, + 4C46CB211580429D00846B64 /* TDChanBanExceptionSheet.h */, + 4C46CB221580429D00846B64 /* TDChanBanSheet.h */, + 4C46CB231580429D00846B64 /* TDChanInviteExceptionSheet.h */, + 4C46CB241580429D00846B64 /* TDChannelSheet.h */, + 4C46CB321580429D00846B64 /* TDCHighlightSheet.h */, + 4C46CB371580429D00846B64 /* TDCInviteSheet.h */, + 4C46CB4D1580429D00846B64 /* TDCListDialog.h */, + 4C46CB5B1580429D00846B64 /* TDCModeSheet.h */, + 4C46CB5D1580429D00846B64 /* TDCNickSheet.h */, + 4C46CB721580429D00846B64 /* TDCPreferencesController.h */, + 4C46CB751580429D00846B64 /* TDCPreferencesScriptWrapper.h */, + 4C46CB7B1580429D00846B64 /* TDCPreferencesSoundWrapper.h */, + 4C46CB781580429D00846B64 /* TDCServerSheet.h */, + 4C46CB791580429D00846B64 /* TDCSheetBase.h */, + 4C46CB841580429D00846B64 /* TDCTopicSheet.h */, + 4C46CB8C1580429D00846B64 /* TDCWelcomeSheet.h */, + 4C46CB801580429D00846B64 /* THOPluginItem.h */, + 4C46CB6F1580429D00846B64 /* THOPluginProtocol.h */, + 4C46CB861580429D00846B64 /* THOUnicodeHelper.h */, + 4C46CB281580429D00846B64 /* TLOFileLogger.h */, + 4C46CB291580429D00846B64 /* TLOFileWithContent.h */, + 4C46CB2C1580429D00846B64 /* TLOGrowlController.h */, + 4C46CB341580429D00846B64 /* TLOInputHistory.h */, + 4C46CB4B1580429D00846B64 /* TLOKeyEventHandler.h */, + 4C46CB4C1580429D00846B64 /* TLOLanguagePreferences.h */, + 4C46CB881580429D00846B64 /* TLOLinkParser.h */, + 4C46CB5C1580429D00846B64 /* TLONickCompletionStatus.h */, + 4C46CB871580429D00846B64 /* TLOpenLink.h */, + 4C46CB701580429D00846B64 /* TLOPopupPrompts.h */, + 4C46CB851580429D00846B64 /* TLORegularExpression.h */, + 4C46CB7D1580429D00846B64 /* TLOSocketClient.h */, + 4C46CB7A1580429D00846B64 /* TLOSoundPlayer.h */, + 4C46CB821580429D00846B64 /* TLOTimer.h */, + 4C46CB831580429D00846B64 /* TLOTimerCommand.h */, + 4C46CB6E1580429D00846B64 /* TPCOtherTheme.h */, + 4C46CB711580429D00846B64 /* TPCPreferences.h */, + 4C46CB8A1580429D00846B64 /* TPCViewTheme.h */, + 4C46CB271580429D00846B64 /* TVCDockIcon.h */, + 4C46CB331580429D00846B64 /* TVCImageURLParser.h */, + 4C46CB351580429D00846B64 /* TVCInputPromptDialog.h */, + 4C46CB361580429D00846B64 /* TVCInputTextField.h */, + 4C46CB4E1580429D00846B64 /* TVCListSeparatorCell.h */, + 4C46CB4F1580429D00846B64 /* TVCListView.h */, + 4C46CB501580429D00846B64 /* TVCLogController.h */, + 4C46CB511580429D00846B64 /* TVCLogLine.h */, + 4C46CB521580429D00846B64 /* TVCLogPolicy.h */, + 4C46CB531580429D00846B64 /* TVCLogRenderer.h */, + 4C46CB541580429D00846B64 /* TVCLogScriptEventSink.h */, + 4C46CB551580429D00846B64 /* TVCLogView.h */, + 4C46CB561580429D00846B64 /* TVCMainWindow.h */, + 4C46CB581580429D00846B64 /* TVCMemberList.h */, + 4C46CB591580429D00846B64 /* TVCMemberListCell.h */, + 4C46CB761580429D00846B64 /* TVCServerList.h */, + 4C46CB771580429D00846B64 /* TVCServerListCell.h */, + 4C46CB7E1580429D00846B64 /* TVCTextField.h */, + 4C46CB461580429D00846B64 /* TVCTextFormatterMenu.h */, + 4C46CB811580429D00846B64 /* TVCThinSplitView.h */, + 4C46CB8B1580429D00846B64 /* TVCWebViewAutoScroll.h */, + 4C46CB2B1580429D00846B64 /* TXGlobalModels.h */, + 4C46CB571580429D00846B64 /* TXMasterController.h */, + 4C46CB5A1580429D00846B64 /* TXMenuController.h */, ); path = Headers; sourceTree = ""; @@ -995,26 +985,11 @@ 4C46CB8D1580429D00846B64 /* Helpers */ = { isa = PBXGroup; children = ( - 4C46CCB1158044FD00846B64 /* Advanced Threading */, - 4C46CCB31580451800846B64 /* Plugin Architecture */, - 4C46CCB21580450700846B64 /* Google Libraries */, - 4C46CB931580429D00846B64 /* NSArrayHelper.m */, - 4C46CB951580429D00846B64 /* NSColorHelper.m */, - 4C46CB961580429D00846B64 /* NSDataHelper.m */, - 4C46CB971580429D00846B64 /* NSDateHelper.m */, - 4C46CB981580429D00846B64 /* NSDictionaryHelper.m */, - 4C46CB991580429D00846B64 /* NSFontHelper.m */, - 4C46CB9A1580429D00846B64 /* NSNumberHelper.m */, - 4C46CB9C1580429D00846B64 /* NSOutlineViewHelper.m */, - 4C46CB9D1580429D00846B64 /* NSPasteboardHelper.m */, - 4C46CB9E1580429D00846B64 /* NSRectHelper.m */, - 4C46CB9F1580429D00846B64 /* NSSplitViewHelper.m */, - 4C46CBA01580429D00846B64 /* NSStringHelper.m */, - 4C46CBA11580429D00846B64 /* NSTextFieldHelper.m */, - 4C46CBA21580429D00846B64 /* NSWindowHelper.m */, - 4C46CBA31580429D00846B64 /* SoundPlayer.m */, - 4C46CBA51580429D00846B64 /* UnicodeHelper.m */, - 4C46CBA61580429D00846B64 /* URLOpener.m */, + 4CBC619C1589A8F600D7FA20 /* Cocoa (Objective-C) */, + 4CBC61871589A3BB00D7FA20 /* External Libraries */, + 4C46CCB1158044FD00846B64 /* Threading */, + 4C46CBA41580429D00846B64 /* THOPluginItem.m */, + 4C46CBA51580429D00846B64 /* THOUnicodeHelper.m */, ); path = Helpers; sourceTree = ""; @@ -1022,7 +997,6 @@ 4C46CBA71580429D00846B64 /* IRC */ = { isa = PBXGroup; children = ( - 4C46CCB0158044E200846B64 /* Address Book */, 4C46CBAA1580429D00846B64 /* IRCChannel.m */, 4C46CBAB1580429D00846B64 /* IRCChannelConfig.m */, 4C46CBAC1580429D00846B64 /* IRCChannelMode.m */, @@ -1046,21 +1020,23 @@ 4C46CBBB1580429D00846B64 /* Library */ = { isa = PBXGroup; children = ( - 4CCF301A15806902006FFE21 /* ARC Weak Refrences */, 4C46CCAC1580447500846B64 /* Color Formatting */, - 4C46CCAE158044A300846B64 /* Keychain Control */, - 4C46CCAF158044B300846B64 /* Regular Expression */, - 4C46CCAB1580445E00846B64 /* Sockets */, - 4C46CBBE1580429D00846B64 /* FileLogger.m */, - 4C46CBC01580429D00846B64 /* GlobalModels.m */, - 4C46CBC11580429D00846B64 /* InputHistory.m */, - 4C46CBC31580429D00846B64 /* KeyEventHandler.m */, - 4C46CBC41580429D00846B64 /* LanguagePreferences.m */, - 4C46CBC51580429D00846B64 /* PopupPrompts.m */, - 4C46CBC81580429D00846B64 /* TCPClient.m */, - 4C46CBC91580429D00846B64 /* Timer.m */, - 4C46CBBA1580429D00846B64 /* TimerCommand.m */, - 4C46CBCB1580429D00846B64 /* URLParser.m */, + 4C9823DC1589990700F2430A /* External Libraries */, + 4C46CBBE1580429D00846B64 /* TLOFileLogger.m */, + 4C46CBD11580429D00846B64 /* TLOFileWithContent.m */, + 4C46CB021580429D00846B64 /* TLOGrowlController.m */, + 4C46CBC11580429D00846B64 /* TLOInputHistory.m */, + 4C46CBC31580429D00846B64 /* TLOKeyEventHandler.m */, + 4C46CBC41580429D00846B64 /* TLOLanguagePreferences.m */, + 4C46CBCB1580429D00846B64 /* TLOLinkParser.m */, + 4C46CB051580429D00846B64 /* TLONickCompletionStatus.m */, + 4C46CBA61580429D00846B64 /* TLOpenLink.m */, + 4C46CBC51580429D00846B64 /* TLOPopupPrompts.m */, + 4C46CBCA1580429D00846B64 /* TLORegularExpression.m */, + 4C46CBC81580429D00846B64 /* TLOSocketClient.m */, + 4C46CBA31580429D00846B64 /* TLOSoundPlayer.m */, + 4C46CBC91580429D00846B64 /* TLOTimer.m */, + 4C46CBBA1580429D00846B64 /* TLOTimerCommand.m */, ); path = Library; sourceTree = ""; @@ -1077,10 +1053,8 @@ 4C46CBD01580429D00846B64 /* Preferences */ = { isa = PBXGroup; children = ( - 4C46CBD11580429D00846B64 /* FileWithContent.m */, - 4C46CBD21580429D00846B64 /* OtherTheme.m */, - 4C46CBD31580429D00846B64 /* Preferences.m */, - 4C46CBD41580429D00846B64 /* ViewTheme.m */, + 4CBC619D1589A96600D7FA20 /* Themes */, + 4C46CBD31580429D00846B64 /* TPCPreferences.m */, ); path = Preferences; sourceTree = ""; @@ -1092,11 +1066,12 @@ 4C46CCAA1580443200846B64 /* Input Text Field */, 4C46CCA91580442500846B64 /* Server List */, 4C46CBE51580429D00846B64 /* User List */, - 4C46CBD61580429D00846B64 /* DockIcon.m */, - 4C46CBD91580429D00846B64 /* ListSeparatorCell.m */, - 4C46CBDA1580429D00846B64 /* ListView.m */, - 4C46CBE41580429D00846B64 /* MainWindow.m */, - 4C46CBEB1580429D00846B64 /* ThinSplitView.m */, + 4C46CBD61580429D00846B64 /* TVCDockIcon.m */, + 4C46CB0E1580429D00846B64 /* TVCInputPromptDialog.m */, + 4C46CBD91580429D00846B64 /* TVCListSeparatorCell.m */, + 4C46CBDA1580429D00846B64 /* TVCListView.m */, + 4C46CBE41580429D00846B64 /* TVCMainWindow.m */, + 4C46CBEB1580429D00846B64 /* TVCThinSplitView.m */, ); path = Views; sourceTree = ""; @@ -1104,14 +1079,14 @@ 4C46CBDB1580429D00846B64 /* Channel View */ = { isa = PBXGroup; children = ( - 4C46CBDC1580429D00846B64 /* ImageURLParser.m */, - 4C46CBDD1580429D00846B64 /* LogController.m */, - 4C46CBDE1580429D00846B64 /* LogLine.m */, - 4C46CBDF1580429D00846B64 /* LogPolicy.m */, - 4C46CBE01580429D00846B64 /* LogRenderer.m */, - 4C46CBE11580429D00846B64 /* LogScriptEventSink.m */, - 4C46CBE21580429D00846B64 /* LogView.m */, - 4C46CBE31580429D00846B64 /* WebViewAutoScroll.m */, + 4C46CBDC1580429D00846B64 /* TVCImageURLParser.m */, + 4C46CBDD1580429D00846B64 /* TVCLogController.m */, + 4C46CBDE1580429D00846B64 /* TVCLogLine.m */, + 4C46CBDF1580429D00846B64 /* TVCLogPolicy.m */, + 4C46CBE01580429D00846B64 /* LVCLogRenderer.m */, + 4C46CBE11580429D00846B64 /* TVCLogScriptEventSink.m */, + 4C46CBE21580429D00846B64 /* TVCLogView.m */, + 4C46CBE31580429D00846B64 /* TVCWebViewAutoScroll.m */, ); name = "Channel View"; path = Log; @@ -1120,8 +1095,8 @@ 4C46CBE51580429D00846B64 /* User List */ = { isa = PBXGroup; children = ( - 4C46CBE61580429D00846B64 /* MemberList.m */, - 4C46CBE71580429D00846B64 /* MemberListCell.m */, + 4C46CBE61580429D00846B64 /* TVCMemberList.m */, + 4C46CBE71580429D00846B64 /* TVCMemberListCell.m */, ); name = "User List"; path = MemberList; @@ -1130,23 +1105,23 @@ 4C46CC5A158042B600846B64 /* User Interface */ = { isa = PBXGroup; children = ( - 4C46CC5B158042C200846B64 /* AboutPanel.xib */, - 4C46CC5D158042C200846B64 /* AddressBookSheet.xib */, - 4C46CC5F158042C200846B64 /* ChanBanExceptionSheet.xib */, - 4C46CC61158042C200846B64 /* ChanBanSheet.xib */, - 4C46CC63158042C200846B64 /* ChanInviteExceptionSheet.xib */, - 4C46CC65158042C200846B64 /* ChannelSheet.xib */, - 4C46CC67158042C200846B64 /* HighlightSheet.xib */, - 4C46CC69158042C200846B64 /* InputPromptDialog.xib */, - 4C46CC6B158042C200846B64 /* InviteSheet.xib */, - 4C46CC6D158042C200846B64 /* ListDialog.xib */, + 4C46CC5B158042C200846B64 /* TDCAboutPanel.xib */, + 4C46CC5D158042C200846B64 /* TDCAddressBookSheet.xib */, + 4C46CC5F158042C200846B64 /* TDChanBanExceptionSheet.xib */, + 4C46CC61158042C200846B64 /* TDChanBanSheet.xib */, + 4C46CC63158042C200846B64 /* TDChanInviteExceptionSheet.xib */, + 4C46CC65158042C200846B64 /* TDChannelSheet.xib */, + 4C46CC67158042C200846B64 /* TDCHighlightSheet.xib */, + 4C46CC69158042C200846B64 /* TVCInputPromptDialog.xib */, + 4C46CC6B158042C200846B64 /* TDCInviteSheet.xib */, + 4C46CC6D158042C200846B64 /* TDCListDialog.xib */, 4C46CC6F158042C200846B64 /* MainMenu.xib */, - 4C46CC71158042C200846B64 /* ModeSheet.xib */, - 4C46CC73158042C200846B64 /* NickSheet.xib */, - 4C46CC75158042C200846B64 /* Preferences.xib */, - 4C46CC77158042C200846B64 /* ServerSheet.xib */, - 4C46CC79158042C200846B64 /* TopicSheet.xib */, - 4C46CC7B158042C200846B64 /* WelcomeSheet.xib */, + 4C46CC71158042C200846B64 /* TDCModeSheet.xib */, + 4C46CC73158042C200846B64 /* TDCNickSheet.xib */, + 4C46CC75158042C200846B64 /* TDCPreferences.xib */, + 4C46CC77158042C200846B64 /* TDCServerSheet.xib */, + 4C46CC79158042C200846B64 /* TDCTopicSheet.xib */, + 4C46CC7B158042C200846B64 /* TDCWelcomeSheet.xib */, ); name = "User Interface"; sourceTree = ""; @@ -1355,8 +1330,8 @@ 4C46CCA91580442500846B64 /* Server List */ = { isa = PBXGroup; children = ( - 4C46CBE81580429D00846B64 /* ServerList.m */, - 4C46CBE91580429D00846B64 /* ServerListCell.m */, + 4C46CBE81580429D00846B64 /* TVCServerList.m */, + 4C46CBE91580429D00846B64 /* TVCServerListCell.m */, ); name = "Server List"; sourceTree = ""; @@ -1364,8 +1339,9 @@ 4C46CCAA1580443200846B64 /* Input Text Field */ = { isa = PBXGroup; children = ( - 4C46CBD71580429D00846B64 /* InputTextField.m */, - 4C46CBEA1580429D00846B64 /* TextField.m */, + 4C46CBD71580429D00846B64 /* TVCInputTextField.m */, + 4C46CBEA1580429D00846B64 /* TVCTextField.m */, + 4C46CBD81580429D00846B64 /* TVCTextFormatterMenu.m */, ); name = "Input Text Field"; sourceTree = ""; @@ -1373,8 +1349,8 @@ 4C46CCAB1580445E00846B64 /* Sockets */ = { isa = PBXGroup; children = ( - 4C46CBBD1580429D00846B64 /* AsyncSocketExtensions.m */, 4C46CBBF1580429D00846B64 /* GCDAsyncSocket.m */, + 4C46CBBD1580429D00846B64 /* GCDAsyncSocketExtensions.m */, 4C46CBC71580429D00846B64 /* RLMAsyncSocket.m */, ); name = Sockets; @@ -1384,7 +1360,6 @@ isa = PBXGroup; children = ( 4C46CBC21580429D00846B64 /* IRCColorFormat.m */, - 4C46CBD81580429D00846B64 /* IRCTextFormatterMenu.m */, ); name = "Color Formatting"; sourceTree = ""; @@ -1401,7 +1376,6 @@ isa = PBXGroup; children = ( 4C46CBC61580429D00846B64 /* RegexKitLite.m */, - 4C46CBCA1580429D00846B64 /* TXRegularExpression.m */, ); name = "Regular Expression"; sourceTree = ""; @@ -1409,37 +1383,29 @@ 4C46CCB0158044E200846B64 /* Address Book */ = { isa = PBXGroup; children = ( - 4C46CBA81580429D00846B64 /* AddressBook.m */, + 4C46CBA81580429D00846B64 /* IRCAddressBook.m */, ); name = "Address Book"; + path = IRC; sourceTree = ""; }; - 4C46CCB1158044FD00846B64 /* Advanced Threading */ = { + 4C46CCB1158044FD00846B64 /* Threading */ = { isa = PBXGroup; children = ( 4C46CB8E1580429D00846B64 /* DDExtensions.m */, - 4C46CB8F1580429D00846B64 /* DDInvocationGrabber.m */, + 4C46CB8F1580429D00846B64 /* DDInvocation.m */, ); - name = "Advanced Threading"; + name = Threading; sourceTree = ""; }; - 4C46CCB21580450700846B64 /* Google Libraries */ = { + 4C46CCB21580450700846B64 /* Google */ = { isa = PBXGroup; children = ( 4C46CB901580429D00846B64 /* GTMBase64.m */, - 4C46CB911580429D00846B64 /* GTMNSString+HTML.m */, - 4C46CB921580429D00846B64 /* GTMNSString+URLArguments.m */, + 4C46CB911580429D00846B64 /* GTMEncodeHTML.m */, + 4C46CB921580429D00846B64 /* GTMEncodeURL.m */, ); - name = "Google Libraries"; - sourceTree = ""; - }; - 4C46CCB31580451800846B64 /* Plugin Architecture */ = { - isa = PBXGroup; - children = ( - 4C46CB941580429D00846B64 /* NSBundleHelper.m */, - 4C46CBA41580429D00846B64 /* TextualPluginItem.m */, - ); - name = "Plugin Architecture"; + name = Google; sourceTree = ""; }; 4C46CCB41580466C00846B64 /* System Libraries */ = { @@ -1476,6 +1442,73 @@ name = "External Frameworks"; sourceTree = ""; }; + 4C9823DC1589990700F2430A /* External Libraries */ = { + isa = PBXGroup; + children = ( + 4CCF301A15806902006FFE21 /* ARC Weak Refrences */, + 4C46CCAE158044A300846B64 /* Keychain Control */, + 4C46CCAF158044B300846B64 /* Regular Expression */, + 4C46CCAB1580445E00846B64 /* Sockets */, + ); + name = "External Libraries"; + sourceTree = ""; + }; + 4CB81B751589CA7600F20A35 /* External Libraries */ = { + isa = PBXGroup; + children = ( + 4C46CB1F1580429D00846B64 /* AGKeychain.h */, + 4C46CB251580429D00846B64 /* DDExtensions.h */, + 4C46CB261580429D00846B64 /* DDInvocation.h */, + 4C46CB2A1580429D00846B64 /* GCDAsyncSocket.h */, + 4C46CB201580429D00846B64 /* GCDAsyncSocketExtensions.h */, + 4C46CB2D1580429D00846B64 /* GTMBase64.h */, + 4C46CB2E1580429D00846B64 /* GTMDefines.h */, + 4C46CB2F1580429D00846B64 /* GTMGarbageCollection.h */, + 4C46CB301580429D00846B64 /* GTMEncodeHTML.h */, + 4C46CB311580429D00846B64 /* GTMEncodeURL.h */, + ); + name = "External Libraries"; + sourceTree = ""; + }; + 4CBC61871589A3BB00D7FA20 /* External Libraries */ = { + isa = PBXGroup; + children = ( + 4C46CCB21580450700846B64 /* Google */, + ); + name = "External Libraries"; + sourceTree = ""; + }; + 4CBC619C1589A8F600D7FA20 /* Cocoa (Objective-C) */ = { + isa = PBXGroup; + children = ( + 4C46CB931580429D00846B64 /* NSArrayHelper.m */, + 4C46CB941580429D00846B64 /* NSBundleHelper.m */, + 4C46CB951580429D00846B64 /* NSColorHelper.m */, + 4C46CB961580429D00846B64 /* NSDataHelper.m */, + 4C46CB971580429D00846B64 /* NSDateHelper.m */, + 4C46CB981580429D00846B64 /* NSDictionaryHelper.m */, + 4C46CB991580429D00846B64 /* NSFontHelper.m */, + 4C46CB9A1580429D00846B64 /* NSNumberHelper.m */, + 4C46CB9C1580429D00846B64 /* NSOutlineViewHelper.m */, + 4C46CB9D1580429D00846B64 /* NSPasteboardHelper.m */, + 4C46CB9E1580429D00846B64 /* NSRectHelper.m */, + 4C46CB9F1580429D00846B64 /* NSSplitViewHelper.m */, + 4C46CBA01580429D00846B64 /* NSStringHelper.m */, + 4C46CBA11580429D00846B64 /* NSTextFieldHelper.m */, + 4C46CBA21580429D00846B64 /* NSWindowHelper.m */, + ); + name = "Cocoa (Objective-C)"; + sourceTree = ""; + }; + 4CBC619D1589A96600D7FA20 /* Themes */ = { + isa = PBXGroup; + children = ( + 4C46CBD21580429D00846B64 /* TPCOtherTheme.m */, + 4C46CBD41580429D00846B64 /* TPCViewTheme.m */, + ); + name = Themes; + sourceTree = ""; + }; 4CCF2F561580489C006FFE21 /* Products */ = { isa = PBXGroup; children = ( @@ -1508,6 +1541,30 @@ name = "ARC Weak Refrences"; sourceTree = ""; }; + 4CEE4D2F1589AF6900440072 /* Modern Code */ = { + isa = PBXGroup; + children = ( + 4C46CB011580429D00846B64 /* Controllers */, + 4C46CB061580429D00846B64 /* Dialogs */, + 4C46CB1B1580429D00846B64 /* Headers */, + 4C46CB8D1580429D00846B64 /* Helpers */, + 4C109826158A67AC006A1F97 /* IRC */, + 4C46CBBB1580429D00846B64 /* Library */, + 4C46CBCC1580429D00846B64 /* Others */, + 4C46CBD01580429D00846B64 /* Preferences */, + 4C46CBD51580429D00846B64 /* Views */, + ); + name = "Modern Code"; + sourceTree = ""; + }; + 4CEE4D441589B1EA00440072 /* Legacy Code */ = { + isa = PBXGroup; + children = ( + 4C46CBA71580429D00846B64 /* IRC */, + ); + name = "Legacy Code"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -1515,34 +1572,34 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4CCF2F9F15804C32006FFE21 /* AboutPanel.h in Headers */, - 4CCF2FA015804C32006FFE21 /* AddressBook.h in Headers */, - 4CCF2FA115804C32006FFE21 /* AddressBookSheet.h in Headers */, + 4CCF2F9F15804C32006FFE21 /* TDCAboutPanel.h in Headers */, + 4CCF2FA015804C32006FFE21 /* IRCAddressBook.h in Headers */, + 4CCF2FA115804C32006FFE21 /* TDCAddressBookSheet.h in Headers */, 4CCF2FA215804C32006FFE21 /* AGKeychain.h in Headers */, - 4CCF2FA315804C32006FFE21 /* AsyncSocketExtensions.h in Headers */, - 4CCF2FA415804C32006FFE21 /* ChanBanExceptionSheet.h in Headers */, - 4CCF2FA515804C32006FFE21 /* ChanBanSheet.h in Headers */, - 4CCF2FA615804C32006FFE21 /* ChanInviteExceptionSheet.h in Headers */, - 4CCF2FA715804C32006FFE21 /* ChannelSheet.h in Headers */, + 4CCF2FA315804C32006FFE21 /* GCDAsyncSocketExtensions.h in Headers */, + 4CCF2FA415804C32006FFE21 /* TDChanBanExceptionSheet.h in Headers */, + 4CCF2FA515804C32006FFE21 /* TDChanBanSheet.h in Headers */, + 4CCF2FA615804C32006FFE21 /* TDChanInviteExceptionSheet.h in Headers */, + 4CCF2FA715804C32006FFE21 /* TDChannelSheet.h in Headers */, 4CCF2FA815804C32006FFE21 /* DDExtensions.h in Headers */, - 4CCF2FA915804C32006FFE21 /* DDInvocationGrabber.h in Headers */, - 4CCF2FAA15804C32006FFE21 /* DockIcon.h in Headers */, - 4CCF2FAB15804C32006FFE21 /* FileLogger.h in Headers */, - 4CCF2FAC15804C32006FFE21 /* FileWithContent.h in Headers */, + 4CCF2FA915804C32006FFE21 /* DDInvocation.h in Headers */, + 4CCF2FAA15804C32006FFE21 /* TVCDockIcon.h in Headers */, + 4CCF2FAB15804C32006FFE21 /* TLOFileLogger.h in Headers */, + 4CCF2FAC15804C32006FFE21 /* TLOFileWithContent.h in Headers */, 4CCF2FAD15804C32006FFE21 /* GCDAsyncSocket.h in Headers */, - 4CCF2FAE15804C32006FFE21 /* GlobalModels.h in Headers */, - 4CCF2FAF15804C32006FFE21 /* GrowlController.h in Headers */, + 4CCF2FAE15804C32006FFE21 /* TXGlobalModels.h in Headers */, + 4CCF2FAF15804C32006FFE21 /* TLOGrowlController.h in Headers */, 4CCF2FB015804C32006FFE21 /* GTMBase64.h in Headers */, 4CCF2FB115804C32006FFE21 /* GTMDefines.h in Headers */, 4CCF2FB215804C32006FFE21 /* GTMGarbageCollection.h in Headers */, - 4CCF2FB315804C32006FFE21 /* GTMNSString+HTML.h in Headers */, - 4CCF2FB415804C32006FFE21 /* GTMNSString+URLArguments.h in Headers */, - 4CCF2FB515804C32006FFE21 /* HighlightSheet.h in Headers */, - 4CCF2FB615804C32006FFE21 /* ImageURLParser.h in Headers */, - 4CCF2FB715804C32006FFE21 /* InputHistory.h in Headers */, - 4CCF2FB815804C32006FFE21 /* InputPromptDialog.h in Headers */, - 4CCF2FB915804C32006FFE21 /* InputTextField.h in Headers */, - 4CCF2FBA15804C32006FFE21 /* InviteSheet.h in Headers */, + 4CCF2FB315804C32006FFE21 /* GTMEncodeHTML.h in Headers */, + 4CCF2FB415804C32006FFE21 /* GTMEncodeURL.h in Headers */, + 4CCF2FB515804C32006FFE21 /* TDCHighlightSheet.h in Headers */, + 4CCF2FB615804C32006FFE21 /* TVCImageURLParser.h in Headers */, + 4CCF2FB715804C32006FFE21 /* TLOInputHistory.h in Headers */, + 4CCF2FB815804C32006FFE21 /* TVCInputPromptDialog.h in Headers */, + 4CCF2FB915804C32006FFE21 /* TVCInputTextField.h in Headers */, + 4CCF2FBA15804C32006FFE21 /* TDCInviteSheet.h in Headers */, 4CCF2FBB15804C32006FFE21 /* IRC.h in Headers */, 4CCF2FBC15804C32006FFE21 /* IRCChannel.h in Headers */, 4CCF2FBD15804C32006FFE21 /* IRCChannelConfig.h in Headers */, @@ -1557,30 +1614,30 @@ 4CCF2FC615804C32006FFE21 /* IRCModeInfo.h in Headers */, 4CCF2FC715804C32006FFE21 /* IRCPrefix.h in Headers */, 4CCF2FC815804C32006FFE21 /* IRCSendingMessage.h in Headers */, - 4CCF2FC915804C32006FFE21 /* IRCTextFormatterMenu.h in Headers */, + 4CCF2FC915804C32006FFE21 /* TVCTextFormatterMenu.h in Headers */, 4CCF2FCA15804C32006FFE21 /* IRCTreeItem.h in Headers */, 4CCF2FCB15804C32006FFE21 /* IRCUser.h in Headers */, 4CCF2FCC15804C32006FFE21 /* IRCWorld.h in Headers */, 4CCF2FCD15804C32006FFE21 /* IRCWorldConfig.h in Headers */, - 4CCF2FCE15804C32006FFE21 /* KeyEventHandler.h in Headers */, - 4CCF2FCF15804C32006FFE21 /* LanguagePreferences.h in Headers */, - 4CCF2FD015804C32006FFE21 /* ListDialog.h in Headers */, - 4CCF2FD115804C32006FFE21 /* ListSeparatorCell.h in Headers */, - 4CCF2FD215804C32006FFE21 /* ListView.h in Headers */, - 4CCF2FD315804C32006FFE21 /* LogController.h in Headers */, - 4CCF2FD415804C32006FFE21 /* LogLine.h in Headers */, - 4CCF2FD515804C32006FFE21 /* LogPolicy.h in Headers */, - 4CCF2FD615804C32006FFE21 /* LogRenderer.h in Headers */, - 4CCF2FD715804C32006FFE21 /* LogScriptEventSink.h in Headers */, - 4CCF2FD815804C32006FFE21 /* LogView.h in Headers */, - 4CCF2FD915804C32006FFE21 /* MainWindow.h in Headers */, - 4CCF2FDA15804C32006FFE21 /* MasterController.h in Headers */, - 4CCF2FDB15804C32006FFE21 /* MemberList.h in Headers */, - 4CCF2FDC15804C32006FFE21 /* MemberListCell.h in Headers */, - 4CCF2FDD15804C32006FFE21 /* MenuController.h in Headers */, - 4CCF2FDE15804C32006FFE21 /* ModeSheet.h in Headers */, - 4CCF2FDF15804C32006FFE21 /* NickCompletionStatus.h in Headers */, - 4CCF2FE015804C32006FFE21 /* NickSheet.h in Headers */, + 4CCF2FCE15804C32006FFE21 /* TLOKeyEventHandler.h in Headers */, + 4CCF2FCF15804C32006FFE21 /* TLOLanguagePreferences.h in Headers */, + 4CCF2FD015804C32006FFE21 /* TDCListDialog.h in Headers */, + 4CCF2FD115804C32006FFE21 /* TVCListSeparatorCell.h in Headers */, + 4CCF2FD215804C32006FFE21 /* TVCListView.h in Headers */, + 4CCF2FD315804C32006FFE21 /* TVCLogController.h in Headers */, + 4CCF2FD415804C32006FFE21 /* TVCLogLine.h in Headers */, + 4CCF2FD515804C32006FFE21 /* TVCLogPolicy.h in Headers */, + 4CCF2FD615804C32006FFE21 /* TVCLogRenderer.h in Headers */, + 4CCF2FD715804C32006FFE21 /* TVCLogScriptEventSink.h in Headers */, + 4CCF2FD815804C32006FFE21 /* TVCLogView.h in Headers */, + 4CCF2FD915804C32006FFE21 /* TVCMainWindow.h in Headers */, + 4CCF2FDA15804C32006FFE21 /* TXMasterController.h in Headers */, + 4CCF2FDB15804C32006FFE21 /* TVCMemberList.h in Headers */, + 4CCF2FDC15804C32006FFE21 /* TVCMemberListCell.h in Headers */, + 4CCF2FDD15804C32006FFE21 /* TXMenuController.h in Headers */, + 4CCF2FDE15804C32006FFE21 /* TDCModeSheet.h in Headers */, + 4CCF2FDF15804C32006FFE21 /* TLONickCompletionStatus.h in Headers */, + 4CCF2FE015804C32006FFE21 /* TDCNickSheet.h in Headers */, 4CCF2FE115804C32006FFE21 /* NSArrayHelper.h in Headers */, 4CCF2FE215804C32006FFE21 /* NSBundleHelper.h in Headers */, 4CCF2FE315804C32006FFE21 /* NSColorHelper.h in Headers */, @@ -1596,36 +1653,36 @@ 4CCF2FEE15804C32006FFE21 /* NSStringHelper.h in Headers */, 4CCF2FEF15804C32006FFE21 /* NSTextFieldHelper.h in Headers */, 4CCF2FF015804C32006FFE21 /* NSWindowHelper.h in Headers */, - 4CCF2FF115804C32006FFE21 /* OtherTheme.h in Headers */, - 4CCF2FF215804C32006FFE21 /* PluginProtocol.h in Headers */, - 4CCF2FF315804C32006FFE21 /* PopupPrompts.h in Headers */, - 4CCF2FF415804C32006FFE21 /* Preferences.h in Headers */, - 4CCF2FF515804C32006FFE21 /* PreferencesController.h in Headers */, + 4CCF2FF115804C32006FFE21 /* TPCOtherTheme.h in Headers */, + 4CCF2FF215804C32006FFE21 /* THOPluginProtocol.h in Headers */, + 4CCF2FF315804C32006FFE21 /* TLOPopupPrompts.h in Headers */, + 4CCF2FF415804C32006FFE21 /* TPCPreferences.h in Headers */, + 4CCF2FF515804C32006FFE21 /* TDCPreferencesController.h in Headers */, 4CCF2FF615804C32006FFE21 /* RegexKitLite.h in Headers */, 4CCF2FF715804C32006FFE21 /* RLMAsyncSocket.h in Headers */, - 4CCF2FF815804C32006FFE21 /* ScriptsWrapper.h in Headers */, - 4CCF2FF915804C32006FFE21 /* ServerList.h in Headers */, - 4CCF2FFA15804C32006FFE21 /* ServerListCell.h in Headers */, - 4CCF2FFB15804C32006FFE21 /* ServerSheet.h in Headers */, - 4CCF2FFC15804C32006FFE21 /* SheetBase.h in Headers */, - 4CCF2FFD15804C32006FFE21 /* SoundPlayer.h in Headers */, - 4CCF2FFE15804C32006FFE21 /* SoundWrapper.h in Headers */, + 4CCF2FF815804C32006FFE21 /* TDCPreferencesScriptWrapper.h in Headers */, + 4CCF2FF915804C32006FFE21 /* TVCServerList.h in Headers */, + 4CCF2FFA15804C32006FFE21 /* TVCServerListCell.h in Headers */, + 4CCF2FFB15804C32006FFE21 /* TDCServerSheet.h in Headers */, + 4CCF2FFC15804C32006FFE21 /* TDCSheetBase.h in Headers */, + 4CCF2FFD15804C32006FFE21 /* TLOSoundPlayer.h in Headers */, + 4CCF2FFE15804C32006FFE21 /* TDCPreferencesSoundWrapper.h in Headers */, 4CCF2FFF15804C32006FFE21 /* StaticDefinitions.h in Headers */, - 4CCF300015804C32006FFE21 /* TCPClient.h in Headers */, - 4CCF300115804C32006FFE21 /* TextField.h in Headers */, + 4CCF300015804C32006FFE21 /* TLOSocketClient.h in Headers */, + 4CCF300115804C32006FFE21 /* TVCTextField.h in Headers */, 4CCF300215804C32006FFE21 /* TextualApplication.h in Headers */, - 4CCF300315804C32006FFE21 /* TextualPluginItem.h in Headers */, - 4CCF300415804C32006FFE21 /* ThinSplitView.h in Headers */, - 4CCF300515804C32006FFE21 /* Timer.h in Headers */, - 4CCF300615804C32006FFE21 /* TimerCommand.h in Headers */, - 4CCF300715804C32006FFE21 /* TopicSheet.h in Headers */, - 4CCF300815804C32006FFE21 /* TXRegularExpression.h in Headers */, - 4CCF300915804C32006FFE21 /* UnicodeHelper.h in Headers */, - 4CCF300A15804C32006FFE21 /* URLOpener.h in Headers */, - 4CCF300B15804C32006FFE21 /* URLParser.h in Headers */, - 4CCF300D15804C32006FFE21 /* ViewTheme.h in Headers */, - 4CCF300E15804C32006FFE21 /* WebViewAutoScroll.h in Headers */, - 4CCF300F15804C32006FFE21 /* WelcomeSheet.h in Headers */, + 4CCF300315804C32006FFE21 /* THOPluginItem.h in Headers */, + 4CCF300415804C32006FFE21 /* TVCThinSplitView.h in Headers */, + 4CCF300515804C32006FFE21 /* TLOTimer.h in Headers */, + 4CCF300615804C32006FFE21 /* TLOTimerCommand.h in Headers */, + 4CCF300715804C32006FFE21 /* TDCTopicSheet.h in Headers */, + 4CCF300815804C32006FFE21 /* TLORegularExpression.h in Headers */, + 4CCF300915804C32006FFE21 /* THOUnicodeHelper.h in Headers */, + 4CCF300A15804C32006FFE21 /* TLOpenLink.h in Headers */, + 4CCF300B15804C32006FFE21 /* TLOLinkParser.h in Headers */, + 4CCF300D15804C32006FFE21 /* TPCViewTheme.h in Headers */, + 4CCF300E15804C32006FFE21 /* TVCWebViewAutoScroll.h in Headers */, + 4CCF300F15804C32006FFE21 /* TDCWelcomeSheet.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1730,23 +1787,23 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4C46CC7D158042C200846B64 /* AboutPanel.xib in Resources */, - 4C46CC7E158042C200846B64 /* AddressBookSheet.xib in Resources */, - 4C46CC7F158042C200846B64 /* ChanBanExceptionSheet.xib in Resources */, - 4C46CC80158042C200846B64 /* ChanBanSheet.xib in Resources */, - 4C46CC81158042C200846B64 /* ChanInviteExceptionSheet.xib in Resources */, - 4C46CC82158042C200846B64 /* ChannelSheet.xib in Resources */, - 4C46CC83158042C200846B64 /* HighlightSheet.xib in Resources */, - 4C46CC84158042C200846B64 /* InputPromptDialog.xib in Resources */, - 4C46CC85158042C200846B64 /* InviteSheet.xib in Resources */, - 4C46CC86158042C200846B64 /* ListDialog.xib in Resources */, + 4C46CC7D158042C200846B64 /* TDCAboutPanel.xib in Resources */, + 4C46CC7E158042C200846B64 /* TDCAddressBookSheet.xib in Resources */, + 4C46CC7F158042C200846B64 /* TDChanBanExceptionSheet.xib in Resources */, + 4C46CC80158042C200846B64 /* TDChanBanSheet.xib in Resources */, + 4C46CC81158042C200846B64 /* TDChanInviteExceptionSheet.xib in Resources */, + 4C46CC82158042C200846B64 /* TDChannelSheet.xib in Resources */, + 4C46CC83158042C200846B64 /* TDCHighlightSheet.xib in Resources */, + 4C46CC84158042C200846B64 /* TVCInputPromptDialog.xib in Resources */, + 4C46CC85158042C200846B64 /* TDCInviteSheet.xib in Resources */, + 4C46CC86158042C200846B64 /* TDCListDialog.xib in Resources */, 4C46CC87158042C200846B64 /* MainMenu.xib in Resources */, - 4C46CC88158042C200846B64 /* ModeSheet.xib in Resources */, - 4C46CC89158042C200846B64 /* NickSheet.xib in Resources */, - 4C46CC8A158042C200846B64 /* Preferences.xib in Resources */, - 4C46CC8B158042C200846B64 /* ServerSheet.xib in Resources */, - 4C46CC8C158042C200846B64 /* TopicSheet.xib in Resources */, - 4C46CC8D158042C200846B64 /* WelcomeSheet.xib in Resources */, + 4C46CC88158042C200846B64 /* TDCModeSheet.xib in Resources */, + 4C46CC89158042C200846B64 /* TDCNickSheet.xib in Resources */, + 4C46CC8A158042C200846B64 /* TDCPreferences.xib in Resources */, + 4C46CC8B158042C200846B64 /* TDCServerSheet.xib in Resources */, + 4C46CC8C158042C200846B64 /* TDCTopicSheet.xib in Resources */, + 4C46CC8D158042C200846B64 /* TDCWelcomeSheet.xib in Resources */, 4CCF2EEB15804790006FFE21 /* IRCNetworks.plist in Resources */, 4CCF2EEE1580479C006FFE21 /* BasicLanguage.strings in Resources */, 4CCF2EF3158047C8006FFE21 /* Acknowledgments.pdf in Resources */, @@ -1864,34 +1921,34 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4C46CBEC1580429D00846B64 /* GrowlController.m in Sources */, - 4C46CBED1580429D00846B64 /* MasterController.m in Sources */, - 4C46CBEE1580429D00846B64 /* MenuController.m in Sources */, - 4C46CBEF1580429D00846B64 /* NickCompletionStatus.m in Sources */, - 4C46CBF01580429D00846B64 /* AboutPanel.m in Sources */, - 4C46CBF11580429D00846B64 /* AddressBookSheet.m in Sources */, - 4C46CBF21580429D00846B64 /* ChanBanExceptionSheet.m in Sources */, - 4C46CBF31580429D00846B64 /* ChanBanSheet.m in Sources */, - 4C46CBF41580429D00846B64 /* ChanInviteExceptionSheet.m in Sources */, - 4C46CBF51580429D00846B64 /* ChannelSheet.m in Sources */, - 4C46CBF61580429D00846B64 /* HighlightSheet.m in Sources */, - 4C46CBF71580429D00846B64 /* InputPromptDialog.m in Sources */, - 4C46CBF81580429D00846B64 /* InviteSheet.m in Sources */, - 4C46CBF91580429D00846B64 /* ListDialog.m in Sources */, - 4C46CBFA1580429D00846B64 /* ModeSheet.m in Sources */, - 4C46CBFB1580429D00846B64 /* NickSheet.m in Sources */, - 4C46CBFC1580429D00846B64 /* PreferencesController.m in Sources */, - 4C46CBFD1580429D00846B64 /* ScriptsWrapper.m in Sources */, - 4C46CBFE1580429D00846B64 /* SoundWrapper.m in Sources */, - 4C46CBFF1580429D00846B64 /* ServerSheet.m in Sources */, - 4C46CC001580429D00846B64 /* SheetBase.m in Sources */, - 4C46CC011580429D00846B64 /* TopicSheet.m in Sources */, - 4C46CC021580429D00846B64 /* WelcomeSheet.m in Sources */, + 4C46CBEC1580429D00846B64 /* TLOGrowlController.m in Sources */, + 4C46CBED1580429D00846B64 /* TXMasterController.m in Sources */, + 4C46CBEE1580429D00846B64 /* TXMenuController.m in Sources */, + 4C46CBEF1580429D00846B64 /* TLONickCompletionStatus.m in Sources */, + 4C46CBF01580429D00846B64 /* TDCAboutPanel.m in Sources */, + 4C46CBF11580429D00846B64 /* TDCAddressBookSheet.m in Sources */, + 4C46CBF21580429D00846B64 /* TDChanBanExceptionSheet.m in Sources */, + 4C46CBF31580429D00846B64 /* TDChanBanSheet.m in Sources */, + 4C46CBF41580429D00846B64 /* TDChanInviteExceptionSheet.m in Sources */, + 4C46CBF51580429D00846B64 /* TDChannelSheet.m in Sources */, + 4C46CBF61580429D00846B64 /* TDCHighlightSheet.m in Sources */, + 4C46CBF71580429D00846B64 /* TVCInputPromptDialog.m in Sources */, + 4C46CBF81580429D00846B64 /* TDCInviteSheet.m in Sources */, + 4C46CBF91580429D00846B64 /* TDCListDialog.m in Sources */, + 4C46CBFA1580429D00846B64 /* TDCModeSheet.m in Sources */, + 4C46CBFB1580429D00846B64 /* TDCNickSheet.m in Sources */, + 4C46CBFC1580429D00846B64 /* TDCPreferencesController.m in Sources */, + 4C46CBFD1580429D00846B64 /* TDCPreferencesScriptWrapper.m in Sources */, + 4C46CBFE1580429D00846B64 /* TDCPreferencesSoundWrapper.m in Sources */, + 4C46CBFF1580429D00846B64 /* TDCServerSheet.m in Sources */, + 4C46CC001580429D00846B64 /* TDCSheetBase.m in Sources */, + 4C46CC011580429D00846B64 /* TDCTopicSheet.m in Sources */, + 4C46CC021580429D00846B64 /* TDCWelcomeSheet.m in Sources */, 4C46CC031580429D00846B64 /* DDExtensions.m in Sources */, - 4C46CC041580429D00846B64 /* DDInvocationGrabber.m in Sources */, + 4C46CC041580429D00846B64 /* DDInvocation.m in Sources */, 4C46CC051580429D00846B64 /* GTMBase64.m in Sources */, - 4C46CC061580429D00846B64 /* GTMNSString+HTML.m in Sources */, - 4C46CC071580429D00846B64 /* GTMNSString+URLArguments.m in Sources */, + 4C46CC061580429D00846B64 /* GTMEncodeHTML.m in Sources */, + 4C46CC071580429D00846B64 /* GTMEncodeURL.m in Sources */, 4C46CC081580429D00846B64 /* NSArrayHelper.m in Sources */, 4C46CC091580429D00846B64 /* NSBundleHelper.m in Sources */, 4C46CC0A1580429D00846B64 /* NSColorHelper.m in Sources */, @@ -1907,11 +1964,11 @@ 4C46CC151580429D00846B64 /* NSStringHelper.m in Sources */, 4C46CC161580429D00846B64 /* NSTextFieldHelper.m in Sources */, 4C46CC171580429D00846B64 /* NSWindowHelper.m in Sources */, - 4C46CC181580429D00846B64 /* SoundPlayer.m in Sources */, - 4C46CC191580429D00846B64 /* TextualPluginItem.m in Sources */, - 4C46CC1A1580429D00846B64 /* UnicodeHelper.m in Sources */, - 4C46CC1B1580429D00846B64 /* URLOpener.m in Sources */, - 4C46CC1C1580429D00846B64 /* AddressBook.m in Sources */, + 4C46CC181580429D00846B64 /* TLOSoundPlayer.m in Sources */, + 4C46CC191580429D00846B64 /* THOPluginItem.m in Sources */, + 4C46CC1A1580429D00846B64 /* THOUnicodeHelper.m in Sources */, + 4C46CC1B1580429D00846B64 /* TLOpenLink.m in Sources */, + 4C46CC1C1580429D00846B64 /* IRCAddressBook.m in Sources */, 4C46CC1E1580429D00846B64 /* IRCChannel.m in Sources */, 4C46CC1F1580429D00846B64 /* IRCChannelConfig.m in Sources */, 4C46CC201580429D00846B64 /* IRCChannelMode.m in Sources */, @@ -1928,48 +1985,48 @@ 4C46CC2B1580429D00846B64 /* IRCUser.m in Sources */, 4C46CC2C1580429D00846B64 /* IRCWorld.m in Sources */, 4C46CC2D1580429D00846B64 /* IRCWorldConfig.m in Sources */, - 4C46CC2E1580429D00846B64 /* TimerCommand.m in Sources */, + 4C46CC2E1580429D00846B64 /* TLOTimerCommand.m in Sources */, 4C46CC2F1580429D00846B64 /* AGKeychain.m in Sources */, - 4C46CC301580429D00846B64 /* AsyncSocketExtensions.m in Sources */, - 4C46CC311580429D00846B64 /* FileLogger.m in Sources */, + 4C46CC301580429D00846B64 /* GCDAsyncSocketExtensions.m in Sources */, + 4C46CC311580429D00846B64 /* TLOFileLogger.m in Sources */, 4C46CC321580429D00846B64 /* GCDAsyncSocket.m in Sources */, - 4C46CC331580429D00846B64 /* GlobalModels.m in Sources */, - 4C46CC341580429D00846B64 /* InputHistory.m in Sources */, + 4C46CC331580429D00846B64 /* TXGlobalModels.m in Sources */, + 4C46CC341580429D00846B64 /* TLOInputHistory.m in Sources */, 4C46CC351580429D00846B64 /* IRCColorFormat.m in Sources */, - 4C46CC361580429D00846B64 /* KeyEventHandler.m in Sources */, - 4C46CC371580429D00846B64 /* LanguagePreferences.m in Sources */, - 4C46CC381580429D00846B64 /* PopupPrompts.m in Sources */, + 4C46CC361580429D00846B64 /* TLOKeyEventHandler.m in Sources */, + 4C46CC371580429D00846B64 /* TLOLanguagePreferences.m in Sources */, + 4C46CC381580429D00846B64 /* TLOPopupPrompts.m in Sources */, 4C46CC391580429D00846B64 /* RegexKitLite.m in Sources */, 4C46CC3A1580429D00846B64 /* RLMAsyncSocket.m in Sources */, - 4C46CC3B1580429D00846B64 /* TCPClient.m in Sources */, - 4C46CC3C1580429D00846B64 /* Timer.m in Sources */, - 4C46CC3D1580429D00846B64 /* TXRegularExpression.m in Sources */, - 4C46CC3E1580429D00846B64 /* URLParser.m in Sources */, + 4C46CC3B1580429D00846B64 /* TLOSocketClient.m in Sources */, + 4C46CC3C1580429D00846B64 /* TLOTimer.m in Sources */, + 4C46CC3D1580429D00846B64 /* TLORegularExpression.m in Sources */, + 4C46CC3E1580429D00846B64 /* TLOLinkParser.m in Sources */, 4C46CC3F1580429D00846B64 /* main.m in Sources */, - 4C46CC411580429D00846B64 /* FileWithContent.m in Sources */, - 4C46CC421580429D00846B64 /* OtherTheme.m in Sources */, - 4C46CC431580429D00846B64 /* Preferences.m in Sources */, - 4C46CC441580429D00846B64 /* ViewTheme.m in Sources */, - 4C46CC451580429D00846B64 /* DockIcon.m in Sources */, - 4C46CC461580429D00846B64 /* InputTextField.m in Sources */, - 4C46CC471580429D00846B64 /* IRCTextFormatterMenu.m in Sources */, - 4C46CC481580429D00846B64 /* ListSeparatorCell.m in Sources */, - 4C46CC491580429D00846B64 /* ListView.m in Sources */, - 4C46CC4A1580429D00846B64 /* ImageURLParser.m in Sources */, - 4C46CC4B1580429D00846B64 /* LogController.m in Sources */, - 4C46CC4C1580429D00846B64 /* LogLine.m in Sources */, - 4C46CC4D1580429D00846B64 /* LogPolicy.m in Sources */, - 4C46CC4E1580429D00846B64 /* LogRenderer.m in Sources */, - 4C46CC4F1580429D00846B64 /* LogScriptEventSink.m in Sources */, - 4C46CC501580429D00846B64 /* LogView.m in Sources */, - 4C46CC511580429D00846B64 /* WebViewAutoScroll.m in Sources */, - 4C46CC521580429D00846B64 /* MainWindow.m in Sources */, - 4C46CC531580429D00846B64 /* MemberList.m in Sources */, - 4C46CC541580429D00846B64 /* MemberListCell.m in Sources */, - 4C46CC551580429D00846B64 /* ServerList.m in Sources */, - 4C46CC561580429D00846B64 /* ServerListCell.m in Sources */, - 4C46CC571580429D00846B64 /* TextField.m in Sources */, - 4C46CC581580429D00846B64 /* ThinSplitView.m in Sources */, + 4C46CC411580429D00846B64 /* TLOFileWithContent.m in Sources */, + 4C46CC421580429D00846B64 /* TPCOtherTheme.m in Sources */, + 4C46CC431580429D00846B64 /* TPCPreferences.m in Sources */, + 4C46CC441580429D00846B64 /* TPCViewTheme.m in Sources */, + 4C46CC451580429D00846B64 /* TVCDockIcon.m in Sources */, + 4C46CC461580429D00846B64 /* TVCInputTextField.m in Sources */, + 4C46CC471580429D00846B64 /* TVCTextFormatterMenu.m in Sources */, + 4C46CC481580429D00846B64 /* TVCListSeparatorCell.m in Sources */, + 4C46CC491580429D00846B64 /* TVCListView.m in Sources */, + 4C46CC4A1580429D00846B64 /* TVCImageURLParser.m in Sources */, + 4C46CC4B1580429D00846B64 /* TVCLogController.m in Sources */, + 4C46CC4C1580429D00846B64 /* TVCLogLine.m in Sources */, + 4C46CC4D1580429D00846B64 /* TVCLogPolicy.m in Sources */, + 4C46CC4E1580429D00846B64 /* LVCLogRenderer.m in Sources */, + 4C46CC4F1580429D00846B64 /* TVCLogScriptEventSink.m in Sources */, + 4C46CC501580429D00846B64 /* TVCLogView.m in Sources */, + 4C46CC511580429D00846B64 /* TVCWebViewAutoScroll.m in Sources */, + 4C46CC521580429D00846B64 /* TVCMainWindow.m in Sources */, + 4C46CC531580429D00846B64 /* TVCMemberList.m in Sources */, + 4C46CC541580429D00846B64 /* TVCMemberListCell.m in Sources */, + 4C46CC551580429D00846B64 /* TVCServerList.m in Sources */, + 4C46CC561580429D00846B64 /* TVCServerListCell.m in Sources */, + 4C46CC571580429D00846B64 /* TVCTextField.m in Sources */, + 4C46CC581580429D00846B64 /* TVCThinSplitView.m in Sources */, 4CCF30251580693E006FFE21 /* PLWeakCompatibilityStubs.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1995,84 +2052,84 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 4C46CC5B158042C200846B64 /* AboutPanel.xib */ = { + 4C46CC5B158042C200846B64 /* TDCAboutPanel.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC5C158042C200846B64 /* English */, ); - name = AboutPanel.xib; + name = TDCAboutPanel.xib; sourceTree = ""; }; - 4C46CC5D158042C200846B64 /* AddressBookSheet.xib */ = { + 4C46CC5D158042C200846B64 /* TDCAddressBookSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC5E158042C200846B64 /* English */, ); - name = AddressBookSheet.xib; + name = TDCAddressBookSheet.xib; sourceTree = ""; }; - 4C46CC5F158042C200846B64 /* ChanBanExceptionSheet.xib */ = { + 4C46CC5F158042C200846B64 /* TDChanBanExceptionSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC60158042C200846B64 /* English */, ); - name = ChanBanExceptionSheet.xib; + name = TDChanBanExceptionSheet.xib; sourceTree = ""; }; - 4C46CC61158042C200846B64 /* ChanBanSheet.xib */ = { + 4C46CC61158042C200846B64 /* TDChanBanSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC62158042C200846B64 /* English */, ); - name = ChanBanSheet.xib; + name = TDChanBanSheet.xib; sourceTree = ""; }; - 4C46CC63158042C200846B64 /* ChanInviteExceptionSheet.xib */ = { + 4C46CC63158042C200846B64 /* TDChanInviteExceptionSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC64158042C200846B64 /* English */, ); - name = ChanInviteExceptionSheet.xib; + name = TDChanInviteExceptionSheet.xib; sourceTree = ""; }; - 4C46CC65158042C200846B64 /* ChannelSheet.xib */ = { + 4C46CC65158042C200846B64 /* TDChannelSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC66158042C200846B64 /* English */, ); - name = ChannelSheet.xib; + name = TDChannelSheet.xib; sourceTree = ""; }; - 4C46CC67158042C200846B64 /* HighlightSheet.xib */ = { + 4C46CC67158042C200846B64 /* TDCHighlightSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC68158042C200846B64 /* English */, ); - name = HighlightSheet.xib; + name = TDCHighlightSheet.xib; sourceTree = ""; }; - 4C46CC69158042C200846B64 /* InputPromptDialog.xib */ = { + 4C46CC69158042C200846B64 /* TVCInputPromptDialog.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC6A158042C200846B64 /* English */, ); - name = InputPromptDialog.xib; + name = TVCInputPromptDialog.xib; sourceTree = ""; }; - 4C46CC6B158042C200846B64 /* InviteSheet.xib */ = { + 4C46CC6B158042C200846B64 /* TDCInviteSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC6C158042C200846B64 /* English */, ); - name = InviteSheet.xib; + name = TDCInviteSheet.xib; sourceTree = ""; }; - 4C46CC6D158042C200846B64 /* ListDialog.xib */ = { + 4C46CC6D158042C200846B64 /* TDCListDialog.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC6E158042C200846B64 /* English */, ); - name = ListDialog.xib; + name = TDCListDialog.xib; sourceTree = ""; }; 4C46CC6F158042C200846B64 /* MainMenu.xib */ = { @@ -2083,52 +2140,52 @@ name = MainMenu.xib; sourceTree = ""; }; - 4C46CC71158042C200846B64 /* ModeSheet.xib */ = { + 4C46CC71158042C200846B64 /* TDCModeSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC72158042C200846B64 /* English */, ); - name = ModeSheet.xib; + name = TDCModeSheet.xib; sourceTree = ""; }; - 4C46CC73158042C200846B64 /* NickSheet.xib */ = { + 4C46CC73158042C200846B64 /* TDCNickSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC74158042C200846B64 /* English */, ); - name = NickSheet.xib; + name = TDCNickSheet.xib; sourceTree = ""; }; - 4C46CC75158042C200846B64 /* Preferences.xib */ = { + 4C46CC75158042C200846B64 /* TDCPreferences.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC76158042C200846B64 /* English */, ); - name = Preferences.xib; + name = TDCPreferences.xib; sourceTree = ""; }; - 4C46CC77158042C200846B64 /* ServerSheet.xib */ = { + 4C46CC77158042C200846B64 /* TDCServerSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC78158042C200846B64 /* English */, ); - name = ServerSheet.xib; + name = TDCServerSheet.xib; sourceTree = ""; }; - 4C46CC79158042C200846B64 /* TopicSheet.xib */ = { + 4C46CC79158042C200846B64 /* TDCTopicSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC7A158042C200846B64 /* English */, ); - name = TopicSheet.xib; + name = TDCTopicSheet.xib; sourceTree = ""; }; - 4C46CC7B158042C200846B64 /* WelcomeSheet.xib */ = { + 4C46CC7B158042C200846B64 /* TDCWelcomeSheet.xib */ = { isa = PBXVariantGroup; children = ( 4C46CC7C158042C200846B64 /* English */, ); - name = WelcomeSheet.xib; + name = TDCWelcomeSheet.xib; sourceTree = ""; }; 4CCF2EEC1580479C006FFE21 /* BasicLanguage.strings */ = { @@ -2253,7 +2310,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; STRIPFLAGS = "-S"; @@ -2293,7 +2350,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; STRIPFLAGS = "-S"; @@ -2355,7 +2412,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; STRIPFLAGS = "-S"; @@ -2407,7 +2464,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; STRIPFLAGS = "-S"; @@ -2459,7 +2516,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Miscellaneous/Info.plist; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = Textual; PROVISIONING_PROFILE = ""; STRIPFLAGS = "-S"; diff --git a/Resources/Miscellaneous/Info.plist b/Resources/Miscellaneous/Info.plist index 2586fe0533..8e3151ce9b 100755 --- a/Resources/Miscellaneous/Info.plist +++ b/Resources/Miscellaneous/Info.plist @@ -3,9 +3,9 @@ Build Number - 10313 + 10437 Build Reference - 2.1.1-123-gb61fbb5-stdbuild + 2.1.1-124-gbc3754f-stdbuild CFBundleExecutable Textual CFBundleIconFile diff --git a/Resources/Plugins/BlowfishCommandLine/TPI_BlowfishCommands.m b/Resources/Plugins/BlowfishCommandLine/TPI_BlowfishCommands.m index a170f0a5a7..24031a2f11 100755 --- a/Resources/Plugins/BlowfishCommandLine/TPI_BlowfishCommands.m +++ b/Resources/Plugins/BlowfishCommandLine/TPI_BlowfishCommands.m @@ -3,8 +3,8 @@ #import "TPI_BlowfishCommands.h" -#define exchangeRequestPrefix @"DH1080_INIT " -#define exchangeResponsePrefix @"DH1080_FINISH " +#define TXExchangeRequestPrefix @"DH1080_INIT " +#define TXExchangeResponsePrefix @"DH1080_FINISH " @implementation TPI_BlowfishCommands @@ -20,25 +20,25 @@ - (void)messageSentByUser:(IRCClient *)client if (c.isChannel || c.isTalk) { messageString = [messageString trim]; - if ([messageString contains:NSWhitespaceCharacter]) { - messageString = [messageString substringToIndex:[messageString stringPosition:NSWhitespaceCharacter]]; + if ([messageString contains:NSStringWhitespacePlaceholder]) { + messageString = [messageString substringToIndex:[messageString stringPosition:NSStringWhitespacePlaceholder]]; } if ([commandString isEqualToString:@"SETKEY"]) { if (NSObjectIsEmpty(messageString)) { c.config.encryptionKey = nil; - [[client iomt] printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_STOPPED") channel:c]; + [[client iomt] printDebugInformation:TXTLS(@"BlowfishEncryptionStopped") channel:c]; } else { if (NSObjectIsNotEmpty(c.config.encryptionKey)) { if ([c.config.encryptionKey isEqualToString:messageString] == NO) { - [[client iomt] printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_KEY_CHANGED") channel:c]; + [[client iomt] printDebugInformation:TXTLS(@"BlowfishEncryptionKeyChanged") channel:c]; } } else { if (c.isTalk) { - [[client iomt] printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_STARTED_QUERY") channel:c]; + [[client iomt] printDebugInformation:TXTLS(@"BlowfishEncryptionStartedInQuery") channel:c]; } else { - [[client iomt] printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_STARTED") channel:c]; + [[client iomt] printDebugInformation:TXTLS(@"BlowfishEncryptionStarted") channel:c]; } } @@ -47,15 +47,15 @@ - (void)messageSentByUser:(IRCClient *)client } else if ([commandString isEqualToString:@"DELKEY"]) { c.config.encryptionKey = nil; - [[client iomt] printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_STOPPED") channel:c]; + [[client iomt] printDebugInformation:TXTLS(@"BlowfishEncryptionStopped") channel:c]; } else if ([commandString isEqualToString:@"KEY"]) { if (NSObjectIsNotEmpty(c.config.encryptionKey)) { - [[client iomt] printDebugInformation:TXTFLS(@"BLOWFISH_ENCRYPTION_KEY", c.config.encryptionKey) channel:c]; + [[client iomt] printDebugInformation:TXTFLS(@"BlowfishCurrentEncryptionKey", c.config.encryptionKey) channel:c]; } else { - [[client iomt] printDebugInformation:TXTLS(@"BLOWFISH_ENCRYPTION_NO_KEY") channel:c]; + [[client iomt] printDebugInformation:TXTLS(@"BlowfishNoEncryptionKeySet") channel:c]; } } else if ([commandString isEqualToString:@"KEYX"]) { - [[client iomt] printDebugInformation:TXTLS(@"BLOWFISH_KEY_EXCHANGE_NOT_READY_YET") channel:c]; + [[client iomt] printDebugInformation:TXTLS(@"BlowfishKeyExchangeFeatureNotReadyYet") channel:c]; } } } @@ -71,13 +71,13 @@ - (NSDictionary *)pluginOutputDisplayRules NSMutableDictionary *rules = [NSMutableDictionary dictionary]; - NSArray *privmsgRule_1 = [NSArray arrayWithObjects:[@"^" stringByAppendingString:exchangeRequestPrefix], + NSArray *privmsgRule_1 = [NSArray arrayWithObjects:[@"^" stringByAppendingString:TXExchangeRequestPrefix], NSNumberWithBOOL(YES), NSNumberWithBOOL(YES), NSNumberWithBOOL(YES), nil]; - NSArray *privmsgRule_2 = [NSArray arrayWithObjects:[@"^" stringByAppendingString:exchangeResponsePrefix], + NSArray *privmsgRule_2 = [NSArray arrayWithObjects:[@"^" stringByAppendingString:TXExchangeResponsePrefix], NSNumberWithBOOL(YES), NSNumberWithBOOL(YES), NSNumberWithBOOL(YES), nil]; - [rules setObject:[NSArray arrayWithObjects:privmsgRule_1, privmsgRule_2, nil] forKey:IRCCommandFromLineType(LINE_TYPE_NOTICE)]; + [rules setObject:[NSArray arrayWithObjects:privmsgRule_1, privmsgRule_2, nil] forKey:IRCCommandFromLineType(TVCLogLineNoticeType)]; return rules; } diff --git a/Resources/Plugins/BragSpam/TPIBragSpam.m b/Resources/Plugins/BragSpam/TPIBragSpam.m index 2c7fabee64..175eb31633 100755 --- a/Resources/Plugins/BragSpam/TPIBragSpam.m +++ b/Resources/Plugins/BragSpam/TPIBragSpam.m @@ -72,7 +72,7 @@ - (void)messageSentByUser:(IRCClient*)client } - NSString *result = TXTFLS(@"BRAGSPAM_PLUGIN_NORMAL_RESULT", channelCount, networkCount, operCount, + NSString *result = TXTFLS(@"BragspamPluginNormalResult", channelCount, networkCount, operCount, chanOpCount, chanHopCount, chanVopCount, powerOverCount); [[client iomt] sendPrivmsgToSelectedChannel:result]; @@ -92,22 +92,22 @@ - (void)messageSentByUser:(IRCClient*)client NSMutableString *result = [NSMutableString string]; if (NSObjectIsEmpty(chanlist)) { - [result appendString:TXTFLS(@"BRAGSPAM_PLUGIN_CHANNEL_RESULT_NONE", client.config.network)]; + [result appendString:TXTFLS(@"BragspamPluginChannelResultNone", client.config.network)]; } else { cc = [chanlist objectAtIndex:0]; if (chanlist.count == 1) { - [result appendString:TXTFLS(@"BRAGSPAM_PLUGIN_CHANNEL_RESULT_SINGLE", cc.name, client.config.network)]; + [result appendString:TXTFLS(@"BragspamPluginChannelResultSingle", cc.name, client.config.network)]; } else { - [result appendString:TXTFLS(@"BRAGSPAM_PLUGIN_CHANNEL_RESULT", cc.name)]; + [result appendString:TXTFLS(@"BragspamPluginChannelResult", cc.name)]; [chanlist removeObjectAtIndex:0]; for (cc in chanlist) { if (NSDissimilarObjects(cc, [chanlist lastObject])) { - [result appendString:TXTFLS(@"BRAGSPAM_PLUGIN_CHANNEL_RESULT_MIDITEM", cc.name)]; + [result appendString:TXTFLS(@"BragspamPluginChannelResultMiddleItem", cc.name)]; } else { - [result appendString:TXTFLS(@"BRAGSPAM_PLUGIN_CHANNEL_RESULT_ENDITEM", cc.name, client.config.network)]; + [result appendString:TXTFLS(@"BragspamPluginChannelResultEndItem", cc.name, client.config.network)]; } } } diff --git a/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.h b/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.h index fe8544813e..e82d22f70f 100755 --- a/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.h +++ b/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.h @@ -31,5 +31,5 @@ + (NSString *)getBandwidthStats:(IRCWorld *)world; + (NSString *)getCurrentThemeInUse:(IRCWorld *)world; + (NSString *)formattedDiskSize:(TXFSLongInt)size; -+ (NSString *)formattedCPUFrequency:(NSDoubleN)rate; ++ (NSString *)formattedCPUFrequency:(TXNSDouble)rate; @end \ No newline at end of file diff --git a/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.m b/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.m index 0fdea807d9..1fed3e5cf3 100755 --- a/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.m +++ b/Resources/Plugins/SystemProfiler/TPI_SP_SysInfo.m @@ -33,8 +33,8 @@ + (NSString *)compiledOutput NSBundle *_bundle = [NSBundle bundleForClass:[self class]]; - _cpu_model = [TXRegularExpression string:_cpu_model replacedByRegex:@"(\\s*@.*)|CPU|\\(R\\)|\\(TM\\)" withString:NSWhitespaceCharacter]; - _cpu_model = [TXRegularExpression string:_cpu_model replacedByRegex:@"\\s+" withString:NSWhitespaceCharacter]; + _cpu_model = [TLORegularExpression string:_cpu_model replacedByRegex:@"(\\s*@.*)|CPU|\\(R\\)|\\(TM\\)" withString:NSStringWhitespacePlaceholder]; + _cpu_model = [TLORegularExpression string:_cpu_model replacedByRegex:@"\\s+" withString:NSStringWhitespacePlaceholder]; _cpu_model = [_cpu_model trim]; @@ -90,9 +90,9 @@ + (NSString *)compiledOutput } sysinfo = [sysinfo stringByAppendingFormat:@" \002OS:\002 %1$@ %2$@ (Build %3$@)", - [[Preferences systemInfoPlist] objectForKey:@"ProductName"], - [[Preferences systemInfoPlist] objectForKey:@"ProductVersion"], - [[Preferences systemInfoPlist] objectForKey:@"ProductBuildVersion"]]; + [[TPCPreferences systemInfoPlist] objectForKey:@"ProductName"], + [[TPCPreferences systemInfoPlist] objectForKey:@"ProductVersion"], + [[TPCPreferences systemInfoPlist] objectForKey:@"ProductBuildVersion"]]; NSString *arch = [self kernelArchitecture]; @@ -133,7 +133,7 @@ + (NSString *)applicationAndSystemUptime NSString *systemUptime = TXSpecialReadableTime([self _internalSystemUptime], NO, [NSArray arrayWithObjects:@"day", @"hour", @"minute", @"second", nil]); - NSString *textualUptime = TXSpecialReadableTime([NSDate secondsSinceUnixTimestamp:[Preferences startTime]], NO, + NSString *textualUptime = TXSpecialReadableTime([NSDate secondsSinceUnixTimestamp:[TPCPreferences startTime]], NO, [NSArray arrayWithObjects:@"day", @"hour", @"minute", @"second", nil]); return [NSString stringWithFormat:@"System Uptime: %@ - Textual Uptime: %@", systemUptime, textualUptime]; @@ -141,7 +141,7 @@ + (NSString *)applicationAndSystemUptime + (NSString *)getCurrentThemeInUse:(IRCWorld *)world { - NSString* fname = [ViewTheme extractThemeName:[Preferences themeName]]; + NSString* fname = [TPCViewTheme extractThemeName:[TPCPreferences themeName]]; if (fname) { return [NSString stringWithFormat:@"\002Current Theme:\002 %@", fname]; @@ -153,7 +153,7 @@ + (NSString *)getCurrentThemeInUse:(IRCWorld *)world + (NSString *)getBandwidthStats:(IRCWorld *)world { return [NSString stringWithFormat:@"Textual has sent \002%i\002 messages since startup with a total of \002%i\002 messages received. That equals roughly \002%.2f\002 messages a second. Combined this comes to around \002%@ in\002 and \002%@ out\002 worth of bandwidth.", - world.messagesSent, world.messagesReceived, (world.messagesReceived / ([[NSDate date] timeIntervalSince1970] - [Preferences startTime])), + world.messagesSent, world.messagesReceived, (world.messagesReceived / ([[NSDate date] timeIntervalSince1970] - [TPCPreferences startTime])), [self formattedDiskSize:world.bandwidthIn], [self formattedDiskSize:world.bandwidthOut]]; } @@ -164,7 +164,7 @@ + (NSString *)getSystemLoadAverage + (NSString *)getTextualRunCount { - return [NSString stringWithFormat:@"Textual has been opened \002%i\002 times with a total runtime of %@", [_NSUserDefaults() integerForKey:@"TXRunCount"], TXReadableTime([Preferences totalRunTime])]; + return [NSString stringWithFormat:@"Textual has been opened \002%i\002 times with a total runtime of %@", [_NSUserDefaults() integerForKey:@"TXRunCount"], TXReadableTime([TPCPreferences totalRunTime])]; } + (NSString *)getNetworkStats @@ -342,7 +342,7 @@ + (NSString *)formattedDiskSize:(TXFSLongInt)size } } -+ (NSString *)formattedCPUFrequency:(NSDoubleN)rate ++ (NSString *)formattedCPUFrequency:(TXNSDouble)rate { if ((rate / 1000000) >= 990) { return [NSString stringWithFormat:@"%.2f GHz", ((rate / 100000000.0) / 10.0)]; @@ -399,7 +399,7 @@ + (NSString *)graphicsCardInfo if (cglContext) { NSString *model = [NSString stringWithCString:(const char *)glGetString(GL_RENDERER) encoding:NSASCIIStringEncoding]; - return [model stringByReplacingOccurrencesOfString:@" OpenGL Engine" withString:NSNullObject]; + return [model stringByReplacingOccurrencesOfString:@" OpenGL Engine" withString:NSStringEmptyPlaceholder]; } } @@ -444,7 +444,7 @@ + (NSString *)systemUptime + (NSString *)loadAveragesWithCores:(NSInteger)cores { - NSDoubleN load_ave[3]; + TXNSDouble load_ave[3]; if (getloadavg(load_ave, 3) == 3) { if (cores > 0) { diff --git a/Resources/Styles/Matrix by bogo_lode/BasicLanguage.plist b/Resources/Styles/Matrix by bogo_lode/BasicLanguage.plist index 7e41602ffc..0acb21cc2d 100755 --- a/Resources/Styles/Matrix by bogo_lode/BasicLanguage.plist +++ b/Resources/Styles/Matrix by bogo_lode/BasicLanguage.plist @@ -2,35 +2,35 @@ - IRC_CHANNEL_HAS_MODES + IRCChannelHasModes Mode is %@ - IRC_CHANNEL_HAS_TOPIC + IRCChannelHasTopic Topic is %@ - IRC_CHANNEL_HAS_WEBSITE + IRCChannelHasWebsite Website is %@ - IRC_MDOE_SET + IRCModeSet %1$@ sets mode %2$@ - IRC_RECIEVED_CTCP_REPLY + IRCRecievedCTCPReply -%1$@ CTCP- %2$@ %3$@ - IRC_RECIEVED_CTCP_REQUEST + IRCRecievedCTCPRequest -CTCP- %1$@ from %2$@ - IRC_CHANNEL_HAS_TOPIC_AUTHOR + IRCChannelHasTopicAuthor Set by %1$@ on %2$@ - IRC_USER_DISCONNECTED + IRCUserDisconnected %1$@ (%2$@@%3$@) left IRC. - IRC_USER_CHANGED_NICKNAME + IRCUserChangedNickname %1$@ is now known as %2$@ - IRC_HAS_IGNORED_CTCP + IRCCTCPRequestIgnored -CTCP- %1$@ from %2$@ was ignored. - IRC_USER_PARTED_CHANNEL + IRCUserPartedChannel %1$@ (%2$@@%3$@) left the channel. - IRC_RECIEVED_CTCP_PING_REPLY + IRCRecievedCTCPPingReply -%1$@ CTCP- %2$@ (%3$1.5f sec) - IRC_USER_JOINED_CHANNEL + IRCUserJoinedChannel %1$@ (%2$@@%3$@) joined the channel. - IRC_CHANNEL_TOPIC_CHANGED + IRCChannelTopicChanged %1$@ changed the topic to %2$@ - IRC_USER_KICKED_FROM_CHANNEL + IRCUserKickedFromChannel %1$@ kicked %2$@ from the channel. (%3$@)