From b28afa1644e149a36f10e19bc156093a9e3c6afa Mon Sep 17 00:00:00 2001
From: Nathan Kinsinger <nkinsinger@brotherbard.com>
Date: Sat, 4 Sep 2010 17:57:12 -0600
Subject: [PATCH] Add the contextual menu to the other columns of the commit
 list

Now all the columns have the menu for the commit, not just the subject column.
---
 GitXTextFieldCell.h    |  3 +-
 GitXTextFieldCell.m    | 17 +++++++++
 PBGitHistoryView.xib   | 85 +++++++++++++++++++++++++++++++++---------
 PBRefContextDelegate.h |  4 ++
 PBRefController.h      |  1 +
 PBRefController.m      |  9 +++++
 6 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/GitXTextFieldCell.h b/GitXTextFieldCell.h
index 4bd3ec7..1161dca 100644
--- a/GitXTextFieldCell.h
+++ b/GitXTextFieldCell.h
@@ -7,10 +7,11 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "PBRefContextDelegate.h"
 
 
 @interface GitXTextFieldCell : NSTextFieldCell {
-
+	IBOutlet id<PBRefContextDelegate> contextMenuDelegate;
 }
 
 @end
diff --git a/GitXTextFieldCell.m b/GitXTextFieldCell.m
index bc95397..9e90193 100644
--- a/GitXTextFieldCell.m
+++ b/GitXTextFieldCell.m
@@ -7,6 +7,8 @@
 //
 
 #import "GitXTextFieldCell.h"
+#import "PBGitCommit.h"
+#import "PBRefController.h"
 
 
 @implementation GitXTextFieldCell
@@ -17,4 +19,19 @@
 	return nil;
 }
 
+- (NSMenu *)menuForEvent:(NSEvent *)anEvent inRect:(NSRect)cellFrame ofView:(NSTableView *)commitList
+{
+	NSInteger rowIndex = [commitList rowAtPoint:(cellFrame.origin)];
+	NSArray *items = [contextMenuDelegate menuItemsForRow:rowIndex];
+	if (!items)
+		return nil;
+
+	NSMenu *menu = [[NSMenu alloc] init];
+	[menu setAutoenablesItems:NO];
+	for (NSMenuItem *item in items)
+		[menu addItem:item];
+
+	return menu;
+}
+
 @end
diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib
index f9e2774..4bda4c9 100644
--- a/PBGitHistoryView.xib
+++ b/PBGitHistoryView.xib
@@ -1616,14 +1616,6 @@
 					</object>
 					<int key="connectionID">95</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="254268962"/>
-						<reference key="destination" ref="1001"/>
-					</object>
-					<int key="connectionID">96</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -1696,14 +1688,6 @@
 					</object>
 					<int key="connectionID">234</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="254268962"/>
-						<reference key="destination" ref="892732705"/>
-					</object>
-					<int key="connectionID">235</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">contextMenuDelegate</string>
@@ -2097,13 +2081,69 @@
 					</object>
 					<int key="connectionID">436</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">contextMenuDelegate</string>
+						<reference key="source" ref="746918365"/>
+						<reference key="destination" ref="892732705"/>
+					</object>
+					<int key="connectionID">438</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">contextMenuDelegate</string>
+						<reference key="source" ref="853819733"/>
+						<reference key="destination" ref="892732705"/>
+					</object>
+					<int key="connectionID">439</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">contextMenuDelegate</string>
+						<reference key="source" ref="750921840"/>
+						<reference key="destination" ref="892732705"/>
+					</object>
+					<int key="connectionID">440</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">contextMenuDelegate</string>
+						<reference key="source" ref="671609291"/>
+						<reference key="destination" ref="892732705"/>
+					</object>
+					<int key="connectionID">441</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">contextMenuDelegate</string>
+						<reference key="source" ref="493129112"/>
+						<reference key="destination" ref="892732705"/>
+					</object>
+					<int key="connectionID">442</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="254268962"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">444</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="254268962"/>
+						<reference key="destination" ref="892732705"/>
+					</object>
+					<int key="connectionID">445</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">searchController</string>
 						<reference key="source" ref="1001"/>
 						<reference key="destination" ref="596748029"/>
 					</object>
-					<int key="connectionID">437</int>
+					<int key="connectionID">446</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -3064,6 +3104,17 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">GitXTextFieldCell</string>
 					<string key="superclassName">NSTextFieldCell</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">contextMenuDelegate</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">contextMenuDelegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">contextMenuDelegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">GitXTextFieldCell.h</string>
diff --git a/PBRefContextDelegate.h b/PBRefContextDelegate.h
index 1b7a973..9112b8f 100644
--- a/PBRefContextDelegate.h
+++ b/PBRefContextDelegate.h
@@ -7,8 +7,12 @@
 //
 
 
+@class PBGitRef;
+@class PBGitCommit;
+
 
 @protocol PBRefContextDelegate
 - (NSArray *) menuItemsForRef:(PBGitRef *)ref;
 - (NSArray *) menuItemsForCommit:(PBGitCommit *)commit;
+- (NSArray *)menuItemsForRow:(NSInteger)rowIndex;
 @end
diff --git a/PBRefController.h b/PBRefController.h
index 76e5cd8..15df74b 100644
--- a/PBRefController.h
+++ b/PBRefController.h
@@ -43,6 +43,7 @@
 
 - (NSArray *) menuItemsForRef:(PBGitRef *)ref;
 - (NSArray *) menuItemsForCommit:(PBGitCommit *)commit;
+- (NSArray *)menuItemsForRow:(NSInteger)rowIndex;
 
 
 @end
diff --git a/PBRefController.m b/PBRefController.m
index ca560a1..26dd6f2 100644
--- a/PBRefController.m
+++ b/PBRefController.m
@@ -275,6 +275,15 @@
 	return [PBRefMenuItem defaultMenuItemsForCommit:commit target:self];
 }
 
+- (NSArray *)menuItemsForRow:(NSInteger)rowIndex
+{
+	NSArray *commits = [commitController arrangedObjects];
+	if ([commits count] <= rowIndex)
+		return nil;
+
+	return [self menuItemsForCommit:[commits objectAtIndex:rowIndex]];
+}
+
 
 # pragma mark Tableview delegate methods