Permalink
Browse files

Lots of Updates

* Fixed install paths to use @rpath
* Added BGHUDTabView & BGHUDTabViewItem to main header
* Disabled Slide and Animate options in BGHUDSegmenetedCell
* Removed old drawing code, all drawing is now handled by embedded tabCell (BGHUDSegmentedCell)
* Various changes to the test project.
  • Loading branch information...
Timothy Davis Timothy Davis
Timothy Davis authored and Timothy Davis committed Apr 12, 2011
1 parent 148d20f commit 0d0bdef75742b100d047afefd8f56246203cfa42
View
@@ -9,4 +9,5 @@ BGHUDAppKit.xcodeproj/xcuserdata/binarygod.xcuserdatad/xcschemes/BGHUDAppKitPlug
BGHUDAppKit.xcodeproj/xcuserdata/binarygod.xcuserdatad/xcschemes/xcschememanagement.plist
bghudtest/bghudtest.xcodeproj/xcuserdata/binarygod.xcuserdatad/xcschemes/xcschememanagement.plist
bghudtest/bghudtest.xcodeproj/xcuserdata/binarygod.xcuserdatad/xcschemes/bghudtest.xcscheme
-bghudtest/bghudtest.xcodeproj/project.xcworkspace/xcuserdata/binarygod.xcuserdatad/UserInterfaceState.xcuserstate
+bghudtest/bghudtest.xcodeproj/project.xcworkspace/xcuserdata/binarygod.xcuserdatad/UserInterfaceState.xcuserstate
+BGHUDAppKit.xcodeproj/xcuserdata/binarygod.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -167,6 +167,7 @@
0259C574FE90428111CA0C5A /* BGHUDAppKit */ = {
isa = PBXGroup;
children = (
+ E70E5C9D1354CC3F00BAA5B0 /* Test Project */,
54D33B2C06778E4400C9C163 /* Framework */,
0259C582FE90428111CA0C5A /* Resources */,
1ED78706FE9D4A0611CA0C5A /* Products */,
@@ -281,6 +282,13 @@
name = BGHUDTabView;
sourceTree = "<group>";
};
+ E70E5C9D1354CC3F00BAA5B0 /* Test Project */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = "Test Project";
+ sourceTree = "<group>";
+ };
E7631D730E4DE6740092074F /* BGHUDColorWell */ = {
isa = PBXGroup;
children = (
@@ -654,11 +662,7 @@
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VALUE = NO;
INFOPLIST_FILE = "BGHUDAppKitFramework-Info.plist";
- INSTALL_PATH = "@executable_path/../Frameworks";
- OTHER_LDFLAGS = (
- "-seg1addr",
- 0xb0440100,
- );
+ INSTALL_PATH = "@rpath";
PRODUCT_NAME = BGHUDAppKit;
SKIP_INSTALL = NO;
};
@@ -678,12 +682,8 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
INFOPLIST_FILE = "BGHUDAppKitFramework-Info.plist";
- INSTALL_PATH = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@rpath";
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
- OTHER_LDFLAGS = (
- "-seg1addr",
- 0xb0000000,
- );
PRODUCT_NAME = BGHUDAppKit;
SEPARATE_STRIP = YES;
SKIP_INSTALL = NO;
@@ -699,6 +699,7 @@
GCC_MODEL_TUNING = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ INSTALL_PATH = "@rpath";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
SDKROOT = macosx10.7;
@@ -713,6 +714,7 @@
GCC_MODEL_TUNING = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ INSTALL_PATH = "@rpath";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
SDKROOT = macosx10.7;
View
@@ -54,3 +54,5 @@
#import "BGHUDView.h"
#import "BGHUDComboBoxCell.h"
#import "BGHUDStepperCell.h"
+#import "BGHUDTabView.h"
+#import "BGHUDTabViewItem.h"
@@ -357,6 +357,15 @@ -(BOOL)hasText {
return flag;
}
+- (BOOL)_canAnimate {
+
+ return NO;
+}
+
+- (BOOL)_isSliderStyle {
+ return NO;
+}
+
-(void)dealloc {
[themeKey release];
View
@@ -31,6 +31,20 @@
// POSSIBILITY OF SUCH DAMAGE.
#import "BGHUDTabView.h"
+#import "BGHUDSegmentedCell.h"
+
+@interface NSTabView (Private)
+
+- (NSRect)_tabRectForTabViewItem:(id)arg1;
+- (void)_drawThemeBezelBorder:(id)arg1 inRect:(NSRect)arg2;
+- (NSRect)_legacy__tabRectForTabViewItem:(id)arg1;
+- (NSRect)_themeContentRect;
+- (NSRect)_themeTabAndBarArea;
+- (NSRect)_titleRectForTabViewItem:(id)arg1;
+- (id)_tabsCell;
+- (void)_setTabsCell:(id)arg1;
+
+@end
@implementation BGHUDTabView
@@ -65,10 +79,13 @@ -(id)initWithCoder:(NSCoder *) aDecoder {
if( !isSubclass )
{
+ NSLog(@"A");
self = [super initWithCoder: aDecoder];
}
else
{
+
+ NSLog(@"B");
NSKeyedUnarchiver *modDecoder = (id)aDecoder;
[modDecoder setClass: [BGHUDTabViewItem class] forClassName: @"NSTabViewItem"];
@@ -89,6 +106,11 @@ -(id)initWithCoder:(NSCoder *) aDecoder {
}
}
+ BGHUDSegmentedCell *myCell = [[BGHUDSegmentedCell alloc] init];
+ [myCell setSegmentStyle: NSSegmentStyleRounded];
+
+ [self _setTabsCell: myCell];
+ [myCell release];
return self;
}
@@ -121,8 +143,10 @@ -(void)encodeWithCoder: (NSCoder *)coder {
[coder encodeObject: self.themeKey forKey: @"themeKey"];
}
--(void)_drawThemeTab:(id) tabItem withState:(NSUInteger) state inRect:(NSRect) aRect {
+/*-(void)_drawThemeTab:(id) tabItem withState:(NSUInteger) state inRect:(NSRect) aRect {
+ NSLog(@"_drawThemeTab");
+
NSInteger index = [self indexOfTabViewItem: tabItem];
int gradientAngle = 90;
NSBezierPath *path;
@@ -290,6 +314,50 @@ -(void)_drawThemeTab:(id) tabItem withState:(NSUInteger) state inRect:(NSRect) a
[path release];
}
+}*/
+
+/*- (void)drawRect:(NSRect)arg1 {
+
+ for(BGHUDTabViewItem *item in [self tabViewItems]) {
+
+ [self _drawThemeTab: item withState: (item == [self selectedTabViewItem]) ? 0 : 1 inRect: [self _tabRectForTabViewItem: item]];
+ }
+}*/
+
+/*- (BOOL)_coreUIDrawTab:(id)arg1 withState:(unsigned long long)arg2 inRect:(struct CGRect)arg3 {
+
+ return NO;
+}
+
+- (BOOL)_coreUIDrawBezelInRect:(struct CGRect)arg1 withClip:(struct CGRect)arg2 {
+ return NO;
+}
+
+- (BOOL)_shouldTryCoreUIDrawing {
+
+ return NO;
+}*/
+
+/*- (void)_drawThemeBezelBorder:(id)arg1 inRect:(NSRect)arg2 {
+
+}*/
+/*- (void)_drawBezelBorder:(id)arg1 inRect:(NSRect)arg2 {
+
+}
+- (void)_drawBorder:(id)arg1 inRect:(NSRect)arg2 {
+
+}
+- (void)_drawTabViewItem:(id)arg1 inRect:(NSRect)arg2 {
+
+}*/
+
+- (BOOL)_allowAnimation {
+
+ return NO;
+}
+
+- (void)_getThemeImageTabBarRect:(NSRect *)arg1 backgroundRect:(NSRect *)arg2 fillBackgroundRect:(NSRect *)arg3 {
+
}
-(void)dealloc {
@@ -13,8 +13,23 @@
E70E5C911354CBB900BAA5B0 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = E70E5C8F1354CBB900BAA5B0 /* Credits.rtf */; };
E70E5C941354CBB900BAA5B0 /* bghudtestAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E70E5C931354CBB900BAA5B0 /* bghudtestAppDelegate.m */; };
E70E5C971354CBB900BAA5B0 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E70E5C951354CBB900BAA5B0 /* MainMenu.xib */; };
+ E73CD0C61354CE5F006D4D89 /* BGHUDAppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E73CD0C51354CE5F006D4D89 /* BGHUDAppKit.framework */; };
+ E73CD0C91354CE90006D4D89 /* BGHUDAppKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = E73CD0C51354CE5F006D4D89 /* BGHUDAppKit.framework */; };
/* End PBXBuildFile section */
+/* Begin PBXCopyFilesBuildPhase section */
+ E73CD0C81354CE88006D4D89 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ E73CD0C91354CE90006D4D89 /* BGHUDAppKit.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
/* Begin PBXFileReference section */
E70E5C7C1354CBB900BAA5B0 /* bghudtest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = bghudtest.app; sourceTree = BUILT_PRODUCTS_DIR; };
E70E5C801354CBB900BAA5B0 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -29,13 +44,15 @@
E70E5C921354CBB900BAA5B0 /* bghudtestAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bghudtestAppDelegate.h; sourceTree = "<group>"; };
E70E5C931354CBB900BAA5B0 /* bghudtestAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bghudtestAppDelegate.m; sourceTree = "<group>"; };
E70E5C961354CBB900BAA5B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
+ E73CD0C51354CE5F006D4D89 /* BGHUDAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BGHUDAppKit.framework; path = ../build/Debug/BGHUDAppKit.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
E70E5C791354CBB900BAA5B0 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ E73CD0C61354CE5F006D4D89 /* BGHUDAppKit.framework in Frameworks */,
E70E5C811354CBB900BAA5B0 /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -72,6 +89,7 @@
E70E5C821354CBB900BAA5B0 /* Other Frameworks */ = {
isa = PBXGroup;
children = (
+ E73CD0C51354CE5F006D4D89 /* BGHUDAppKit.framework */,
E70E5C831354CBB900BAA5B0 /* AppKit.framework */,
E70E5C841354CBB900BAA5B0 /* CoreData.framework */,
E70E5C851354CBB900BAA5B0 /* Foundation.framework */,
@@ -112,6 +130,7 @@
E70E5C781354CBB900BAA5B0 /* Sources */,
E70E5C791354CBB900BAA5B0 /* Frameworks */,
E70E5C7A1354CBB900BAA5B0 /* Resources */,
+ E73CD0C81354CE88006D4D89 /* CopyFiles */,
);
buildRules = (
);
@@ -237,11 +256,16 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../build/Debug\"",
+ );
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "bghudtest/bghudtest-Prefix.pch";
INFOPLIST_FILE = "bghudtest/bghudtest-Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -253,10 +277,15 @@
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../build/Debug\"",
+ );
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "bghudtest/bghudtest-Prefix.pch";
INFOPLIST_FILE = "bghudtest/bghudtest-Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
@@ -281,6 +310,7 @@
E70E5C9C1354CBB900BAA5B0 /* Release */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
@@ -7,12 +7,15 @@
//
#import <Cocoa/Cocoa.h>
+#import <BGHUDAppKit/BGHUDAppKit.h>
@interface bghudtestAppDelegate : NSObject <NSApplicationDelegate> {
@private
NSWindow *window;
+ BGHUDTabView *tabView;
}
@property (assign) IBOutlet NSWindow *window;
+@property (assign) IBOutlet BGHUDTabView *tabView;
@end
@@ -11,10 +11,13 @@
@implementation bghudtestAppDelegate
@synthesize window;
+@synthesize tabView;
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
// Insert code here to initialize your application
+ NSLog(@"Done with initialization");
+ NSLog(@"TabView: %@", tabView);
}
@end
Oops, something went wrong.

0 comments on commit 0d0bdef

Please sign in to comment.