diff --git a/Classes/Headers/NSColorHelper.h b/Classes/Headers/NSColorHelper.h index 87034894e9..0ddf34751b 100755 --- a/Classes/Headers/NSColorHelper.h +++ b/Classes/Headers/NSColorHelper.h @@ -5,7 +5,7 @@ #import "TextualApplication.h" #define TXCalibratedRBGColor(r, b, g) ([NSColor internalCalibratedRed:r green:g blue:b alpha:1.0]) -#define TXInvertSidebarColor(c) (([TPCPreferences invertSidebarColors]) ? [c invertColor] : c) +#define TXInvertSidebarColor(c) c // Deprecated, 2.1.1 @interface NSColor (TXColorHelper) - (NSColor *)invertColor; diff --git a/Classes/Views/Server List/TVCServerList.m b/Classes/Views/Server List/TVCServerList.m index 2474265f29..1c1e0ca5c0 100755 --- a/Classes/Views/Server List/TVCServerList.m +++ b/Classes/Views/Server List/TVCServerList.m @@ -6,9 +6,21 @@ @implementation TVCServerList +static NSColor *_invertedBackgroundColor; + - (void)updateBackgroundColor { - [self setBackgroundColor:TXInvertSidebarColor([NSColor sourceListBackgroundColor])]; + BOOL invertedColors = [TPCPreferences invertSidebarColors]; + + if (invertedColors) { + if (PointerIsEmpty(_invertedBackgroundColor)) { + _invertedBackgroundColor = [NSColor internalCalibratedRed:38.0 green:38.0 blue:38.0 alpha:1]; + } + + [self setBackgroundColor:_invertedBackgroundColor]; + } else { + [self setBackgroundColor:[NSColor sourceListBackgroundColor]]; + } } - (NSRect)frameOfCellAtColumn:(NSInteger)column row:(NSInteger)row diff --git a/Classes/Views/Server List/TVCServerListCell.m b/Classes/Views/Server List/TVCServerListCell.m index 8697b60454..0cc221c834 100755 --- a/Classes/Views/Server List/TVCServerListCell.m +++ b/Classes/Views/Server List/TVCServerListCell.m @@ -4,46 +4,140 @@ #import "TextualApplication.h" -/* This class and the one for the user list is based off the open source PXSourceList - toolkit developed by Alex Rozanski. */ +@implementation TVCServerListCell -#define _iconSpacing 6.0 +#pragma mark - +#pragma mark Color Scheme -#define _badgeRightMargin 5.0 -#define _badgeInsideMargin 5.0 -#define _badgeMinimumWidth 22.0 -#define _badgeHeight 14.0 +/* We have a lot of variables to keep track of… */ +static NSInteger _iconSpacing = 6.0; -#define _badgeFont [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5] -#define _badgeTextColorTS TXInvertSidebarColor([NSColor internalCalibratedRed:158 green:169 blue:197 alpha:1]) -#define _badgeTextColorNS TXInvertSidebarColor([NSColor whiteColor]) -#define _badgeShadowColor TXInvertSidebarColor([NSColor colorWithCalibratedWhite:1.00 alpha:0.60]) -#define _badgeMessageBackgroundColorTS TXInvertSidebarColor([NSColor whiteColor]) -#define _badgeHighlightBackgroundColor TXInvertSidebarColor([NSColor internalCalibratedRed:210 green:15 blue:15 alpha:1]) -#define _badgeMessageBackgroundColorAqua TXInvertSidebarColor([NSColor internalCalibratedRed:152 green:168 blue:202 alpha:1]) -#define _badgeMessageBackgroundColorGraphite TXInvertSidebarColor([NSColor internalCalibratedRed:132 green:147 blue:163 alpha:1]) +static NSInteger _badgeHeight = 14.0; +static NSInteger _badgeRightMargin = 5.0; +static NSInteger _badgeInsideMargin = 5.0; +static NSInteger _badgeMinimumWidth = 22.0; -#define _serverCellFont [NSFont fontWithName:@"LucidaGrande-Bold" size:12.0] -#define _serverCellFontColor TXInvertSidebarColor([NSColor outlineViewHeaderTextColor]) -#define _serverCellFontColorDisabled TXInvertSidebarColor([NSColor outlineViewHeaderDisabledTextColor]) -#define _serverCellSelectionFontColor TXInvertSidebarColor([NSColor whiteColor]) -#define _serverCellSelectionShadowFontColorAW TXInvertSidebarColor([NSColor colorWithCalibratedWhite:0.00 alpha:0.30]) -#define _serverCellSelectionShadowFontColorIA TXInvertSidebarColor([NSColor colorWithCalibratedWhite:0.00 alpha:0.20]) -#define _serverCellShadowColorAW TXInvertSidebarColor([NSColor colorWithCalibratedWhite:1.00 alpha:1.00]) -#define _serverCellShadowColorNA TXInvertSidebarColor([NSColor colorWithCalibratedWhite:1.00 alpha:1.00]) +static NSFont *_badgeFont; +static NSColor *_badgeTextColorNS; +static NSColor *_badgeTextColorTS; +static NSColor *_badgeShadowColor; +static NSColor *_badgeHighlightBackgroundColor; +static NSColor *_badgeMessageBackgroundColorAqua; +static NSColor *_badgeMessageBackgroundColorGraphite; +static NSColor *_badgeMessageBackgroundColorTS; -#define _channelCellFont [NSFont fontWithName:@"LucidaGrande" size:11.0] -#define _channelCellFontColor TXInvertSidebarColor([NSColor blackColor]) -#define _channelCellSelectionFontColor TXInvertSidebarColor([NSColor whiteColor]) -#define _channelCellSelectionFont [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0] -#define _channelCellShadowColor TXInvertSidebarColor([NSColor internalColorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6]) -#define _channelCellSelectionShadowColor_AW TXInvertSidebarColor([NSColor colorWithCalibratedWhite:0.00 alpha:0.48]) -#define _channelCellSelectionShadowColor_IA TXInvertSidebarColor([NSColor colorWithCalibratedWhite:0.00 alpha:0.30]) +static NSFont *_serverCellFont; +static NSColor *_serverCellFontColor; +static NSColor *_serverCellFontColorDisabled; +static NSColor *_serverCellSelectionFontColor_AW; +static NSColor *_serverCellSelectionFontColor_IA; +static NSColor *_serverCellSelectionShadowColorAW; +static NSColor *_serverCellSelectionShadowColorIA; +static NSColor *_serverCellShadowColorAW; +static NSColor *_serverCellShadowColorNA; -#define _graphiteSelectionColorAW TXInvertSidebarColor([NSColor internalCalibratedRed:17 green:73 blue:126 alpha:1.00]) +static NSFont *_channelCellFont; +static NSColor *_channelCellFontColor; +static NSColor *_channelCellSelectionFontColor_AW; +static NSColor *_channelCellSelectionFontColor_IA; +static NSFont *_channelCellSelectionFont; +static NSColor *_channelCellShadowColor; +static NSColor *_channelCellSelectionShadowColor_AW; +static NSColor *_channelCellSelectionShadowColor_IA; -@implementation TVCServerListCell +static NSColor *_graphiteSelectionColorAW; +static BOOL _drawUsingInvertedColors; +static BOOL _defaultDrawingColorsPopulated; + +- (void)updateOutlineViewColorScheme +{ + BOOL invertedColors = [TPCPreferences invertSidebarColors]; + + if (_drawUsingInvertedColors == invertedColors && _defaultDrawingColorsPopulated) { + return; + } + + _drawUsingInvertedColors = invertedColors; + + if (_defaultDrawingColorsPopulated == NO) { + _badgeFont = [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5]; + + _channelCellFont = [NSFont fontWithName:@"LucidaGrande" size:11.0]; + _channelCellSelectionFont = [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0]; + _serverCellFont = [NSFont fontWithName:@"LucidaGrande-Bold" size:12.0]; + + _defaultDrawingColorsPopulated = YES; + } + + if (_drawUsingInvertedColors == NO) { + /* //////////////////////////////////////////////////// */ + /* Standard Aqua Colors. */ + /* //////////////////////////////////////////////////// */ + + _badgeTextColorNS = [NSColor whiteColor]; + _badgeTextColorTS = [NSColor internalCalibratedRed:158 green:169 blue:197 alpha:1]; + _badgeShadowColor = [NSColor colorWithCalibratedWhite:1.00 alpha:0.60]; + _badgeHighlightBackgroundColor = [NSColor internalCalibratedRed:210 green:15 blue:15 alpha:1]; + _badgeMessageBackgroundColorAqua = [NSColor internalCalibratedRed:152 green:168 blue:202 alpha:1]; + _badgeMessageBackgroundColorGraphite = [NSColor internalCalibratedRed:132 green:147 blue:163 alpha:1]; + _badgeMessageBackgroundColorTS = [NSColor whiteColor]; + + _serverCellFontColor = [NSColor outlineViewHeaderTextColor]; + _serverCellFontColorDisabled = [NSColor outlineViewHeaderDisabledTextColor]; + _serverCellSelectionFontColor_AW = [NSColor whiteColor]; + _serverCellSelectionFontColor_IA = [NSColor whiteColor]; + _serverCellSelectionShadowColorAW = [NSColor colorWithCalibratedWhite:0.00 alpha:0.30]; + _serverCellSelectionShadowColorIA = [NSColor colorWithCalibratedWhite:0.00 alpha:0.20]; + _serverCellShadowColorAW = [NSColor colorWithCalibratedWhite:1.00 alpha:1.00]; + _serverCellShadowColorNA = [NSColor colorWithCalibratedWhite:1.00 alpha:1.00]; + + _channelCellFontColor = [NSColor blackColor]; + _channelCellSelectionFontColor_AW = [NSColor whiteColor]; + _channelCellSelectionFontColor_IA = [NSColor whiteColor]; + _channelCellShadowColor = [NSColor internalColorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6]; + _channelCellSelectionShadowColor_AW = [NSColor colorWithCalibratedWhite:0.00 alpha:0.48]; + _channelCellSelectionShadowColor_IA = [NSColor colorWithCalibratedWhite:0.00 alpha:0.30]; + + _graphiteSelectionColorAW = [NSColor internalCalibratedRed:17 green:73 blue:126 alpha:1.00]; + + /* //////////////////////////////////////////////////// */ + /* Standard Aqua Colors. — @end */ + /* //////////////////////////////////////////////////// */ + } else { + /* //////////////////////////////////////////////////// */ + /* Black Aqua Colors. */ + /* //////////////////////////////////////////////////// */ + + _badgeTextColorNS = [NSColor whiteColor]; + _badgeTextColorTS = [NSColor whiteColor]; + _badgeShadowColor = [NSColor internalCalibratedRed:60.0 green:60.0 blue:60.0 alpha:1]; + _badgeHighlightBackgroundColor = [NSColor internalCalibratedRed:141.0 green:0.0 blue:0.0 alpha:1]; + _badgeMessageBackgroundColorAqua = [NSColor internalCalibratedRed:48.0 green:48.0 blue:48.0 alpha:1]; + _badgeMessageBackgroundColorGraphite = [NSColor internalCalibratedRed:48.0 green:48.0 blue:48.0 alpha:1]; + _badgeMessageBackgroundColorTS = [NSColor darkGrayColor]; + + _serverCellFontColor = [NSColor internalCalibratedRed:225.0 green:224.0 blue:224.0 alpha:1]; + _serverCellFontColorDisabled = [NSColor internalCalibratedRed:225.0 green:224.0 blue:224.0 alpha:0.7]; + _serverCellSelectionFontColor_AW = [NSColor whiteColor]; + _serverCellSelectionFontColor_IA = [NSColor internalCalibratedRed:36.0 green:36.0 blue:36.0 alpha:1]; + _serverCellSelectionShadowColorAW = [NSColor colorWithCalibratedWhite:0.00 alpha:0.70]; + _serverCellSelectionShadowColorIA = [NSColor colorWithCalibratedWhite:1.00 alpha:0.30]; + _serverCellShadowColorAW = [NSColor colorWithCalibratedWhite:0.00 alpha:0.90]; + _serverCellShadowColorNA = [NSColor colorWithCalibratedWhite:0.00 alpha:0.90]; + + _channelCellFontColor = [NSColor internalCalibratedRed:225.0 green:224.0 blue:224.0 alpha:1]; + _channelCellSelectionFontColor_AW = [NSColor whiteColor]; + _channelCellSelectionFontColor_IA = [NSColor internalCalibratedRed:36.0 green:36.0 blue:36.0 alpha:1]; + _channelCellShadowColor = [NSColor colorWithCalibratedWhite:0.00 alpha:0.90]; + _channelCellSelectionShadowColor_AW = [NSColor colorWithCalibratedWhite:0.00 alpha:0.70]; + _channelCellSelectionShadowColor_IA = [NSColor colorWithCalibratedWhite:1.00 alpha:0.30]; + + /* //////////////////////////////////////////////////// */ + /* Black Aqua Colors. — @end */ + /* //////////////////////////////////////////////////// */ + } +} #pragma mark - #pragma mark Status Icon @@ -218,6 +312,8 @@ - (NSColor *)highlightColorWithFrame:(NSRect)cellFrame inView:(NSView *)controlV - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { + [self updateOutlineViewColorScheme]; + NSInteger selectedRow = [self.parent selectedRow]; if (self.cellItem) { @@ -248,16 +344,18 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView backgroundImage = @"ServerCellSelection"; } - if (isKeyWindow) { - backgroundImage = [backgroundImage stringByAppendingString:@"_Focused"]; - } else { - backgroundImage = [backgroundImage stringByAppendingString:@"_Unfocused"]; - } - - if (isGraphite) { - backgroundImage = [backgroundImage stringByAppendingString:@"_Graphite"]; - } else { - backgroundImage = [backgroundImage stringByAppendingString:@"_Aqua"]; + if (_drawUsingInvertedColors == NO) { + if (isKeyWindow) { + backgroundImage = [backgroundImage stringByAppendingString:@"_Focused"]; + } else { + backgroundImage = [backgroundImage stringByAppendingString:@"_Unfocused"]; + } + + if (isGraphite) { + backgroundImage = [backgroundImage stringByAppendingString:@"_Graphite"]; + } else { + backgroundImage = [backgroundImage stringByAppendingString:@"_Aqua"]; + } } if ([TPCPreferences invertSidebarColors]) { @@ -290,13 +388,7 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView if (isGroupItem == NO) { if (channel.isChannel) { - NSString *iconName = @"colloquyRoomTab"; - - if ([TPCPreferences invertSidebarColors]) { - iconName = [iconName stringByAppendingString:@"Inverted"]; - } else { - iconName = [iconName stringByAppendingString:@"Regular"]; - } + NSString *iconName = @"colloquyRoomTabRegular"; if (channel.isActive) { [self drawStatusBadge:iconName inCell:cellFrame withAlpha:1.0]; @@ -317,16 +409,19 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView } cellFrame.size.width -= (_badgeRightMargin * 2); + + [itemShadow setShadowBlurRadius:1.0]; + [itemShadow setShadowOffset:NSMakeSize(0, -1)]; if (isSelected == NO) { - [itemShadow setShadowOffset:NSMakeSize(1, -1)]; [itemShadow setShadowColor:_channelCellShadowColor]; } else { - [itemShadow setShadowBlurRadius:2.0]; - [itemShadow setShadowOffset:NSMakeSize(1, -1)]; + if (_drawUsingInvertedColors == NO) { + [itemShadow setShadowBlurRadius:2.0]; + } if (isKeyWindow) { - if (isGraphite) { + if (isGraphite && _drawUsingInvertedColors == NO) { [itemShadow setShadowColor:_graphiteSelectionColorAW]; } else { [itemShadow setShadowColor:_channelCellSelectionShadowColor_AW]; @@ -343,24 +438,18 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView if (isSelected) { [newValue addAttribute:NSFontAttributeName value:_channelCellSelectionFont range:textRange]; - [newValue addAttribute:NSForegroundColorAttributeName value:_channelCellSelectionFontColor range:textRange]; + + if (isKeyWindow) { + [newValue addAttribute:NSForegroundColorAttributeName value:_channelCellSelectionFontColor_AW range:textRange]; + } else { + [newValue addAttribute:NSForegroundColorAttributeName value:_channelCellSelectionFontColor_IA range:textRange]; + } } else { [newValue addAttribute:NSFontAttributeName value:_channelCellFont range:textRange]; [newValue addAttribute:NSForegroundColorAttributeName value:_channelCellFontColor range:textRange]; } [newValue addAttribute:NSShadowAttributeName value:itemShadow range:textRange]; - - if ([TPCPreferences useLogAntialiasing] == NO) { - [_NSGraphicsCurrentContext() saveGraphicsState]; - [_NSGraphicsCurrentContext() setShouldAntialias: NO]; - } - - [newValue drawInRect:cellFrame]; - - if ([TPCPreferences useLogAntialiasing] == NO) { - [_NSGraphicsCurrentContext() restoreGraphicsState]; - } } else { cellFrame.origin.y += 4; @@ -371,19 +460,27 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView controlColor = _serverCellFontColorDisabled; } - [itemShadow setShadowOffset:NSMakeSize(1, -1)]; + [itemShadow setShadowOffset:NSMakeSize(0, -1)]; + + if (_drawUsingInvertedColors) { + [itemShadow setShadowBlurRadius:1.0]; + } if (isSelected) { - controlColor = _serverCellSelectionFontColor; + if (isKeyWindow) { + controlColor = _serverCellSelectionFontColor_AW; + } else { + controlColor = _serverCellSelectionFontColor_IA; + } if (isKeyWindow) { if (isGraphite) { [itemShadow setShadowColor:_graphiteSelectionColorAW]; } else { - [itemShadow setShadowColor:_serverCellSelectionShadowFontColorAW]; + [itemShadow setShadowColor:_serverCellSelectionShadowColorAW]; } } else { - [itemShadow setShadowColor:_serverCellSelectionShadowFontColorIA]; + [itemShadow setShadowColor:_serverCellSelectionShadowColorIA]; } } else { if (isKeyWindow) { @@ -398,19 +495,18 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView [newValue addAttribute:NSFontAttributeName value:groupFont range:textRange]; [newValue addAttribute:NSShadowAttributeName value:itemShadow range:textRange]; [newValue addAttribute:NSForegroundColorAttributeName value:controlColor range:textRange]; - - if ([TPCPreferences useLogAntialiasing] == NO) { - [_NSGraphicsCurrentContext() saveGraphicsState]; - [_NSGraphicsCurrentContext() setShouldAntialias: NO]; - } - - [newValue drawInRect:cellFrame]; - - if ([TPCPreferences useLogAntialiasing] == NO) { - [_NSGraphicsCurrentContext() restoreGraphicsState]; - } } + if ([TPCPreferences useLogAntialiasing] == NO) { + [_NSGraphicsCurrentContext() saveGraphicsState]; + [_NSGraphicsCurrentContext() setShouldAntialias: NO]; + } + + [newValue drawInRect:cellFrame]; + + if ([TPCPreferences useLogAntialiasing] == NO) { + [_NSGraphicsCurrentContext() restoreGraphicsState]; + } } } diff --git a/Classes/Views/TVCThinSplitView.m b/Classes/Views/TVCThinSplitView.m index b7a46483fd..bff4e43d84 100755 --- a/Classes/Views/TVCThinSplitView.m +++ b/Classes/Views/TVCThinSplitView.m @@ -107,10 +107,11 @@ - (void)drawDividerInRect:(NSRect)rect { if (self.hidden) return; - NSColor *dividerColor; + NSColor *dividerColor = [NSColor colorWithCalibratedWhite:0.65 alpha:1]; - dividerColor = [NSColor colorWithCalibratedWhite:0.65 alpha:1]; - dividerColor = TXInvertSidebarColor(dividerColor); + if ([TPCPreferences invertSidebarColors]) { + dividerColor = [dividerColor invertColor]; + } [dividerColor set]; diff --git a/Classes/Views/User List/TVCMemberList.m b/Classes/Views/User List/TVCMemberList.m index b06ab8ef4e..015dde3c24 100755 --- a/Classes/Views/User List/TVCMemberList.m +++ b/Classes/Views/User List/TVCMemberList.m @@ -6,9 +6,21 @@ @implementation TVCMemberList +static NSColor *_invertedBackgroundColor; + - (void)updateBackgroundColor { - [self setBackgroundColor:TXInvertSidebarColor([NSColor sourceListBackgroundColor])]; + BOOL invertedColors = [TPCPreferences invertSidebarColors]; + + if (invertedColors) { + if (PointerIsEmpty(_invertedBackgroundColor)) { + _invertedBackgroundColor = [NSColor internalCalibratedRed:38.0 green:38.0 blue:38.0 alpha:1]; + } + + [self setBackgroundColor:_invertedBackgroundColor]; + } else { + [self setBackgroundColor:[NSColor sourceListBackgroundColor]]; + } } - (void)keyDown:(NSEvent *)e diff --git a/Classes/Views/User List/TVCMemberListCell.m b/Classes/Views/User List/TVCMemberListCell.m index 00ebebf898..6f9bb65a2a 100755 --- a/Classes/Views/User List/TVCMemberListCell.m +++ b/Classes/Views/User List/TVCMemberListCell.m @@ -4,35 +4,117 @@ #import "TextualApplication.h" -#define _badgeMargin 5.0 -#define _badgeHeight 14.0 -#define _badgeWidth 18.0 +@implementation TVCMemberListCell -#define _badgeFont [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5] -#define _badgeTextColorTS TXInvertSidebarColor([NSColor internalCalibratedRed:158 green:169 blue:197 alpha:1]) -#define _badgeTextColorNS TXInvertSidebarColor([NSColor whiteColor]) -#define _badgeShadowColor TXInvertSidebarColor([NSColor colorWithCalibratedWhite:1.00 alpha:0.60]) +#pragma mark - +#pragma mark Color Scheme -#define _badgeMessageBackgroundColorTS TXInvertSidebarColor([NSColor whiteColor] -#define _badgeMessageBackgroundColorQ TXInvertSidebarColor([NSColor internalCalibratedRed:186 green:0 blue:0 alpha:1]) -#define _badgeMessageBackgroundColorA TXInvertSidebarColor([NSColor internalCalibratedRed:157 green:0 blue:89 alpha:1]) -#define _badgeMessageBackgroundColorO TXInvertSidebarColor([NSColor internalCalibratedRed:210 green:105 blue:30 alpha:1]) -#define _badgeMessageBackgroundColorH TXInvertSidebarColor([NSColor internalCalibratedRed:48 green:128 blue:17 alpha:1]) -#define _badgeMessageBackgroundColorV TXInvertSidebarColor([NSColor internalCalibratedRed:57 green:154 blue:199 alpha:1]) -#define _badgeMessageBackgroundColorX TXInvertSidebarColor([NSColor internalCalibratedRed:152 green:168 blue:202 alpha:1]) +/* We have a lot of variables to keep track of… */ +static NSInteger _badgeMargin = 5.0; +static NSInteger _badgeHeight = 14.0; +static NSInteger _badgeWidth = 18.0; -#define _userCellFont [NSFont fontWithName:@"LucidaGrande" size:11.0] -#define _userCellFontColor TXInvertSidebarColor([NSColor blackColor]) -#define _userCellSelectionFontColor TXInvertSidebarColor([NSColor whiteColor]) -#define _userCellSelectionFont [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0] -#define _userCellShadowColor TXInvertSidebarColor([NSColor internalColorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6]) -#define _userCellSelectionShadowColorAW TXInvertSidebarColor([NSColor colorWithCalibratedWhite:0.00 alpha:0.48]) -#define _userCellSelectionShadowColorIA TXInvertSidebarColor([NSColor colorWithCalibratedWhite:0.00 alpha:0.30]) +static NSFont *_badgeFont; +static NSColor *_badgeTextColorTS; +static NSColor *_badgeTextColorNS; +static NSColor *_badgeShadowColor; -#define _graphiteSelectionColorAW TXInvertSidebarColor([NSColor internalCalibratedRed:17 green:73 blue:126 alpha:1.00]) +static NSColor *_badgeMessageBackgroundColorTS; +static NSColor *_badgeMessageBackgroundColorQ; +static NSColor *_badgeMessageBackgroundColorA; +static NSColor *_badgeMessageBackgroundColorO; +static NSColor *_badgeMessageBackgroundColorH; +static NSColor *_badgeMessageBackgroundColorV; +static NSColor *_badgeMessageBackgroundColorX; -@implementation TVCMemberListCell +static NSFont *_userCellFont; +static NSColor *_userCellFontColor; +static NSColor *_userCellSelectionFontColor; +static NSFont *_userCellSelectionFont; +static NSColor *_userCellShadowColor; +static NSColor *_userCellSelectionShadowColorAW; +static NSColor *_userCellSelectionShadowColorIA; +static NSColor *_graphiteSelectionColorAW; + +static BOOL _drawUsingInvertedColors; +static BOOL _defaultDrawingColorsPopulated; + +- (void)updateOutlineViewColorScheme +{ + BOOL invertedColors = [TPCPreferences invertSidebarColors]; + + if (_drawUsingInvertedColors == invertedColors && _defaultDrawingColorsPopulated) { + return; + } + + _drawUsingInvertedColors = invertedColors; + + if (_defaultDrawingColorsPopulated == NO) { + _badgeFont = [_NSFontManager() fontWithFamily:@"Helvetica" traits:NSBoldFontMask weight:15 size:10.5]; + + _userCellFont = [NSFont fontWithName:@"LucidaGrande" size:11.0]; + _userCellSelectionFont = [NSFont fontWithName:@"LucidaGrande-Bold" size:11.0]; + + _defaultDrawingColorsPopulated = YES; + } + + if (_drawUsingInvertedColors == NO) { + /* //////////////////////////////////////////////////// */ + /* Standard Aqua Colors. */ + /* //////////////////////////////////////////////////// */ + + _badgeTextColorTS = [NSColor internalCalibratedRed:158 green:169 blue:197 alpha:1]; + _badgeTextColorNS = [NSColor whiteColor]; + _badgeShadowColor = [NSColor colorWithCalibratedWhite:1.00 alpha:0.60]; + + _badgeMessageBackgroundColorTS = [NSColor whiteColor]; + _badgeMessageBackgroundColorQ = [NSColor internalCalibratedRed:186 green:0 blue:0 alpha:1]; + _badgeMessageBackgroundColorA = [NSColor internalCalibratedRed:157 green:0 blue:89 alpha:1]; + _badgeMessageBackgroundColorO = [NSColor internalCalibratedRed:210 green:105 blue:30 alpha:1]; + _badgeMessageBackgroundColorH = [NSColor internalCalibratedRed:48 green:128 blue:17 alpha:1]; + _badgeMessageBackgroundColorV = [NSColor internalCalibratedRed:57 green:154 blue:199 alpha:1]; + _badgeMessageBackgroundColorX = [NSColor internalCalibratedRed:152 green:168 blue:202 alpha:1]; + + _userCellFontColor = [NSColor blackColor]; + _userCellSelectionFontColor = [NSColor whiteColor]; + _userCellShadowColor = [NSColor internalColorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:0.6]; + _userCellSelectionShadowColorAW = [NSColor colorWithCalibratedWhite:0.00 alpha:0.48]; + _userCellSelectionShadowColorIA = [NSColor colorWithCalibratedWhite:0.00 alpha:0.30]; + + _graphiteSelectionColorAW = [NSColor internalCalibratedRed:17 green:73 blue:126 alpha:1.00]; + + /* //////////////////////////////////////////////////// */ + /* Standard Aqua Colors. — @end */ + /* //////////////////////////////////////////////////// */ + } else { + /* //////////////////////////////////////////////////// */ + /* Black Aqua Colors. */ + /* //////////////////////////////////////////////////// */ + + _badgeTextColorTS = [NSColor internalCalibratedRed:158 green:169 blue:197 alpha:1]; + _badgeTextColorNS = [NSColor whiteColor]; + _badgeShadowColor = [NSColor internalCalibratedRed:60.0 green:60.0 blue:60.0 alpha:1]; + + _badgeMessageBackgroundColorTS = [NSColor whiteColor]; + _badgeMessageBackgroundColorQ = [NSColor internalCalibratedRed:186 green:0 blue:0 alpha:1]; + _badgeMessageBackgroundColorA = [NSColor internalCalibratedRed:157 green:0 blue:89 alpha:1]; + _badgeMessageBackgroundColorO = [NSColor internalCalibratedRed:210 green:105 blue:30 alpha:1]; + _badgeMessageBackgroundColorH = [NSColor internalCalibratedRed:48 green:128 blue:17 alpha:1]; + _badgeMessageBackgroundColorV = [NSColor internalCalibratedRed:57 green:154 blue:199 alpha:1]; + _badgeMessageBackgroundColorX = [NSColor internalCalibratedRed:48 green:48 blue:48 alpha:1];; + + _userCellFontColor = [NSColor internalCalibratedRed:225.0 green:224.0 blue:224.0 alpha:1]; + _userCellSelectionFontColor = [NSColor whiteColor]; + _userCellShadowColor = [NSColor colorWithCalibratedWhite:0.00 alpha:0.90]; + _userCellSelectionShadowColorAW = [NSColor colorWithCalibratedWhite:0.00 alpha:0.70]; + _userCellSelectionShadowColorIA = [NSColor colorWithCalibratedWhite:1.00 alpha:0.30]; + + /* //////////////////////////////////////////////////// */ + /* Black Aqua Colors. — @end */ + /* //////////////////////////////////////////////////// */ + } +} #pragma mark - #pragma mark Status Badge @@ -168,6 +250,8 @@ - (NSColor *)highlightColorWithFrame:(NSRect)cellFrame inView:(NSView *)controlV - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)view { + [self updateOutlineViewColorScheme]; + NSArray *selectedRows = [self.parent selectedRows]; if (self.cellItem) { @@ -201,16 +285,18 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)view backgroundImage = @"ServerCellSelection"; } - if (isKeyWindow) { - backgroundImage = [backgroundImage stringByAppendingString:@"_Focused"]; - } else { - backgroundImage = [backgroundImage stringByAppendingString:@"_Unfocused"]; - } - - if (isGraphite) { - backgroundImage = [backgroundImage stringByAppendingString:@"_Graphite"]; - } else { - backgroundImage = [backgroundImage stringByAppendingString:@"_Aqua"]; + if (_drawUsingInvertedColors == NO) { + if (isKeyWindow) { + backgroundImage = [backgroundImage stringByAppendingString:@"_Focused"]; + } else { + backgroundImage = [backgroundImage stringByAppendingString:@"_Unfocused"]; + } + + if (isGraphite) { + backgroundImage = [backgroundImage stringByAppendingString:@"_Graphite"]; + } else { + backgroundImage = [backgroundImage stringByAppendingString:@"_Aqua"]; + } } if ([TPCPreferences invertSidebarColors]) { @@ -238,15 +324,15 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)view NSShadow *itemShadow = [NSShadow new]; + [itemShadow setShadowOffset:NSMakeSize(0, -1)]; + if (isSelected == NO) { - [itemShadow setShadowOffset:NSMakeSize(1, -1)]; [itemShadow setShadowColor:_userCellShadowColor]; } else { [itemShadow setShadowBlurRadius:2.0]; - [itemShadow setShadowOffset:NSMakeSize(1, -1)]; if (isKeyWindow) { - if (isGraphite) { + if (isGraphite && _drawUsingInvertedColors == NO) { [itemShadow setShadowColor:_graphiteSelectionColorAW]; } else { [itemShadow setShadowColor:_userCellSelectionShadowColorAW]; @@ -284,7 +370,6 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)view } } - } @end \ No newline at end of file diff --git a/Main Project (Textual).xcodeproj/project.pbxproj b/Main Project (Textual).xcodeproj/project.pbxproj index 06663782f8..bd20d06fa0 100644 --- a/Main Project (Textual).xcodeproj/project.pbxproj +++ b/Main Project (Textual).xcodeproj/project.pbxproj @@ -45,8 +45,11 @@ /* Begin PBXBuildFile section */ 4C28F441159200C900CD2CDE /* FormattingColor_Rainbow.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C28F43F159200C900CD2CDE /* FormattingColor_Rainbow.tif */; }; 4C28F442159200C900CD2CDE /* FormattingColor_Rainbow@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C28F440159200C900CD2CDE /* FormattingColor_Rainbow@2x.tif */; }; - 4C28F4451592019900CD2CDE /* colloquyRoomTabInverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C28F4431592019900CD2CDE /* colloquyRoomTabInverted@2x.tif */; }; 4C28F4461592019900CD2CDE /* colloquyRoomTabRegular@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C28F4441592019900CD2CDE /* colloquyRoomTabRegular@2x.tif */; }; + 4C2DD7D1159D27960062BEF4 /* ServerCellSelection_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C2DD7CF159D27950062BEF4 /* ServerCellSelection_Inverted@2x.tif */; }; + 4C2DD7D2159D27960062BEF4 /* ChannelCellSelection_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C2DD7D0159D27960062BEF4 /* ChannelCellSelection_Inverted@2x.tif */; }; + 4C2DD7D5159D279E0062BEF4 /* ServerCellSelection_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C2DD7D3159D279E0062BEF4 /* ServerCellSelection_Inverted.tif */; }; + 4C2DD7D6159D279E0062BEF4 /* ChannelCellSelection_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C2DD7D4159D279E0062BEF4 /* ChannelCellSelection_Inverted.tif */; }; 4C3D0B791594908B00567623 /* TPCPreferencesMigrationAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D0B781594908B00567623 /* TPCPreferencesMigrationAssistant.m */; }; 4C3D0B7C159490C800567623 /* TPCPreferencesMigrationAssistant.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C3D0B7B159490C800567623 /* TPCPreferencesMigrationAssistant.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4C46CCB71580468900846B64 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C46CCB51580468900846B64 /* libcrypto.dylib */; }; @@ -319,7 +322,6 @@ 4C8AF754158EB6CA0026668C /* GTMGarbageCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8AF748158EB6CA0026668C /* GTMGarbageCollection.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4C8AF755158EB6CA0026668C /* RegexKitLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8AF749158EB6CA0026668C /* RegexKitLite.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4C8AF756158EB6CA0026668C /* RLMAsyncSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8AF74A158EB6CA0026668C /* RLMAsyncSocket.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4C970759158D740A0005CF68 /* colloquyRoomTabInverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C970757158D740A0005CF68 /* colloquyRoomTabInverted.tif */; }; 4C97075A158D740A0005CF68 /* colloquyRoomTabRegular.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4C970758158D740A0005CF68 /* colloquyRoomTabRegular.tif */; }; 4CCC6B61158E8C48003A102B /* Scripts in Resources */ = {isa = PBXBuildFile; fileRef = 4CCC6B60158E8C48003A102B /* Scripts */; }; 4CCF2EE2158046F9006FFE21 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CCF2EE1158046F9006FFE21 /* Growl.framework */; }; @@ -346,38 +348,22 @@ 4CCF2F5215804868006FFE21 /* Styles in Resources */ = {isa = PBXBuildFile; fileRef = 4CCF2F5115804868006FFE21 /* Styles */; }; 4CCF2F9915804BC9006FFE21 /* core.js in Copy JavaScript Files */ = {isa = PBXBuildFile; fileRef = 4CCF2F5315804888006FFE21 /* core.js */; }; 4CCF2F9D15804BF8006FFE21 /* Growl.framework in Copy Additional Frameworks */ = {isa = PBXBuildFile; fileRef = 4CCF2EE1158046F9006FFE21 /* Growl.framework */; }; - 4CD0F3CC158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3BC158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua_Inverted.tif */; }; 4CD0F3CD158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3BD158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua.tif */; }; - 4CD0F3CE158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3BE158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite_Inverted.tif */; }; 4CD0F3CF158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3BF158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite.tif */; }; - 4CD0F3D0158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C0158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua_Inverted.tif */; }; 4CD0F3D1158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C1158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua.tif */; }; - 4CD0F3D2158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C2158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite_Inverted.tif */; }; 4CD0F3D3158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C3158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite.tif */; }; - 4CD0F3D4158D6975009F2A0C /* ServerCellSelection_Focused_Aqua_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C4158D6975009F2A0C /* ServerCellSelection_Focused_Aqua_Inverted.tif */; }; 4CD0F3D5158D6975009F2A0C /* ServerCellSelection_Focused_Aqua.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C5158D6975009F2A0C /* ServerCellSelection_Focused_Aqua.tif */; }; - 4CD0F3D6158D6975009F2A0C /* ServerCellSelection_Focused_Graphite_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C6158D6975009F2A0C /* ServerCellSelection_Focused_Graphite_Inverted.tif */; }; 4CD0F3D7158D6975009F2A0C /* ServerCellSelection_Focused_Graphite.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C7158D6975009F2A0C /* ServerCellSelection_Focused_Graphite.tif */; }; - 4CD0F3D8158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C8158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua_Inverted.tif */; }; 4CD0F3D9158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3C9158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua.tif */; }; - 4CD0F3DA158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite_Inverted.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3CA158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite_Inverted.tif */; }; 4CD0F3DB158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CD0F3CB158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite.tif */; }; - 4CDFA1A31591D761004BB3C2 /* ServerCellSelection_Focused_Graphite_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1931591D761004BB3C2 /* ServerCellSelection_Focused_Graphite_Inverted@2x.tif */; }; 4CDFA1A41591D761004BB3C2 /* ServerCellSelection_Focused_Graphite@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1941591D761004BB3C2 /* ServerCellSelection_Focused_Graphite@2x.tif */; }; - 4CDFA1A51591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1951591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif */; }; 4CDFA1A61591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1961591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite@2x.tif */; }; - 4CDFA1A71591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1971591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif */; }; 4CDFA1A81591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1981591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite@2x.tif */; }; - 4CDFA1A91591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1991591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite_Inverted@2x.tif */; }; 4CDFA1AA1591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA19A1591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite@2x.tif */; }; - 4CDFA1AB1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA19B1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua_Inverted@2x.tif */; }; 4CDFA1AC1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA19C1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua@2x.tif */; }; - 4CDFA1AD1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA19D1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif */; }; 4CDFA1AE1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA19E1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua@2x.tif */; }; - 4CDFA1AF1591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA19F1591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua_Inverted@2x.tif */; }; 4CDFA1B01591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1A01591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua@2x.tif */; }; 4CDFA1B11591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1A11591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua@2x.tif */; }; - 4CDFA1B21591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif in Resources */ = {isa = PBXBuildFile; fileRef = 4CDFA1A21591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -469,8 +455,11 @@ 4C1DC5521580420500A47BC9 /* Textual.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Textual.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4C28F43F159200C900CD2CDE /* FormattingColor_Rainbow.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FormattingColor_Rainbow.tif; path = "Resources/Images/IRC Formatting Colors/FormattingColor_Rainbow.tif"; sourceTree = SOURCE_ROOT; }; 4C28F440159200C900CD2CDE /* FormattingColor_Rainbow@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "FormattingColor_Rainbow@2x.tif"; path = "Resources/Images/IRC Formatting Colors/FormattingColor_Rainbow@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4C28F4431592019900CD2CDE /* colloquyRoomTabInverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "colloquyRoomTabInverted@2x.tif"; path = "Resources/Images/Status Badges/colloquyRoomTabInverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4C28F4441592019900CD2CDE /* colloquyRoomTabRegular@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "colloquyRoomTabRegular@2x.tif"; path = "Resources/Images/Status Badges/colloquyRoomTabRegular@2x.tif"; sourceTree = SOURCE_ROOT; }; + 4C2DD7CF159D27950062BEF4 /* ServerCellSelection_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Inverted@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; + 4C2DD7D0159D27960062BEF4 /* ChannelCellSelection_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Inverted@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; + 4C2DD7D3159D279E0062BEF4 /* ServerCellSelection_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Inverted.tif; path = "Resources/Images/User Interface/ServerCellSelection_Inverted.tif"; sourceTree = SOURCE_ROOT; }; + 4C2DD7D4159D279E0062BEF4 /* ChannelCellSelection_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Inverted.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4C3D0B781594908B00567623 /* TPCPreferencesMigrationAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPCPreferencesMigrationAssistant.m; path = "Migration Assistant/TPCPreferencesMigrationAssistant.m"; sourceTree = ""; }; 4C3D0B7B159490C800567623 /* TPCPreferencesMigrationAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCPreferencesMigrationAssistant.h; sourceTree = ""; }; 4C46CCB51580468900846B64 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = ../../../../usr/lib/libcrypto.dylib; sourceTree = ""; }; @@ -741,7 +730,6 @@ 4C8AF748158EB6CA0026668C /* GTMGarbageCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMGarbageCollection.h; sourceTree = ""; }; 4C8AF749158EB6CA0026668C /* RegexKitLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegexKitLite.h; sourceTree = ""; }; 4C8AF74A158EB6CA0026668C /* RLMAsyncSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RLMAsyncSocket.h; sourceTree = ""; }; - 4C970757158D740A0005CF68 /* colloquyRoomTabInverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = colloquyRoomTabInverted.tif; path = "Resources/Images/Status Badges/colloquyRoomTabInverted.tif"; sourceTree = SOURCE_ROOT; }; 4C970758158D740A0005CF68 /* colloquyRoomTabRegular.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = colloquyRoomTabRegular.tif; path = "Resources/Images/Status Badges/colloquyRoomTabRegular.tif"; sourceTree = SOURCE_ROOT; }; 4CCC6B47158E8C27003A102B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = SOURCE_ROOT; }; 4CCC6B60158E8C48003A102B /* Scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Scripts; path = "Resources/All Scripts/Bundled Scripts/Scripts"; sourceTree = SOURCE_ROOT; }; @@ -773,38 +761,22 @@ 4CCF2F181580481E006FFE21 /* FormattingColor_15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FormattingColor_15.png; path = "Resources/Images/IRC Formatting Colors/FormattingColor_15.png"; sourceTree = SOURCE_ROOT; }; 4CCF2F5115804868006FFE21 /* Styles */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Styles; path = Resources/Styles; sourceTree = SOURCE_ROOT; }; 4CCF2F5315804888006FFE21 /* core.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = core.js; path = Resources/Javascript/API/core.js; sourceTree = SOURCE_ROOT; }; - 4CD0F3BC158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Focused_Aqua_Inverted.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3BD158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Focused_Aqua.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua.tif"; sourceTree = SOURCE_ROOT; }; - 4CD0F3BE158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Focused_Graphite_Inverted.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3BF158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Focused_Graphite.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite.tif"; sourceTree = SOURCE_ROOT; }; - 4CD0F3C0158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Unfocused_Aqua_Inverted.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3C1158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Unfocused_Aqua.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua.tif"; sourceTree = SOURCE_ROOT; }; - 4CD0F3C2158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Unfocused_Graphite_Inverted.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3C3158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ChannelCellSelection_Unfocused_Graphite.tif; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite.tif"; sourceTree = SOURCE_ROOT; }; - 4CD0F3C4158D6975009F2A0C /* ServerCellSelection_Focused_Aqua_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Focused_Aqua_Inverted.tif; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3C5158D6975009F2A0C /* ServerCellSelection_Focused_Aqua.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Focused_Aqua.tif; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Aqua.tif"; sourceTree = SOURCE_ROOT; }; - 4CD0F3C6158D6975009F2A0C /* ServerCellSelection_Focused_Graphite_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Focused_Graphite_Inverted.tif; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3C7158D6975009F2A0C /* ServerCellSelection_Focused_Graphite.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Focused_Graphite.tif; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Graphite.tif"; sourceTree = SOURCE_ROOT; }; - 4CD0F3C8158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Unfocused_Aqua_Inverted.tif; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3C9158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Unfocused_Aqua.tif; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua.tif"; sourceTree = SOURCE_ROOT; }; - 4CD0F3CA158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite_Inverted.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Unfocused_Graphite_Inverted.tif; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted.tif"; sourceTree = SOURCE_ROOT; }; 4CD0F3CB158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ServerCellSelection_Unfocused_Graphite.tif; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA1931591D761004BB3C2 /* ServerCellSelection_Focused_Graphite_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Focused_Graphite_Inverted@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA1941591D761004BB3C2 /* ServerCellSelection_Focused_Graphite@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Focused_Graphite@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Graphite@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA1951591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA1961591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Unfocused_Graphite@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA1971591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA1981591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Unfocused_Graphite@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA1991591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Focused_Graphite_Inverted@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA19A1591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Focused_Graphite@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA19B1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Focused_Aqua_Inverted@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA19C1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Focused_Aqua@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Focused_Aqua@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA19D1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA19E1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ServerCellSelection_Unfocused_Aqua@2x.tif"; path = "Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA19F1591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Focused_Aqua_Inverted@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA1A01591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Focused_Aqua@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua@2x.tif"; sourceTree = SOURCE_ROOT; }; 4CDFA1A11591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Unfocused_Aqua@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua@2x.tif"; sourceTree = SOURCE_ROOT; }; - 4CDFA1A21591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif"; path = "Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif"; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1005,9 +977,7 @@ 4C46CC9C1580432400846B64 /* Status Badges */ = { isa = PBXGroup; children = ( - 4C970757158D740A0005CF68 /* colloquyRoomTabInverted.tif */, 4C970758158D740A0005CF68 /* colloquyRoomTabRegular.tif */, - 4C28F4431592019900CD2CDE /* colloquyRoomTabInverted@2x.tif */, 4C28F4441592019900CD2CDE /* colloquyRoomTabRegular@2x.tif */, ); name = "Status Badges"; @@ -1018,22 +988,16 @@ children = ( 4CDFA1921591D753004BB3C2 /* Retina */, 4CD0F3BD158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua.tif */, - 4CD0F3BC158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua_Inverted.tif */, 4CD0F3BF158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite.tif */, - 4CD0F3BE158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite_Inverted.tif */, 4CD0F3C1158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua.tif */, - 4CD0F3C0158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua_Inverted.tif */, 4CD0F3C3158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite.tif */, - 4CD0F3C2158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite_Inverted.tif */, 4C7D80CB159BD16D00C5151C /* MainWindowSegmentedControlUserTemplate.pdf */, 4CD0F3C5158D6975009F2A0C /* ServerCellSelection_Focused_Aqua.tif */, - 4CD0F3C4158D6975009F2A0C /* ServerCellSelection_Focused_Aqua_Inverted.tif */, 4CD0F3C7158D6975009F2A0C /* ServerCellSelection_Focused_Graphite.tif */, - 4CD0F3C6158D6975009F2A0C /* ServerCellSelection_Focused_Graphite_Inverted.tif */, 4CD0F3C9158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua.tif */, - 4CD0F3C8158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua_Inverted.tif */, 4CD0F3CB158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite.tif */, - 4CD0F3CA158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite_Inverted.tif */, + 4C2DD7D3159D279E0062BEF4 /* ServerCellSelection_Inverted.tif */, + 4C2DD7D4159D279E0062BEF4 /* ChannelCellSelection_Inverted.tif */, ); name = "User Interface"; sourceTree = ""; @@ -1631,22 +1595,16 @@ 4CDFA1921591D753004BB3C2 /* Retina */ = { isa = PBXGroup; children = ( - 4CDFA1931591D761004BB3C2 /* ServerCellSelection_Focused_Graphite_Inverted@2x.tif */, 4CDFA1941591D761004BB3C2 /* ServerCellSelection_Focused_Graphite@2x.tif */, - 4CDFA1951591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif */, 4CDFA1961591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite@2x.tif */, - 4CDFA1971591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif */, 4CDFA1981591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite@2x.tif */, - 4CDFA1991591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite_Inverted@2x.tif */, 4CDFA19A1591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite@2x.tif */, - 4CDFA19B1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua_Inverted@2x.tif */, 4CDFA19C1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua@2x.tif */, - 4CDFA19D1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif */, 4CDFA19E1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua@2x.tif */, - 4CDFA19F1591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua_Inverted@2x.tif */, 4CDFA1A01591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua@2x.tif */, 4CDFA1A11591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua@2x.tif */, - 4CDFA1A21591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif */, + 4C2DD7CF159D27950062BEF4 /* ServerCellSelection_Inverted@2x.tif */, + 4C2DD7D0159D27960062BEF4 /* ChannelCellSelection_Inverted@2x.tif */, ); name = Retina; sourceTree = ""; @@ -1896,23 +1854,14 @@ 4CCF2F281580481E006FFE21 /* FormattingColor_14.png in Resources */, 4CCF2F291580481E006FFE21 /* FormattingColor_15.png in Resources */, 4CCF2F5215804868006FFE21 /* Styles in Resources */, - 4CD0F3CC158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua_Inverted.tif in Resources */, 4CD0F3CD158D6975009F2A0C /* ChannelCellSelection_Focused_Aqua.tif in Resources */, - 4CD0F3CE158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite_Inverted.tif in Resources */, 4CD0F3CF158D6975009F2A0C /* ChannelCellSelection_Focused_Graphite.tif in Resources */, - 4CD0F3D0158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua_Inverted.tif in Resources */, 4CD0F3D1158D6975009F2A0C /* ChannelCellSelection_Unfocused_Aqua.tif in Resources */, - 4CD0F3D2158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite_Inverted.tif in Resources */, 4CD0F3D3158D6975009F2A0C /* ChannelCellSelection_Unfocused_Graphite.tif in Resources */, - 4CD0F3D4158D6975009F2A0C /* ServerCellSelection_Focused_Aqua_Inverted.tif in Resources */, 4CD0F3D5158D6975009F2A0C /* ServerCellSelection_Focused_Aqua.tif in Resources */, - 4CD0F3D6158D6975009F2A0C /* ServerCellSelection_Focused_Graphite_Inverted.tif in Resources */, 4CD0F3D7158D6975009F2A0C /* ServerCellSelection_Focused_Graphite.tif in Resources */, - 4CD0F3D8158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua_Inverted.tif in Resources */, 4CD0F3D9158D6975009F2A0C /* ServerCellSelection_Unfocused_Aqua.tif in Resources */, - 4CD0F3DA158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite_Inverted.tif in Resources */, 4CD0F3DB158D6975009F2A0C /* ServerCellSelection_Unfocused_Graphite.tif in Resources */, - 4C970759158D740A0005CF68 /* colloquyRoomTabInverted.tif in Resources */, 4C97075A158D740A0005CF68 /* colloquyRoomTabRegular.tif in Resources */, 4CCC6B61158E8C48003A102B /* Scripts in Resources */, 4C8AF728158E9B330026668C /* TDCAboutPanel.xib in Resources */, @@ -1939,25 +1888,16 @@ 4C7188CC1591AB8600FC5E54 /* DIGreenBadgeCenter.png in Resources */, 4C7188CD1591AB8600FC5E54 /* DIGreenBadgeLeft.png in Resources */, 4C7188CE1591AB8600FC5E54 /* DIGreenBadgeRight.png in Resources */, - 4CDFA1A31591D761004BB3C2 /* ServerCellSelection_Focused_Graphite_Inverted@2x.tif in Resources */, 4CDFA1A41591D761004BB3C2 /* ServerCellSelection_Focused_Graphite@2x.tif in Resources */, - 4CDFA1A51591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif in Resources */, 4CDFA1A61591D761004BB3C2 /* ServerCellSelection_Unfocused_Graphite@2x.tif in Resources */, - 4CDFA1A71591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif in Resources */, 4CDFA1A81591D761004BB3C2 /* ChannelCellSelection_Unfocused_Graphite@2x.tif in Resources */, - 4CDFA1A91591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite_Inverted@2x.tif in Resources */, 4CDFA1AA1591D761004BB3C2 /* ChannelCellSelection_Focused_Graphite@2x.tif in Resources */, - 4CDFA1AB1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua_Inverted@2x.tif in Resources */, 4CDFA1AC1591D761004BB3C2 /* ServerCellSelection_Focused_Aqua@2x.tif in Resources */, - 4CDFA1AD1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif in Resources */, 4CDFA1AE1591D761004BB3C2 /* ServerCellSelection_Unfocused_Aqua@2x.tif in Resources */, - 4CDFA1AF1591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua_Inverted@2x.tif in Resources */, 4CDFA1B01591D761004BB3C2 /* ChannelCellSelection_Focused_Aqua@2x.tif in Resources */, 4CDFA1B11591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua@2x.tif in Resources */, - 4CDFA1B21591D761004BB3C2 /* ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif in Resources */, 4C28F441159200C900CD2CDE /* FormattingColor_Rainbow.tif in Resources */, 4C28F442159200C900CD2CDE /* FormattingColor_Rainbow@2x.tif in Resources */, - 4C28F4451592019900CD2CDE /* colloquyRoomTabInverted@2x.tif in Resources */, 4C28F4461592019900CD2CDE /* colloquyRoomTabRegular@2x.tif in Resources */, 4C63C6B61592F0B0009F1635 /* TPWTB_Alerts.tif in Resources */, 4C63C6B71592F0B0009F1635 /* TPWTB_Alerts@2x.tif in Resources */, @@ -1968,6 +1908,10 @@ 4C63C6C41592FF4E009F1635 /* TPWTB_Interface.tif in Resources */, 4C63C6C51592FF4E009F1635 /* TPWTB_Interface@2x.tif in Resources */, 4C7D80CC159BD16D00C5151C /* MainWindowSegmentedControlUserTemplate.pdf in Resources */, + 4C2DD7D1159D27960062BEF4 /* ServerCellSelection_Inverted@2x.tif in Resources */, + 4C2DD7D2159D27960062BEF4 /* ChannelCellSelection_Inverted@2x.tif in Resources */, + 4C2DD7D5159D279E0062BEF4 /* ServerCellSelection_Inverted.tif in Resources */, + 4C2DD7D6159D279E0062BEF4 /* ChannelCellSelection_Inverted.tif in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Resources/Images/Status Badges/colloquyRoomTabInverted.tif b/Resources/Images/Status Badges/colloquyRoomTabInverted.tif deleted file mode 100644 index 3eb19761b1..0000000000 Binary files a/Resources/Images/Status Badges/colloquyRoomTabInverted.tif and /dev/null differ diff --git a/Resources/Images/Status Badges/colloquyRoomTabInverted@2x.tif b/Resources/Images/Status Badges/colloquyRoomTabInverted@2x.tif deleted file mode 100644 index ea65740d97..0000000000 Binary files a/Resources/Images/Status Badges/colloquyRoomTabInverted@2x.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted.tif b/Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted.tif deleted file mode 100755 index 629e7c4760..0000000000 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted@2x.tif b/Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted@2x.tif deleted file mode 100644 index edb3031aa9..0000000000 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Focused_Aqua_Inverted@2x.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted.tif b/Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted.tif deleted file mode 100755 index 83be6c3447..0000000000 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted@2x.tif b/Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted@2x.tif deleted file mode 100644 index 950c468fe6..0000000000 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Focused_Graphite_Inverted@2x.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted.tif b/Resources/Images/User Interface/ChannelCellSelection_Inverted.tif similarity index 93% rename from Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted.tif rename to Resources/Images/User Interface/ChannelCellSelection_Inverted.tif index e448f474ac..52e08af2da 100755 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted.tif and b/Resources/Images/User Interface/ChannelCellSelection_Inverted.tif differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif b/Resources/Images/User Interface/ChannelCellSelection_Inverted@2x.tif similarity index 86% rename from Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif rename to Resources/Images/User Interface/ChannelCellSelection_Inverted@2x.tif index 2505e69b63..e2339f2a7c 100644 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Graphite_Inverted@2x.tif and b/Resources/Images/User Interface/ChannelCellSelection_Inverted@2x.tif differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif b/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif deleted file mode 100644 index a3e72df924..0000000000 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted@2x.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted.tif b/Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted.tif deleted file mode 100755 index 8a5b678313..0000000000 Binary files a/Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted@2x.tif b/Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted@2x.tif deleted file mode 100644 index fc166501e9..0000000000 Binary files a/Resources/Images/User Interface/ServerCellSelection_Focused_Aqua_Inverted@2x.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted.tif b/Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted.tif deleted file mode 100755 index b5eb1bd1a2..0000000000 Binary files a/Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted@2x.tif b/Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted@2x.tif deleted file mode 100644 index f308cf1f89..0000000000 Binary files a/Resources/Images/User Interface/ServerCellSelection_Focused_Graphite_Inverted@2x.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted.tif b/Resources/Images/User Interface/ServerCellSelection_Inverted.tif similarity index 86% rename from Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted.tif rename to Resources/Images/User Interface/ServerCellSelection_Inverted.tif index c927c91428..a73a07d0b7 100755 Binary files a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted.tif and b/Resources/Images/User Interface/ServerCellSelection_Inverted.tif differ diff --git a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted.tif b/Resources/Images/User Interface/ServerCellSelection_Inverted@2x.tif old mode 100755 new mode 100644 similarity index 87% rename from Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted.tif rename to Resources/Images/User Interface/ServerCellSelection_Inverted@2x.tif index 7944da1510..9f2e08e844 Binary files a/Resources/Images/User Interface/ChannelCellSelection_Unfocused_Aqua_Inverted.tif and b/Resources/Images/User Interface/ServerCellSelection_Inverted@2x.tif differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted.tif b/Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted.tif deleted file mode 100755 index 080b73572e..0000000000 Binary files a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif b/Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif deleted file mode 100644 index 82664d24df..0000000000 Binary files a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Aqua_Inverted@2x.tif and /dev/null differ diff --git a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif b/Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif deleted file mode 100644 index 58dccf1b0d..0000000000 Binary files a/Resources/Images/User Interface/ServerCellSelection_Unfocused_Graphite_Inverted@2x.tif and /dev/null differ diff --git a/Resources/Info.plist b/Resources/Info.plist index 39c9cbbfd6..80fe8f94b2 100755 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -47,8 +47,8 @@ TXBundleBuildCodeName Dave Matthews Band® Magic Brownies™ Encore Edition TXBundleBuildNumber - 11539 + 11618 TXBundleBuildReference - 2.1.1-198-gb92ee35-debug,llvm4.0 + 2.1.1-202-g5a14632-debug,llvm4.0 diff --git a/Resources/Localization/English.lproj/TXCMainMenu.xib b/Resources/Localization/English.lproj/TXCMainMenu.xib index ed2847abe2..4be3fd401e 100755 --- a/Resources/Localization/English.lproj/TXCMainMenu.xib +++ b/Resources/Localization/English.lproj/TXCMainMenu.xib @@ -2810,7 +2810,7 @@ Logs - l + L 1048576 2147483647 @@ -3049,7 +3049,7 @@ {188, 513} - + YES NO YES @@ -3190,7 +3190,7 @@ {188, 513} - + 133648 @@ -3266,7 +3266,7 @@ {223, 513} - + YES NO YES @@ -3364,7 +3364,7 @@ {{-1, 0}, {223, 513}} - + 133648 @@ -3470,7 +3470,7 @@ {498, 18} - + _NS:3760 @@ -3566,7 +3566,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{481, 1}, {16, 13}} - _NS:3774 NO @@ -3592,7 +3591,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{144, 9}, {498, 18}} - + _NS:148 133648