From 1d24c1dff374c332bbc1a5e3112f7c057c4fd7a4 Mon Sep 17 00:00:00 2001 From: David Catmull Date: Sat, 14 May 2011 10:53:42 -0600 Subject: [PATCH] hook up helpText; works with tags --- PBGitRepository.m | 1 + PBGitRevSpecifier.h | 2 ++ PBGitRevSpecifier.m | 2 +- PBGitSidebarController.m | 2 +- PBSourceViewItem.h | 3 +-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/PBGitRepository.m b/PBGitRepository.m index 5dcb9dc..2e1f9e6 100644 --- a/PBGitRepository.m +++ b/PBGitRepository.m @@ -326,6 +326,7 @@ NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain"; PBGitRef *newRef = [PBGitRef refFromString:[components objectAtIndex:0]]; PBGitRevSpecifier *revSpec = [[PBGitRevSpecifier alloc] initWithRef:newRef]; + [revSpec setHelpText:[self helpTextForRef:newRef]]; [self addBranch:revSpec]; [self addRef:newRef fromParameters:components]; [oldBranches removeObject:revSpec]; diff --git a/PBGitRevSpecifier.h b/PBGitRevSpecifier.h index 32e96c4..7356274 100644 --- a/PBGitRevSpecifier.h +++ b/PBGitRevSpecifier.h @@ -11,6 +11,7 @@ @interface PBGitRevSpecifier : NSObject { NSString *description; + NSString *helpText; NSArray *parameters; NSURL *workingDirectory; BOOL isSimpleRef; @@ -36,6 +37,7 @@ + (PBGitRevSpecifier *)localBranchesRevSpec; @property(retain) NSString *description; +@property(retain) NSString *helpText; @property(readonly) NSArray *parameters; @property(retain) NSURL *workingDirectory; @property(readonly) BOOL isSimpleRef; diff --git a/PBGitRevSpecifier.m b/PBGitRevSpecifier.m index 1adc9ed..f4c5e38 100644 --- a/PBGitRevSpecifier.m +++ b/PBGitRevSpecifier.m @@ -11,7 +11,7 @@ @implementation PBGitRevSpecifier -@synthesize parameters, description, workingDirectory; +@synthesize parameters, description, helpText, workingDirectory; @synthesize isSimpleRef; @synthesize behind,ahead; diff --git a/PBGitSidebarController.m b/PBGitSidebarController.m index 930a47c..c2d04f4 100644 --- a/PBGitSidebarController.m +++ b/PBGitSidebarController.m @@ -344,7 +344,7 @@ static NSString * const kObservingContextSubmodules = @"submodulesChanged"; - (NSString *)outlineView:(NSOutlineView *)outlineView toolTipForCell:(NSCell *)cell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)tc item:(id)item mouseLocation:(NSPoint)mouseLocation { - return [item helpText]; + return [[item revSpecifier] helpText]; } - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item diff --git a/PBSourceViewItem.h b/PBSourceViewItem.h index ec3bd4d..1547fd6 100644 --- a/PBSourceViewItem.h +++ b/PBSourceViewItem.h @@ -14,7 +14,7 @@ @interface PBSourceViewItem : NSObject { NSMutableArray *children; - NSString *title, *helpText; + NSString *title; PBGitRevSpecifier *revSpecifier; PBSourceViewItem *parent; @@ -43,7 +43,6 @@ - (PBGitRef *) ref; @property(retain) NSString *title; -@property(retain) NSString *helpText; @property(readonly) NSMutableArray *children; @property(assign) BOOL isGroupItem, isUncollapsible; @property(retain) PBGitRevSpecifier *revSpecifier;