diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabClose.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabClose.png deleted file mode 100644 index 9d5e9604..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabClose.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabClose@2x.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabClose@2x.png deleted file mode 100644 index 382a3f13..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabClose@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabClosePressed.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabClosePressed.png deleted file mode 100644 index ec73a499..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabClosePressed.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabClosePressed@2x.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabClosePressed@2x.png deleted file mode 100644 index 2bf4d707..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabClosePressed@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabCloseRollover.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabCloseRollover.png deleted file mode 100644 index 99f64e81..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabCloseRollover.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabCloseRollover@2x.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabCloseRollover@2x.png deleted file mode 100644 index 61816f65..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabCloseRollover@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabFill.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabFill.png deleted file mode 100644 index cfe27ec5..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabFill.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabFill@2x.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabFill@2x.png deleted file mode 100644 index 7b11dc8d..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabFill@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabLeftCap.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabLeftCap.png deleted file mode 100644 index 9740f54c..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabLeftCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabLeftCap@2x.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabLeftCap@2x.png deleted file mode 100644 index 6152e142..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabLeftCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabRightCap.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabRightCap.png deleted file mode 100644 index 91f74fd2..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabRightCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW ActiveTabRightCap@2x.png b/Frameworks/OakTabBarView/gfx/AW ActiveTabRightCap@2x.png deleted file mode 100644 index eab22955..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW ActiveTabRightCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabBG.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabBG.png deleted file mode 100644 index 253450c7..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabBG.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabBG@2x.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabBG@2x.png deleted file mode 100644 index fa496bfb..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabBG@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabClose.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabClose.png deleted file mode 100644 index 32e0f7ba..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabClose.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabClose@2x.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabClose@2x.png deleted file mode 100644 index 43fdcb82..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabClose@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabClosePressed.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabClosePressed.png deleted file mode 100644 index 12346548..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabClosePressed.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabClosePressed@2x.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabClosePressed@2x.png deleted file mode 100644 index 65ea5e5f..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabClosePressed@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabCloseRollover.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabCloseRollover.png deleted file mode 100644 index 0eb2ab42..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabCloseRollover.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabCloseRollover@2x.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabCloseRollover@2x.png deleted file mode 100644 index 4dca105d..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabCloseRollover@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabLeftCap.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabLeftCap.png deleted file mode 100644 index 680656d3..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabLeftCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabLeftCap@2x.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabLeftCap@2x.png deleted file mode 100644 index de532ef2..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabLeftCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabRightCap.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabRightCap.png deleted file mode 100644 index 97fa3539..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabRightCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/AW InactiveTabRightCap@2x.png b/Frameworks/OakTabBarView/gfx/AW InactiveTabRightCap@2x.png deleted file mode 100644 index 88e262e7..00000000 Binary files a/Frameworks/OakTabBarView/gfx/AW InactiveTabRightCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabClose.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabClose.png deleted file mode 100644 index d840e9e5..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabClose.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabClose@2x.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabClose@2x.png deleted file mode 100644 index 696b232c..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabClose@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabClosePressed.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabClosePressed.png deleted file mode 100644 index f99f3bd6..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabClosePressed.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabClosePressed@2x.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabClosePressed@2x.png deleted file mode 100644 index 68a4dce6..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabClosePressed@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabCloseRollover.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabCloseRollover.png deleted file mode 100644 index 6fe7dd89..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabCloseRollover.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabCloseRollover@2x.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabCloseRollover@2x.png deleted file mode 100644 index f0e17189..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabCloseRollover@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabFill.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabFill.png deleted file mode 100644 index cb3f7a80..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabFill.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabFill@2x.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabFill@2x.png deleted file mode 100644 index 9814161c..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabFill@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabLeftCap.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabLeftCap.png deleted file mode 100644 index fcb657d8..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabLeftCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabLeftCap@2x.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabLeftCap@2x.png deleted file mode 100644 index 7d932af1..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabLeftCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabRightCap.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabRightCap.png deleted file mode 100644 index 82c20721..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabRightCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW ActiveTabRightCap@2x.png b/Frameworks/OakTabBarView/gfx/IW ActiveTabRightCap@2x.png deleted file mode 100644 index 84ea689b..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW ActiveTabRightCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabBG.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabBG.png deleted file mode 100644 index fec01a5a..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabBG.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabBG@2x.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabBG@2x.png deleted file mode 100644 index b5456532..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabBG@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabClose.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabClose.png deleted file mode 100644 index 980816f2..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabClose.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabClose@2x.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabClose@2x.png deleted file mode 100644 index ff2d0993..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabClose@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabClosePressed.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabClosePressed.png deleted file mode 100644 index 39ce34bc..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabClosePressed.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabClosePressed@2x.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabClosePressed@2x.png deleted file mode 100644 index 5648f593..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabClosePressed@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabCloseRollover.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabCloseRollover.png deleted file mode 100644 index 02632cfa..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabCloseRollover.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabCloseRollover@2x.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabCloseRollover@2x.png deleted file mode 100644 index d0e6f7bb..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabCloseRollover@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabLeftCap.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabLeftCap.png deleted file mode 100644 index 2bf3ee30..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabLeftCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabLeftCap@2x.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabLeftCap@2x.png deleted file mode 100644 index d8861982..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabLeftCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabRightCap.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabRightCap.png deleted file mode 100644 index 6e70cb74..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabRightCap.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/IW InactiveTabRightCap@2x.png b/Frameworks/OakTabBarView/gfx/IW InactiveTabRightCap@2x.png deleted file mode 100644 index 46e4ed58..00000000 Binary files a/Frameworks/OakTabBarView/gfx/IW InactiveTabRightCap@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedPressed_Template.png b/Frameworks/OakTabBarView/gfx/TabClose_ModifiedPressed_Template.png deleted file mode 100644 index 65b44a4e..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedPressed_Template.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedPressed_Template@2x.png b/Frameworks/OakTabBarView/gfx/TabClose_ModifiedPressed_Template@2x.png deleted file mode 100644 index f4aab31e..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedPressed_Template@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedRollover_Template.png b/Frameworks/OakTabBarView/gfx/TabClose_ModifiedRollover_Template.png deleted file mode 100644 index e3745677..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedRollover_Template.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedRollover_Template@2x.png b/Frameworks/OakTabBarView/gfx/TabClose_ModifiedRollover_Template@2x.png deleted file mode 100644 index 5cec1486..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabClose_ModifiedRollover_Template@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabClose_Modified_Template.png b/Frameworks/OakTabBarView/gfx/TabClose_Modified_Template.png deleted file mode 100644 index 9bc4de1b..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabClose_Modified_Template.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabClose_Modified_Template@2x.png b/Frameworks/OakTabBarView/gfx/TabClose_Modified_Template@2x.png deleted file mode 100644 index c1b679f4..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabClose_Modified_Template@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabOverflowTemplate.png b/Frameworks/OakTabBarView/gfx/TabOverflowTemplate.png deleted file mode 100644 index ba71ec63..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabOverflowTemplate.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/gfx/TabOverflowTemplate@2x.png b/Frameworks/OakTabBarView/gfx/TabOverflowTemplate@2x.png deleted file mode 100644 index 83950373..00000000 Binary files a/Frameworks/OakTabBarView/gfx/TabOverflowTemplate@2x.png and /dev/null differ diff --git a/Frameworks/OakTabBarView/src/OakTabItemView.mm b/Frameworks/OakTabBarView/src/OakTabItemView.mm index a96694d0..8e28b129 100644 --- a/Frameworks/OakTabBarView/src/OakTabItemView.mm +++ b/Frameworks/OakTabBarView/src/OakTabItemView.mm @@ -44,53 +44,6 @@ static NSString* kUserDefaultsTabItemLineBreakStyleKey = @"tabItemLineBreakStyle return res; } -- (NSDictionary*)mavericksImages -{ - NSDictionary* imageNames = @{ - @"tabBar": @{ - @"AW_normal": @"AW InactiveTabBG", - @"IW_normal": @"IW InactiveTabBG", - }, - @"tabItemSelected": @{ - @"AW_normal": @"AW ActiveTabFill", - @"IW_normal": @"IW ActiveTabFill", - }, - @"leftTabCap": @{ - @"AW_normal": @"AW InactiveTabLeftCap", - @"IW_normal": @"IW InactiveTabLeftCap", - }, - @"leftTabCapSelected": @{ - @"AW_normal": @"AW ActiveTabLeftCap", - @"IW_normal": @"IW ActiveTabLeftCap", - }, - @"rightTabCap": @{ - @"AW_normal": @"AW InactiveTabRightCap", - @"IW_normal": @"IW InactiveTabRightCap", - }, - @"rightTabCapSelected": @{ - @"AW_normal": @"AW ActiveTabRightCap", - @"IW_normal": @"IW ActiveTabRightCap", - }, - @"closeButton": @{ - @"AW_normal": @"AW ActiveTabClose", - @"AW_pressed": @"AW ActiveTabClosePressed", - @"AW_rollover": @"AW ActiveTabCloseRollover", - @"IW_normal": @"IW ActiveTabClose", - @"IW_pressed": @"IW ActiveTabClosePressed", - @"IW_rollover": @"IW ActiveTabCloseRollover", - }, - @"closeButtonModified": @{ - @"AW_normal": @"TabClose_Modified", - @"AW_pressed": @"TabClose_ModifiedPressed", - @"AW_rollover": @"TabClose_ModifiedRollover", - }, - @"overflowButton": @{ - @"AW_normal": @"TabOverflowTemplate", - }, - }; - return [self imagesForNames:imageNames]; -} - - (NSDictionary*)yosemiteImages { NSDictionary* imageNames = @{ @@ -224,8 +177,7 @@ static NSString* kUserDefaultsTabItemLineBreakStyleKey = @"tabItemLineBreakStyle [[NSApplication sharedApplication] addObserver:self forKeyPath:@"effectiveAppearance" options:NSKeyValueObservingOptionNew context:nil]; } - // MAC_OS_X_VERSION_10_10 - else if(OAK_AVAILABLE(10, 10)) + else { _selectedTabTextStyles = _activeTabTextStyles.mutableCopy; _selectedTabTextStyles[NSForegroundColorAttributeName] = [NSColor controlTextColor]; @@ -234,23 +186,6 @@ static NSString* kUserDefaultsTabItemLineBreakStyleKey = @"tabItemLineBreakStyle _leftPadding = -1; _rightPadding = 0; } - else - { - _selectedTabTextStyles = _activeTabTextStyles.copy; - - _images = [self mavericksImages]; - _leftPadding = 0; - _rightPadding = -5; - - NSShadow* shadow = [NSShadow new]; - [shadow setShadowColor:[NSColor colorWithCalibratedWhite:1 alpha:0.5]]; - [shadow setShadowOffset:NSMakeSize(0, -1)]; - [shadow setShadowBlurRadius:1]; - - NSDictionary* fontStyles = @{ NSShadowAttributeName: shadow, NSFontAttributeName: [NSFont boldSystemFontOfSize:11] }; - [_activeTabTextStyles addEntriesFromDictionary:fontStyles]; - [_inactiveTabTextStyles addEntriesFromDictionary:fontStyles]; - } NSImage* rightCapImage = _images[@"rightTabCap"][@"AW_normal"]; _tabViewSpacing = rightCapImage ? -rightCapImage.size.width : 0;